Commit 53f8fe80 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Added pyresample to conda dependencies (might fix test_arosics_install)....


Added pyresample to conda dependencies (might fix test_arosics_install). Replaced deprecated PyPI upload by twine.
Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent 1ac6ad43
Pipeline #4368 failed with stages
in 13 minutes and 22 seconds
......@@ -62,7 +62,7 @@ test_arosics_install:
- conda create -y -q --name arosics_testinstall python=3
- source activate arosics_testinstall
# resolve some requirements with conda
- conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas
- conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas pyresample>=1.11.0
- conda install --yes -q -c conda-forge libgdal ncurses # Fix for libgdal installed from defaults channel causing libkea.so.1.4.7: cannot open shared object file: No such file or directory
# run installer
- python setup.py install
......@@ -118,12 +118,15 @@ deploy_pypi:
- source activate ci_env
- mkdir -p public/images/
- cp -r docs/images/* public/images/
- printf "[distutils]\nindex-servers =\n pypi\n\n" >> ~/.pypirc
- printf "[pypi]\n""repository:"" https://upload.pypi.org/legacy/\n" >> ~/.pypirc
- printf "username= ${PYPI_USER}\n" >> ~/.pypirc
- printf "password= ${PYPI_PASSWORD}\n" >> ~/.pypirc
- python setup.py check sdist upload -r pypi # This will fail if your creds are bad.
- echo "" > ~/.pypirc && rm ~/.pypirc # If the above fails, this won't run.
# - printf "[distutils]\nindex-servers =\n pypi\n\n" >> ~/.pypirc
# - printf "[pypi]\n""repository:"" https://upload.pypi.org/legacy/\n" >> ~/.pypirc
# - printf "username= ${PYPI_USER}\n" >> ~/.pypirc
# - printf "password= ${PYPI_PASSWORD}\n" >> ~/.pypirc
# - python setup.py check sdist upload -r pypi # This will fail if your creds are bad.
# - echo "" > ~/.pypirc && rm ~/.pypirc # If the above fails, this won't run.
- pip install -U twine
- python setup.py sdist
- twine upload dist/*
only:
- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
except:
......
......@@ -20,7 +20,7 @@ Using conda_, the recommended approach is:
.. code-block:: bash
$ conda install -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas cmocean
$ conda install -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas cmocean pyresample>=1.11.0
3. Install optional libraries for AROSICS (only needed for some specific functions):
......
......@@ -11,3 +11,4 @@ plotly
six
folium>=0.6.0
geojson
pyresample>=1.11.0
......@@ -44,6 +44,7 @@ requirements = ['numpy', 'gdal', 'shapely', 'scikit-image', 'matplotlib', 'geopa
# 'pykrige' # conda install --yes -c conda-forge pykrige
# 'pyfftw', # conda install --yes -c conda-forge pyfftw=0.10.4 ; \
# 'basemap', # conda install --yes -c conda-forge basemap; \
# 'pyresample' # conda install --yes -c conda-forge pyresample>=1.11.0
]
setup_requirements = [
......
......@@ -23,6 +23,7 @@ dependencies:
- bokeh
- pykrige
- cmocean
- pyresample>=1.11.0
- pip:
- dicttoxml
- jsmin
......
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