From 97eaebb0eab98ba30cd05a2cf83e7d97cb7cc4b3 Mon Sep 17 00:00:00 2001
From: Jonas Hoersch <coroa@posteo.de>
Date: Sun, 26 May 2019 10:24:42 +0200
Subject: [PATCH] environment.yaml: Separate dependencies of pip packages more
 cleanly

Dependencies are either of atlite, pypsa or the workflow itself.

Use snakemake-minimal instead of snakemake (fixes #39)
---
 environment.yaml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/environment.yaml b/environment.yaml
index 7cb0c3eb..91157983 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -4,26 +4,30 @@ channels:
   - bioconda
 dependencies:
   - python
+  - pip
+
+  # Dependencies of PyPSA
   - six
-  - snakemake
   - numpy
   - pyomo
   - scipy
   - pandas>=0.22.0
   - matplotlib
-  - seaborn
   - memory_profiler
   - networkx>=1.10
+  - netcdf4
+  - pytables
+
+  # Dependencies of the workflow itself
   - xlrd
   - scikit-learn
-  - pytables
   - pycountry
+  - seaborn
+  - snakemake-minimal
 
   # Second order dependencies which should really be deps of atlite
   - xarray
-  - netcdf4
   - bottleneck
-  - cyordereddict
   - toolz
   - dask
   - progressbar2
@@ -33,6 +37,7 @@ dependencies:
   - ipython
 
   # GIS dependencies have to come all from conda-forge
+  - conda-forge::cartopy
   - conda-forge::fiona
   - conda-forge::pyproj
   - conda-forge::pyshp
@@ -50,4 +55,3 @@ dependencies:
     - git+https://github.com/PyPSA/glaes.git#egg=glaes
     - git+https://github.com/PyPSA/geokit.git#egg=geokit
     #- git+https://github.com/FRESNA/powerplantmatching.git#egg=powerplantmatching
-