improve python3.11 compatibility

openego · Jul 16, 2024 · 5b0df1b · 5b0df1b
1 parent 6c1ed80
commit 5b0df1b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/eDisGo_env.yml b/eDisGo_env.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python >= 3.9, < 3.11
+  - python >= 3.9, <= 3.11
   - pip
   - pandas >= 1.4, < 2.2.0
   - conda-forge::fiona
@@ -16,6 +16,7 @@ dependencies:
   - conda-forge::pygeos
   - conda-forge::contextily
   - conda-forge::descartes
-  - conda-forge::pypsa >= 0.17.0, <= 0.20.1
+  - conda-forge::pypsa  == 0.26.2
+  - conda-forge::scikit-learn < 1.3.0
   - pip:
       - eDisGo
diff --git a/eDisGo_env_dev.yml b/eDisGo_env_dev.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python >= 3.9, < 3.11
+  - python >= 3.9, <= 3.11
   - pip
   - pandas >= 1.4, < 2.2.0
   - conda-forge::fiona
@@ -16,6 +16,7 @@ dependencies:
   - conda-forge::pygeos
   - conda-forge::contextily
   - conda-forge::descartes
-  - conda-forge::pypsa >= 0.17.0, <= 0.20.1
+  - conda-forge::pypsa  == 0.26.2
+  - conda-forge::scikit-learn < 1.3.0
   - pip:
       - -e .[dev]
diff --git a/rtd_requirements.txt b/rtd_requirements.txt
@@ -1,5 +1,5 @@
 dash < 2.9.0
-demandlib
+demandlib < 0.2.0
 egoio >= 0.4.7
 geopy >= 2.0.0
 jupyter_dash
@@ -8,13 +8,12 @@ multiprocess
 networkx >= 2.5.0
 pandas >= 1.4.0
 plotly
-pyomo >= 6.0
 pypower
 pyproj >= 3.0.0
-pypsa >=0.17.0, <=0.20.1
+pypsa  == 0.26.2
 pyyaml
 saio
-scikit-learn
+scikit-learn < 1.3.0
 sphinx
 sphinx_rtd_theme >=0.5.2
 sphinx-autodoc-typehints