From d094119d47d7b8819966532df174cf4a6b1d50d1 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Tue, 29 Jun 2021 08:45:09 +0200
Subject: [PATCH] List first-order dependencies and add pypsa-eur-sec
 specialties (#257)

* env: list first-order dependencies and add pypsa-eur-sec specialties

* limit numpy version and require atlite 0.2.5

* fix accidental 0 major numpy version

* add future dependency country_converter
---
 envs/environment.yaml | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/envs/environment.yaml b/envs/environment.yaml
index 790aec26..3d0a3400 100644
--- a/envs/environment.yaml
+++ b/envs/environment.yaml
@@ -13,13 +13,12 @@ dependencies:
   - mamba # esp for windows build
 
   - pypsa>=0.17.1 
-  - atlite>=0.2.2
+  - atlite>=0.2.4
   - dask<=2021.3.1 # until https://github.com/dask/dask/issues/7583 is solved
 
   # Dependencies of the workflow itself
   - xlrd
   - openpyxl
-  - scikit-learn
   - pycountry
   - seaborn
   - snakemake-minimal
@@ -28,8 +27,17 @@ dependencies:
   - pytables
   - lxml
   - powerplantmatching>=0.4.8
-  - numpy<=1.19.0 # otherwise macos fails
-
+  - numpy<=1.19 # until new PyPSA after 27-06-21
+  - pandas
+  - geopandas
+  - xarray
+  - netcdf4
+  - networkx
+  - scipy
+  - shapely
+  - progressbar2
+  - pyomo
+  - matplotlib
 
   # Keep in conda environment when calling ipython
   - ipython
@@ -37,6 +45,13 @@ dependencies:
   # GIS dependencies:
   - cartopy
   - descartes
+  - rasterio
+
+  # PyPSA-Eur-Sec Dependencies
+  - geopy
+  - tqdm
+  - pytz
+  - country_converter
 
   - pip:
     - vresutils==0.3.1