Merge pull request #410 from openego/fix/#342-BUG-PYOMO-Update

Fix/#342 bug pyomo update
openego · Jul 16, 2024 · 9253c33 · 9253c33
2 parents 583c4f6 + d1a712c
commit 9253c33
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 1,498 deletions.
diff --git a/doc/conf.py b/doc/conf.py
@@ -71,8 +71,6 @@
 ]
 # Files to ignore when building api documentation
 autoapi_ignore = [
-    "*/flex_opt/curtailment.py",
-    "*/flex_opt/storage_positioning.py",
     "*/opf/timeseries_reduction.py",
     "*/opf/opf_solutions/*",
 ]

diff --git a/eDisGo_env.yml b/eDisGo_env.yml
@@ -16,6 +16,6 @@ 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
   - pip:
       - eDisGo
diff --git a/eDisGo_env_dev.yml b/eDisGo_env_dev.yml
@@ -16,6 +16,6 @@ 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
   - pip:
       - -e .[dev]