From c1447875d55463f751143c98782ef885a8b4760d Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Wed, 2 Dec 2020 17:48:47 +0100
Subject: [PATCH] no defaults channel in environment.yaml (#144)

* no defaults channel in environment.yaml

* GIS from conda-forge

* remove channel pinning and add descartes via conda

* remove geopandas version restriction

* travis: remove duplicated conda list
---
 environment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yaml b/environment.yaml
index 06f842a9..cce0050b 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -4,7 +4,6 @@
 
 name: pypsa-eur
 channels:
-  - defaults
   - conda-forge
   - bioconda
   - http://conda.anaconda.org/gurobi
@@ -51,6 +50,7 @@ dependencies:
   - rasterio
   - shapely
   - libgdal<=3.0.4
+  - descartes
 
   # Solvers
   - gurobi:gurobi # until https://github.com/conda-forge/pypsa-feedstock/issues/4 closed