Skip to content

Commit

Permalink
Updated minimal version of py_tools_ds (fixes PyProj DeprecationWarni…
Browse files Browse the repository at this point in the history
…ng). Updated version info.

Signed-off-by: Daniel Scheffler <danschef@gfz-potsdam.de>
  • Loading branch information
danschef committed May 18, 2020
1 parent 50825aa commit f1ec581
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ test_arosics:
stage: test
script:
- source /root/miniconda3/bin/activate ci_env
- pip install "py_tools_ds>=0.14.27" # FIXME remove as soon as docker runner has been updated
- pip install "py_tools_ds>=0.14.28" # FIXME remove as soon as docker runner has been updated

# run tests
- make nosetests
Expand Down
4 changes: 2 additions & 2 deletions arosics/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
# with this program. If not, see <http://www.gnu.org/licenses/>.


__version__ = '0.9.16'
__versionalias__ = '2020-04-09_02'
__version__ = '0.9.17'
__versionalias__ = '2020-05-19_01'
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
geoarray>=0.8.17
py_tools_ds>=0.14.27
py_tools_ds>=0.14.28
cmocean
numpy
gdal
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
exec(version_file.read(), version)

requirements = ['numpy', 'gdal', 'shapely', 'scikit-image', 'matplotlib', 'geopandas', 'pandas',
'geoarray>=0.8.17', 'py_tools_ds>=0.14.27', 'plotly', 'cmocean', 'six', 'folium>=0.6.0', 'geojson'
'geoarray>=0.8.17', 'py_tools_ds>=0.14.28', 'plotly', 'cmocean', 'six', 'folium>=0.6.0', 'geojson'
# '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; \
Expand Down
2 changes: 1 addition & 1 deletion tests/CI_docker/context/environment_arosics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ dependencies:
- rednose
- plotly
- geoarray>=0.8.17
- py_tools_ds>=0.14.27
- py_tools_ds>=0.14.28

0 comments on commit f1ec581

Please sign in to comment.