Skip to content
Snippets Groups Projects
Commit 45c5bcf1 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Removed dask frm dependencies as it was only an indirect dependency. Updated version info.

parent 8f3fe8e2
Branches
Tags v0.8.34
No related merge requests found
Pipeline #12951 passed
......@@ -20,5 +20,5 @@
# with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '0.8.33'
__versionalias__ = '20200918.01'
__version__ = '0.8.34'
__versionalias__ = '20200928.01'
......@@ -12,4 +12,3 @@ folium
scikit-image
#holoviews
#git+https://github.com/matplotlib/basemap.git
dask>=0.15.0 # resolves an import error of holoviews
......@@ -3,5 +3,3 @@ dill
mpld3
geojson
folium
dask>=0.15.0 # resolves an import error of holoviews
......@@ -39,13 +39,11 @@ with open("geoarray/version.py") as version_file:
requirements = [
'py_tools_ds>=0.14.35', 'numpy', 'matplotlib', 'six', 'gdal>=2.1.0', 'shapely', 'pandas', 'dill', 'mpld3',
'geojson', 'folium', 'scikit-image', 'dask>=0.15.0'
# dask is only indirectly needed but updating to >=0.15.0 resolves https://stackoverflow.com/questions/43833081/
# attributeerror-module-object-has-no-attribute-computation
'geojson', 'folium', 'scikit-image'
# 'holoviews', # conda install --yes -c ioam bokeh holoviews ; \
# git+https://github.com/matplotlib/basemap.git # conda install --yes -c conda-forge basemap
]
setup_requirements = ['dask>=0.15.0']
setup_requirements = []
test_requirements = requirements + ["coverage", "nose", "nose2", "nose-htmloutput", "rednose"]
setup(
......@@ -68,9 +66,7 @@ setup(
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Natural Language :: English',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment