another testing conda environment fix

PrincetonUniversity · Jan 15, 2023 · 7c9e698 · 7c9e698
1 parent eddb341
commit 7c9e698
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,8 +26,8 @@ jobs:
           cd $GITHUB_WORKSPACE
           git submodule update --init
 
-          conda create --name vatic --file vatic/tests/spec-file_linux.txt
-          conda activate vatic
+          conda create --name vatic-env --file vatic/tests/spec-file_linux.txt
+          conda activate vatic-env
           pip install .
 
           sh vatic/tests/check_rts.sh
@@ -54,11 +54,11 @@ jobs:
           cd $GITHUB_WORKSPACE
           git submodule update --init
 
-          conda create --name vatic -c conda-forge \
+          conda create --name vatic-env -c conda-forge \
                         python=${{ matrix.python-version }} \
-                        numpy pandas scipy dill matplotlib pyomo
+                        numpy pandas scipy dill matplotlib pyomo coincbc
 
-          conda activate vatic
+          conda activate vatic-env
           pip install .
 
           vatic-det RTS-GMLC 2020-07-20 2 \

diff --git a/vatic/model_data.py b/vatic/model_data.py
@@ -147,7 +147,7 @@ def get_forecastables(self) -> Iterator[tuple[tuple[str, str],
 
     def time_series(self,
                     element_types: Iterable[str] | None = None,
-                    include_reserves=True,
+                    include_reserves: bool = True,
                     **element_args: str) -> Iterator[tuple]:
         """Retrieves timeseries for grid elements that match a set of criteria.
 
@@ -310,7 +310,7 @@ def model_runtime(self):
         return self._data['system']['solver_runtime']
 
     @property
-    def duration_minutes(self):
+    def duration_minutes(self) -> int:
         return self._data['system']['time_period_length_minutes']
 
     @staticmethod

diff --git a/vatic/simulation_state.py b/vatic/simulation_state.py
@@ -200,8 +200,9 @@ def get_generator_states_at_sced_offset(
         # number of hours, float if fractional
 
         minutes_per_period = sced.get_system_attr('time_period_length_minutes')
-        hours_per_period = minutes_per_period // 60 if minutes_per_period % 60 == 0 \
-            else minutes_per_period / 60
+        hours_per_period = (minutes_per_period // 60
+                            if minutes_per_period % 60 == 0
+                            else minutes_per_period / 60)
 
         for g, g_dict in sced.elements('generator', generator_type='thermal'):
             ### Get generator state (whether on or off, and for how long) ###