Merge pull request #519 from sciris/update-environments

Update environments
sciris · Aug 14, 2023 · e387208 · e387208
2 parents 1c53f9a + b532f61
commit e387208
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 48 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -18,7 +18,6 @@ New features
 #. ``sc.manualcolorbar()`` allows highly customized colorbars to be added to plots, including to plots with no "mappable" data (e.g., scatterplots).
 #. Added ``sc.options.reset()`` as an alias to ``sc.options.set('defaults')``.
 
-
 Bugfixes
 ~~~~~~~~
 #. Sciris is now compatible with a broader range of dependencies (e.g., Python, NumPy, pandas, and Matplotlib); in most cases, the latest version of Sciris is now backwards-compatible with all dependency versions since January 2021.

diff --git a/tests/regression/requirements_2021-01-01.txt b/tests/regression/requirements_2021-01-01.txt
diff --git a/tests/regression/requirements_2022-01-01.txt b/tests/regression/requirements_2022-01-01.txt
diff --git a/tests/regression/requirements_2023-01-01.txt b/tests/regression/requirements_2023-01-01.txt
diff --git a/tests/regression/sciris2021-01-01.yml b/tests/regression/sciris2021-01-01.yml
@@ -0,0 +1,23 @@
+name: sciris2021
+channels:
+  - defaults
+dependencies:
+  - pip=23.2.1
+  - python=3.9.1
+  - setuptools=68.0.0
+  - pip:
+    - dill==0.3.3
+    - GitPython==3.1.11
+    - jellyfish==0.8.2
+    - jsonpickle==1.4.2
+    - line-profiler==3.1.0
+    - matplotlib==3.3.3
+    - memory-profiler==0.58.0
+    - multiprocess==0.70.11.1
+    - numpy==1.19.4
+    - openpyxl==3.0.5
+    - pandas==1.2.0
+    - psutil==5.8.0
+    - tqdm==4.55.0
+    - XlsxWriter==1.3.7
+    - zstandard==0.15.1
diff --git a/tests/regression/sciris2022-01-01.yml b/tests/regression/sciris2022-01-01.yml
@@ -0,0 +1,23 @@
+name: sciris2022
+channels:
+  - defaults
+dependencies:
+  - pip=23.2.1
+  - python=3.10.0
+  - setuptools=68.0.0
+  - pip:
+    - dill==0.3.4
+    - GitPython==3.1.24
+    - jellyfish==0.8.9
+    - jsonpickle==2.0.0
+    - line-profiler==3.4.0
+    - matplotlib==3.5.1
+    - memory-profiler==0.60.0
+    - multiprocess==0.70.12.2
+    - numpy==1.22.0
+    - openpyxl==3.0.9
+    - pandas==1.3.5
+    - psutil==5.9.0
+    - tqdm==4.62.3
+    - XlsxWriter==3.0.2
+    - zstandard==0.16.0
diff --git a/tests/regression/sciris2023-01-01.yml b/tests/regression/sciris2023-01-01.yml
@@ -0,0 +1,23 @@
+name: sciris2023
+channels:
+  - defaults
+dependencies:
+  - pip=23.2.1
+  - python=3.11.0
+  - setuptools=68.0.0
+  - pip:
+    - dill==0.3.6
+    - GitPython==3.1.30
+    - jellyfish==0.9.0
+    - jsonpickle==3.0.1
+    - line-profiler==4.0.2
+    - matplotlib==3.6.2
+    - memory-profiler==0.61.0
+    - multiprocess==0.70.14
+    - numpy==1.24.1
+    - openpyxl==3.0.10
+    - pandas==1.5.2
+    - psutil==5.9.4
+    - tqdm==4.64.1
+    - XlsxWriter==3.0.5
+    - zstandard==0.19.0
diff --git a/tests/regression/setup_envs b/tests/regression/setup_envs
@@ -11,9 +11,8 @@ eval "$(conda shell.bash hook)"
 for year in 2021 2022 2023; do
     echo "Working on $year..."
     name=sciris$year
-    conda create -n $name python -y 
+    conda env create -f $name-01-01.yml -y 
     conda activate $name
-    pip install -r requirements_$year-01-01.txt # Install this year's specific versions
     pip install -r ../requirements.txt # Install test requirements
     pip install -e ../.. # Install Sciris itself
 done