ubc-solar-physics 1.7.9__tar.gz → 1.7.11__tar.gz

{ubc_solar_physics-1.7.9 → ubc_solar_physics-1.7.11}/.github/workflows/build_and_publish.yaml

@@ -98,17 +98,41 @@ jobs:
 
       # Now, we use cibuildwheel to build all the wheels that we want for the platforms we defined in matrix.os
       # It will build wheels for Python versions that are allowed based on our pyproject.toml
-      - name: Build wheels
+      - name: Build Wheels (Windows)
+        if: runner.os == 'Windows'
         run: cibuildwheel --output-dir dist
         env:
-          CIBW_ARCHS_MACOS: "x86_64 arm64"  # Make sure both x86_64 and arm64 wheels are built for macOS
-          CIBW_ARCHS_LINUX: "x86_64 aarch64"  # Make sure both x86_64 and arm64 wheels are built for Linux
           CIBW_ENVIRONMENT: 'PATH="$HOME/.cargo/bin:$PATH" MACOSX_DEPLOYMENT_TARGET="10.12"'
           CIBW_ENVIRONMENT_WINDOWS: 'PATH="$UserProfile\.cargo\bin;$PATH"'
           CIBW_BEFORE_BUILD: >
             pip install -U setuptools-rust &&
             rustup default nightly &&
             rustup show
+
+      - name: Build Wheels (MacOS)
+        if: runner.os == 'macOS'
+        run: cibuildwheel --output-dir dist
+        env:
+          CIBW_ARCHS_MACOS: "x86_64 arm64"  # Make sure both x86_64 and arm64 wheels are built for macOS
+          CIBW_ENVIRONMENT: 'PATH="$HOME/.cargo/bin:$PATH" MACOSX_DEPLOYMENT_TARGET="10.12"'
+          CIBW_BEFORE_BUILD: >
+            pip install -U setuptools-rust &&
+            rustup default nightly &&
+            rustup show
+
+      - name: Build Wheels (Linux)
+        run: cibuildwheel --output-dir dist
+        if: runner.os == 'Linux'
+        env:
+          # build both arches on Linux…
+          CIBW_ARCHS_LINUX: "x86_64 aarch64"
+          # …but only Python 3.12 on the aarch64 arch:
+          CIBW_BUILD_LINUX_AARCH64: "cp312-manylinux*"
+          CIBW_ENVIRONMENT: 'PATH="$HOME/.cargo/bin:$PATH" MACOSX_DEPLOYMENT_TARGET="10.12"'
+          CIBW_BEFORE_BUILD: >
+            pip install -U setuptools-rust &&
+            rustup default nightly &&
+            rustup show
           CIBW_BEFORE_BUILD_LINUX: >
             pip install -U setuptools-rust &&
             curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=nightly --profile=minimal -y &&

{ubc_solar_physics-1.7.9 → ubc_solar_physics-1.7.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ubc-solar-physics
-Version: 1.7.9
+Version: 1.7.11
 Summary: UBC Solar's Simulation Environment
 Author: Fisher Xue, Mihir Nimgade, Chris Chang, David Widjaja, Justin Hua, Ilya Veksler, Renu Rajamagesh, Ritchie Xia, Erik Langille, Chris Aung, Nicolas Ric, Ishaan Trivedi, Jason Liang, Felix Toft, Mack Wilson, Jonah Lee, Tamzeed Quazi, Joshua Riefman
 Author-email: UBC Solar <strategy@ubcsolar.com>

{ubc_solar_physics-1.7.9 → ubc_solar_physics-1.7.11}/physics/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.7.9'
-__version_tuple__ = version_tuple = (1, 7, 9)
+__version__ = version = '1.7.11'
+__version_tuple__ = version_tuple = (1, 7, 11)

{ubc_solar_physics-1.7.9 → ubc_solar_physics-1.7.11}/physics/environment/gis/base_gis.py

@@ -33,6 +33,7 @@ class BaseGIS(ABC):
             average_lap_speeds: ArrayLike,
             simulation_dt: int,
             driving_allowed: ArrayLike,
-            idle_time: int
+            idle_time: int,
+            laps_per_speed: int
     ) -> NDArray[float]:
         raise NotImplementedError

{ubc_solar_physics-1.7.9 → ubc_solar_physics-1.7.11}/physics/environment/gis/gis.py

@@ -88,7 +88,8 @@ class GIS(BaseGIS):
             average_lap_speeds: ArrayLike,
             simulation_dt: int,
             driving_allowed: ArrayLike,
-            idle_time: int
+            idle_time: int,
+            laps_per_speed: int
     ) -> NDArray[float]:
         """
         Generate valid driving speeds as a simulation-time array given a set of average speeds for each
@@ -105,6 +106,7 @@ class GIS(BaseGIS):
             are allowed to drive, and `False` is when we are not. Requires that (at least) the first element is
             `False` due to the race beginning in the morning before we are allowed to drive.
         :param idle_time: The length of time to pause driving upon processing a "0m/s" average speed.
+        :param laps_per_speed: The amount of laps that we expect to use with each speed value.
         :return: A simulation-time array of driving speeds in m/s, or an error if there weren't enough
             laps provided to fill the entire simulation time.
         """
@@ -112,7 +114,7 @@ class GIS(BaseGIS):
             np.array(average_lap_speeds).astype(np.float64),
             simulation_dt,
             np.array(driving_allowed).astype(bool),
-            self.path_length,
+            self.path_length  * laps_per_speed,
             idle_time
         )
 

{ubc_solar_physics-1.7.9 → ubc_solar_physics-1.7.11}/tests/gis_tests/test_gis_driving_speeds.py

@@ -317,6 +317,7 @@ def test_gis():
         average_lap_speeds=[speed, 0],
         driving_allowed=driving_allowed,
         idle_time=idle_time,
-        simulation_dt=1)
+        simulation_dt=1,
+        laps_per_speed = 1)
 
     assert np.allclose(driving_speeds, np.array([[0] * 10 + [speed] * time_to_complete_lap + [0] * idle_time + [0] * 10]), atol=1e-3)

{ubc_solar_physics-1.7.9 → ubc_solar_physics-1.7.11}/ubc_solar_physics.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ubc-solar-physics
-Version: 1.7.9
+Version: 1.7.11
 Summary: UBC Solar's Simulation Environment
 Author: Fisher Xue, Mihir Nimgade, Chris Chang, David Widjaja, Justin Hua, Ilya Veksler, Renu Rajamagesh, Ritchie Xia, Erik Langille, Chris Aung, Nicolas Ric, Ishaan Trivedi, Jason Liang, Felix Toft, Mack Wilson, Jonah Lee, Tamzeed Quazi, Joshua Riefman
 Author-email: UBC Solar <strategy@ubcsolar.com>