Merge branch 'master' into multi_proc

.github/workflows/cadcad-ci.yml

@@ -0,0 +1,61 @@
+# This workflow will install Python dependencies and run tests with multiple versions of Python
+
+name: cadCAD CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        os: [ubuntu-latest, macos-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+        cache: 'pip'
+
+    - name: Display Python version
+      run: python -c "import sys; print(sys.version)"
+
+    - name: Install test and build dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install jupyter
+        pip install -r requirements.txt
+
+    - name: Build cadCAD
+      run: |
+        python setup.py bdist_wheel
+        python -m pip install dist/*.whl --force-reinstall
+
+    - name: Run tests
+      run: |
+        python testing/tests/multi_model_row_count.py
+        python testing/tests/param_sweep.py
+        python testing/tests/policy_aggregation.py
+        python testing/tests/timestep1psub0.py
+        python testing/tests/runs_not_zero.py
+        python testing/tests/run1psub0.py
+        python testing/tests/append_mod_test.py
+        python testing/tests/cadCAD_exp.py
+
+    - name: Run Jupyter test
+      run: |
+        python testing/tests/import_cadCAD_test.py

cadCAD/types.py

@@ -33,7 +33,6 @@ class ConfigurationDict(TypedDict):
 SubsetWindow = Iterator
 N_Runs = int
 
-
 ExecutorFunction = Callable[[Parameters, StateHistory, StateUpdateBlocks, EnvProcesses, TimeSeq, SimulationID, Run, SubsetID, SubsetWindow, N_Runs], object]
 ExecutionParameter = Tuple[ExecutorFunction, Parameters, StateHistory, StateUpdateBlocks, EnvProcesses, TimeSeq, SimulationID, Run, SubsetID, SubsetWindow, N_Runs]
 
@@ -45,4 +44,4 @@ class SessionDict(TypedDict):
     simulation_id: int
     run_id: int
     subset_id: int
-    subset_window: deque
+    subset_window: deque

requirements.txt

@@ -1,21 +1,13 @@
 -i https://pypi.org/simple
 
-matplotlib==3.3.2
-networkx==2.5
-parameterized==0.7.4
-plotly==4.10.0
-pytest==6.0.2
-scikit-learn==0.23.2
-scipy>=1.5.2
-seaborn==0.11.0
-tabulate==0.8.7
-xarray==0.16.0
-wheel==0.38.1
-pandas==1.1.5
-fn==0.4.3
-funcy==1.16
-dill==0.3.4
-pathos==0.2.8
-numpy==1.22.0
-pytz==2021.1
-six>=1.11.0
+parameterized>=0.7.4
+pytest>=6.0.2
+tabulate>=0.8.7
+wheel>=0.38.1
+pandas>=1.1.5
+funcy>=1.16
+dill>=0.3.4
+pathos>=0.2.8
+numpy>=1.22.0
+pytz>=2021.1
+setuptools>=69.0.2