Correct dask and bokeh dependencies #1104
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1053.
install_requires
insetup.py
now containsdask
, which is whatpip
requires.conda
requiresdask-core
only which is what thepyctdev
mapping insetup.cfg
produces. These changes ensure thatbokeh
is not an install dependency fordatashader
.The
conda-forge
datashader-feedstock
will need fixing in line with this, but I will do that when 0.14.2 is released and theconda-forge
bot identifies the new release and raises a PR for the updates.I have also changed
license_file
tolicense_files
as the former is deprecated, and addedspatialpandas
to theexamples
dependencies as example 8 (polygons) usesspatialpandas
. There is no requirement to add the fulldask
to theexamples
dependencies as this is automatically pulled in by thespatialpandas
requirements.spatialpandas
needs to have similar changes to this PR, and we will have to check how thedask
dependencies chain through the libraries following that. But there will be adatashader
release before the nextspatialpandas
release and this PR is sufficient until the latter occurs.I have check local installs using
pip
andconda
(viapyctdev
) and also built bothpip
andconda
packages locally to check that the changes here are correct.