Update environment.yaml to new versions

environment.yaml

@@ -14,13 +14,20 @@ dependencies:
   - seaborn
   - memory_profiler
   - networkx>=1.10
-  - netcdf4
-  - xarray
   - xlrd
   - scikit-learn
   - pytables
   - pycountry
 
+  # Second order dependencies which should really be deps of atlite
+  - xarray
+  - netcdf4
+  - bottleneck
+  - cyordereddict
+  - toolz
+  - dask
+  - progressbar2
+
   # Include ipython so that one does not inadvertently drop out of the conda
   # environment by calling ipython
   - ipython
@@ -37,11 +44,11 @@ dependencies:
 
   # The FRESNA/KIT stuff is not packaged for conda yet
   - pip:
-    - pypsa>=0.13
+    - pypsa>=0.13.2
     - vresutils>=0.2.5
-    - git+https://github.com/FRESNA/atlite.git
-    - git+https://github.com/PyPSA/glaes.git
-    - git+https://github.com/PyPSA/geokit.git
-    #- git+https://github.com/FRESNA/powerplantmatching.git
+    - git+https://github.com/FRESNA/atlite.git#egg=atlite
+    - 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
     #- https://software.ecmwf.int/wiki/download/attachments/56664858/ecmwf-api-client-python.tgz