🐛 Fix DatashaderRasterizer to allow N:1 instead of just 1:1 #98
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Used to wrong boolean operator (should be and, not or) which meant DatashaderRasterizer didn't work when the vector_datapipe was length 1 and canvas_datapipe was length 2 or more. This prevents false errors like `ValueError: Unmatched lengths for the canvas datapipe (XarrayCanvasIterDataPipe) and vector datapipe (PyogrioReaderIterDataPipe). The vector datapipe's length (1) should either be (1) to allow for broadcasting, or match the canvas datapipe's length of (2)`. Patches the bugfix at #39 from zen3geo v0.3.0. Also updated a unit test to use a 2:1 canvas:vector ratio to prevent regression.
The latest numpy=1.24 version installed via readthedocs is incompatible with datashader=0.14.4, resulting in an error like `AttributeError: module 'numpy' has no attribute 'warnings'`. This was reported in holoviz/datashader#1209 and fixed in holoviz/datashader#1176, but will need to wait for datashader>=0.14.5 to be released.
weiji14
added a commit
that referenced
this pull request
May 31, 2023
Pin to numpy==1.23.* no longer needed, as datashader 0.15.0 has been released which contains patch for not using `np.warning` at holoviz/datashader#1176. Reverts a5233e4 in #98.
weiji14
added a commit
that referenced
this pull request
May 31, 2023
* ⬆️ Bump numba from 0.56.4 to 0.57.0 Bumps [numba](https://github.com/numba/numba) from 0.56.4 to 0.57.0. - [Release notes](https://github.com/numba/numba/releases) - [Commits](numba/numba@0.56.4...0.57.0) Also bumps llvmlite from 0.39.0 to 0.40.0. Includes Python 3.11 wheels! * ⬆️ Bump spatialpandas from 0.4.4 to 0.4.8 Bumps [spatialpandas](https://github.com/holoviz/spatialpandas) from 0.4.4 to 0.4.8. - [Release notes](https://github.com/holoviz/spatialpandas/releases) - [Changelog](https://github.com/holoviz/spatialpandas/blob/master/CHANGELOG.md) - [Commits](holoviz/spatialpandas@v0.4.4...v0.4.8) Also bumped datashader from 0.14.2 to 0.14.4 and pyarrow from 9.0.0 to 12.0.0. * 👷 NEP29: Run CI and Docs build on Python 3.11 Bumps [python](https://github.com/python/cpython) from 3.10.11 to 3.11.3. - [Release notes](https://github.com/python/cpython/releases/tag/v3.11.3) - [Changelog](https://docs.python.org/3/whatsnew/3.11.html) - [Commits](python/cpython@v3.10.11...v3.11.3) Now testing the 'spatial' extras on Python 3.11. * 🚨 Bump GitHub Actions workflows to fix deprecations Updated actions/checkout and release-drafter/release-drafter to silence deprecated save-state (see https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands), updated pypa/gh-action-pypi-publish to use kebab-case parameters, and updated actions/setup-python for good measure too. All hashes are now followed by the version string as a comment for human readability. * ⬆️ Bump datashader from 0.14.4 to 0.15.0 Bumps [datashader](https://github.com/holoviz/datashader) from 0.14.4 to 0.15.0. - [Release notes](https://github.com/holoviz/datashader/releases) - [Changelog](https://github.com/holoviz/datashader/blob/master/CHANGELOG.rst) - [Commits](holoviz/datashader@v0.14.4...v0.15.0) * 👽 Remove numpy==1.23 pin Pin to numpy==1.23.* no longer needed, as datashader 0.15.0 has been released which contains patch for not using `np.warning` at holoviz/datashader#1176. Reverts a5233e4 in #98.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Used the wrong boolean operator (should be and, not or) which meant DatashaderRasterizer didn't work when the vector_datapipe was length 1 and canvas_datapipe was length 2 or more. This prevents false errors like
ValueError: Unmatched lengths for the canvas datapipe (XarrayCanvasIterDataPipe) and vector datapipe (PyogrioReaderIterDataPipe). The vector datapipe's length (1) should either be (1) to allow for broadcasting, or match the canvas datapipe's length of (2).Patches the bugfix at #39 from zen3geo v0.3.0. Also updated a unit test to use a 2:1 canvas:vector ratio to prevent regression.