Remove esri.py and datashader from core dependencies#953
Merged
Conversation
Delete esri.py (unused REST client for ArcGIS feature services). Move datashader from install_requires to extras_require[examples]. Replace ds.Canvas coordinate hacks in terrain.py and datasets/__init__.py with np.linspace. Replace tf.Image with PIL.Image in bands_to_img and color_values. Add local hex-to-RGB helper to replace datashader.colors.rgb. Make canvas_like lazy-import datashader with a clear ImportError. Update test_viewshed.py fixture to build coords without datashader.
Pillow is not a declared dependency, so importing it at module level breaks environments that don't have it installed (like CI). Move the import inside the two functions that need it.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Closes #947
Summary
esri.py(dead code: no imports, no tests, undeclaredrequestsdependency)datashaderfrominstall_requirestoextras_require[examples]insetup.cfgds.Canvascoordinate hacks interrain.pyanddatasets/__init__.pywithnp.linspacedatashader.transfer_functions.ImageforPIL.Imageinbands_to_img()andcolor_values()_hex_to_rgb()to replacedatashader.colors.rgbcanvas_like()now lazy-imports datashader and raisesImportErrorif missingtest_viewshed.pyfixture builds coordinates withnp.linspaceinstead ofds.Canvaszonal.pydocstring exampleTest plan
pytest xrspatial/tests/test_viewshed.py-- 22 passedpytest xrspatial/tests/test_terrain.py-- 27 passedpytest xrspatial/tests/test_utils.py-- 4 passed