diff --git a/docs/conda.txt b/docs/conda.txt index 26b377827..631cfc346 100644 --- 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 index fb7f97895..d206db025 100644 --- 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 index e691631d1..57f7b96b3 100644 --- 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_: