Commit 5b29d7c9 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Moved cmocean to conda requirements due to setup issue under Python 2.7....

Moved cmocean to conda requirements due to setup issue under Python 2.7. Removed '-y -q' from conda install commands contained in installation instructions in README files.
parent f4f411bf
Pipeline #3339 passed with stages
in 4 minutes and 8 seconds
...@@ -59,14 +59,14 @@ Using [conda](https://conda.io/docs/), the recommended approach is: ...@@ -59,14 +59,14 @@ Using [conda](https://conda.io/docs/), the recommended approach is:
```bash ```bash
# create virtual environment for arosics, this is optional # create virtual environment for arosics, this is optional
conda create -y -q --name arosics python=3 conda create --name arosics python=3
source activate arosics source activate arosics
conda install -y -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas conda install -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas cmocean
# optional libraries: # optional libraries:
conda install -y -q -c conda-forge basemap pykrige conda install -c conda-forge basemap pykrige
conda install -y -q -c conda-forge pyfftw # Linux and MacOS conda install -c conda-forge pyfftw # Linux and MacOS
conda install -y -q -c jesserobertson pyfftw # Windows conda install -c jesserobertson pyfftw # Windows
``` ```
To install AROSICS, use the pip installer: To install AROSICS, use the pip installer:
......
...@@ -54,14 +54,14 @@ Using conda_, the recommended approach is: ...@@ -54,14 +54,14 @@ Using conda_, the recommended approach is:
.. code-block:: console .. code-block:: console
# create virtual environment for arosics, this is optional # create virtual environment for arosics, this is optional
conda create -y -q --name arosics python=3 conda create --name arosics python=3
source activate arosics source activate arosics
conda install -y -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas conda install -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas cmocean
# optional libraries: # optional libraries:
conda install -y -q -c conda-forge basemap pykrige conda install -c conda-forge basemap pykrige
conda install -y -q -c conda-forge pyfftw # Linux and MacOS conda install -c conda-forge pyfftw # Linux and MacOS
conda install -y -q -c jesserobertson pyfftw # Windows conda install -c jesserobertson pyfftw # Windows
To install AROSICS, use the pip installer: To install AROSICS, use the pip installer:
......
...@@ -12,14 +12,14 @@ Using conda_, the recommended approach is: ...@@ -12,14 +12,14 @@ Using conda_, the recommended approach is:
.. code-block:: console .. code-block:: console
# create virtual environment for arosics, this is optional # create virtual environment for arosics, this is optional
conda create -y -q --name arosics python=3 conda create --name arosics python=3
source activate arosics source activate arosics
conda install -y -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas conda install -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas cmocean
# optional libraries: # optional libraries:
conda install -y -q -c conda-forge basemap pykrige conda install -c conda-forge basemap pykrige
conda install -y -q -c conda-forge pyfftw # Linux and MacOS conda install -c conda-forge pyfftw # Linux and MacOS
conda install -y -q -c jesserobertson pyfftw # Windows conda install -c jesserobertson pyfftw # Windows
Stable release Stable release
......
cmocean
plotly plotly
six six
folium>=0.6.0 folium>=0.6.0
......
...@@ -22,6 +22,7 @@ dependencies: ...@@ -22,6 +22,7 @@ dependencies:
- holoviews - holoviews
- bokeh - bokeh
- pykrige - pykrige
- cmocean
- pip: - pip:
- dicttoxml - dicttoxml
- jsmin - jsmin
...@@ -45,7 +46,6 @@ dependencies: ...@@ -45,7 +46,6 @@ dependencies:
- nose-htmloutput - nose-htmloutput
- coverage - coverage
- rednose - rednose
- cmocean
- plotly - plotly
- geoarray>=0.8.8 - geoarray>=0.8.8
- py_tools_ds>=0.13.7 - py_tools_ds>=0.13.7
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment