Commit 8c29bb7f authored by Daniel Scheffler's avatar Daniel Scheffler

Removed pyresample from dependencies (not needed anymore). Revised...

Removed pyresample from dependencies (not needed anymore). Revised dependencies and test_geoarray_install job. Fixed broken badge.
Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent a1fc096e
Pipeline #5510 failed with stages
in 2 minutes and 4 seconds
......@@ -16,6 +16,7 @@ test_geoarray:
- export GDAL_DATA=/root/miniconda3/envs/ci_env/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later
- export LD_LIBRARY_PATH=/root/anaconda3/lib:$LD_LIBRARY_PATH # /root <- directory needed later
# run tests
- make nosetests
- make docs
......@@ -50,12 +51,16 @@ test_geoarray_install:
- source /root/miniconda3/bin/activate
- conda create -y -q --name geoarray_testinstall python=3
- source activate geoarray_testinstall
# resolve some requirements with conda
- conda install --yes -q -c conda-forge numpy scikit-image matplotlib geopandas gdal rasterio pyproj basemap shapely pyresample
- 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
# - conda install --yes -q -c conda-forge kealib # fix for libkea.so.1.4.7: cannot open shared object file: No such file or directory
# avoid package incompatibilities due to usage of wrong channels
- conda config --set channel_priority strict # otherwise gdal or libgdal may be installed from defaults channel
# resolve some requirements with conda
- conda install --yes -q -c conda-forge numpy scikit-image matplotlib geopandas gdal rasterio pyproj basemap shapely
# run installer
- python setup.py install
# test if its importable
- cd ..
- pwd
......
......@@ -86,9 +86,8 @@ docs: ## generate Sphinx HTML documentation, including API docs
servedocs: docs ## compile the docs watching for changes
watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
release: clean ## package and upload a release
python setup.py sdist upload
python setup.py bdist_wheel upload
release: dist ## package and upload a release
twine upload dist/*
dist: clean ## builds source and wheel package
python setup.py sdist
......
......@@ -27,7 +27,7 @@ Status
:target: https://pyup.io/repos/github/danschef/geoarray/
:alt: Updates
.. image:: https://gitext.gfz-potsdam.de/danschef/geoarray/badges/master/build.svg
.. image:: https://gitext.gfz-potsdam.de/danschef/geoarray/badges/master/pipeline.svg
:target: https://gitext.gfz-potsdam.de/danschef/geoarray/commits/master
.. image:: https://gitext.gfz-potsdam.de/danschef/geoarray/badges/master/coverage.svg
:target: http://danschef.gitext.gfz-potsdam.de/geoarray/coverage/
......
......@@ -75,6 +75,8 @@ setup(
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
test_suite='tests',
tests_require=test_requirements,
......
......@@ -6,6 +6,7 @@ channels: &id1
dependencies:
- python=3.*.*
- pip # avoids that conda uses the wrong pip
- pyqt
- numpy
- gdal
......@@ -21,7 +22,7 @@ dependencies:
- shapely
- holoviews
- bokeh
- pyresample
- 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