Added geos and basemap as conda packages to conda_env.yml (#262)

* Added basemap to conda_env.yml file and removed pip install basemap. These modifications intended to fix problems with pip finding geos libs. * add basemap to conda.txt * update installation.md with basemap from conda
insarlab · Jan 10, 2020 · a7bc68f · a7bc68f
1 parent 67577b6
commit a7bc68f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docs/conda.txt b/docs/conda.txt
@@ -1,4 +1,5 @@
 python>=3.6
+basemap
 cdsapi
 cvxopt
 dask>=1.0,<2.0

diff --git a/docs/conda_env.yml b/docs/conda_env.yml
@@ -9,6 +9,7 @@ channels:
   - defaults
 dependencies:
   - python>=3.6
+  - basemap
   - cdsapi
   - cvxopt
   - dask>=1.0,<2.0
@@ -30,4 +31,4 @@ dependencies:
   - scipy
   - pip:
     - git+https://github.com/tylere/pykml.git
-    - https://github.com/matplotlib/basemap/archive/v1.2.1rel.tar.gz
+
diff --git a/docs/installation.md b/docs/installation.md
@@ -83,9 +83,7 @@ $PYTHON3DIR/bin/conda config --add channels conda-forge
 $PYTHON3DIR/bin/conda install --yes --file $MINTPY_HOME/docs/conda.txt
 
 # install dependencies not compatiable from conda: basemap, pykml
-# run "conda uninstall basemap" if basemap was installed with conda
 $PYTHON3DIR/bin/pip install git+https://github.com/tylere/pykml.git
-$PYTHON3DIR/bin/pip install https://github.com/matplotlib/basemap/archive/v1.2.1rel.tar.gz
 ```
 
 Or run the following in your terminal to install the dependencies to a new environment _mintpy_: