add conda forge pypsa to conda YMLs

openego · Nov 10, 2022 · 8062488 · 8062488
1 parent ead0f0e
commit 8062488
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/eDisGo_env.yml b/eDisGo_env.yml
@@ -1,11 +1,11 @@
-name: eDisGo_env_dev
+name: eDisGo_env
 channels:
   - conda-forge
   - defaults
 dependencies:
-  - python >=3.8,<3.10
+  - python >= 3.8, < 3.10
   - pip
-  - pandas >=1.2
+  - pandas >= 1.2
   - conda-forge::fiona
   - conda-forge::geopy
   - conda-forge::geopandas
@@ -16,5 +16,6 @@ dependencies:
   - conda-forge::pygeos
   - conda-forge::contextily
   - conda-forge::descartes
+  - conda-forge::pypsa >= 0.17.0, <= 0.20.1
   - pip:
       - eDisGo
diff --git a/eDisGo_env_dev.yml b/eDisGo_env_dev.yml
@@ -3,9 +3,9 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python >=3.8,<3.10
+  - python >= 3.8, < 3.10
   - pip
-  - pandas >=1.2
+  - pandas >= 1.2
   - conda-forge::fiona
   - conda-forge::geopy
   - conda-forge::geopandas
@@ -16,5 +16,6 @@ dependencies:
   - conda-forge::pygeos
   - conda-forge::contextily
   - conda-forge::descartes
+  - conda-forge::pypsa >= 0.17.0, <= 0.20.1
   - pip:
       - -e .[dev]
diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@ def read(fname):
     "geopandas >= 0.9.0",
     "pyproj >= 3.0.0",
     "shapely >= 1.7.0",
-    "pypsa >= 0.17.0, <=0.20.1",
+    "pypsa >= 0.17.0, <= 0.20.1",
     "pyomo >= 6.0",
     "multiprocess",
     "workalendar",