chore: update dependencies (#1427)

* fix: pin highs * fix typo * fix: pin `scip`
PyPSA · Nov 19, 2024 · dfcbd1d · dfcbd1d
1 parent a9b2eaa
commit dfcbd1d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -84,7 +84,9 @@ jobs:
 
     - name: Update environment
       if: steps.cache-env.outputs.cache-hit != 'true'
-      run: conda env update -n pypsa-eur -f ${{ env.env_file }}
+      run: |
+        conda env update -n pypsa-eur -f ${{ env.env_file }}
+        echo "Run conda list" && conda list
 
     - name: Run snakemake test workflows
       run: |
@@ -169,7 +171,9 @@ jobs:
 
     - name: Update environment
       if: env.pinned == 'false' && steps.cache-env.outputs.cache-hit != 'true'
-      run: conda env update -n pypsa-eur -f ${{ env.env_file }}
+      run: |
+        conda env update -n pypsa-eur -f ${{ env.env_file }}
+        echo "Run conda list" && conda list
 
     - name: Install inhouse packages from master
       if: env.pinned == 'false'

diff --git a/envs/environment.yaml b/envs/environment.yaml
@@ -19,7 +19,7 @@ dependencies:
 # Dependencies of the workflow itself
 - dask
 - xlrd
-- openpyxl!=3.1.1
+- openpyxl
 - seaborn
 - snakemake-minimal>=8.14
 - memory_profiler
@@ -37,6 +37,7 @@ dependencies:
 - glpk
 - shapely>=2.0
 - pyscipopt
+- scip!=9.2.0 # dependency of pyscipopt, temporary fix
 - matplotlib
 - proj
 - fiona
@@ -56,11 +57,11 @@ dependencies:
 # GIS dependencies:
 - cartopy
 - descartes
-- rasterio<1.4
+- rasterio
 
 - pip:
   - gurobipy
-  - highspy!=1.8.0 # No conda channel for arm macos
+  - highspy<1.8
   - tsam>=2.3.1
   - snakemake-storage-plugin-http
   - snakemake-executor-plugin-slurm