Make estimate-area and rasterio/GDAL optional
#149
Merged
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
johnk1
commented
Mar 3, 2022
| @@ -16,4 +17,5 @@ deploy: | |||
| password: $PYPI_PASSWORD | |||
| distributions: "sdist bdist_wheel" | |||
| on: | |||
| python: 3.7 | |||
There was a problem hiding this comment.
Travis' default dist action w/pypi fails with an error on python 3.6 now, so I changed this to publish with 3.7
johnk1
commented
Mar 3, 2022
johnk1
commented
Mar 3, 2022
| @@ -1,6 +1,7 @@ | |||
| boto3==1.9.99 | |||
| Click==7.1.2 | |||
| cligj==0.5.0 | |||
| numpy==1.19.5 | |||
There was a problem hiding this comment.
This is a direct dependency but came in via supermercado
dnomadb
suggested changes
Mar 14, 2022
There was a problem hiding this comment.
This looks / works great @johnk1. One suggestion -- add the link for installation to the estimate-area docstring. Something like:
tilesets estimate-area --help
Usage: tilesets estimate-area [OPTIONS] FEATURES...
Estimate area of features with a precision level. Requires extra installation steps: see https://github.com/mapbox/tilesets-cli/blob/master/README.md.
| @@ -70,7 +70,7 @@ Releases to PyPi are handled via TravisCI and GitHub tags. Once changes have bee | |||
| All tests are runnable with pytest. pytest is not installed by default and can be installed with the pip test extras | |||
|
|
|||
| ```shell | |||
| pip install -e .[test] | |||
| pip install -e '.[test]' | |||
There was a problem hiding this comment.
Do the tests require [estimate-area] as well?
There was a problem hiding this comment.
No, [test] includes supermercado already
dnomadb
approved these changes
Mar 14, 2022
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.
fixes #147
This makes
estimate-areaan optional command. This command depends on rasterio w/GDAL, which is not as easily installed on arm64 Macs. So, this PR enables a simple installation for most uses while still keeping this command available.testing
This shows the basic installation without estimate-area. We see the command fails with an exception.
$ pyenv activate env1 $ pip install mapbox-tilesets==1.7.3a1 Collecting mapbox-tilesets==1.7.3a1 Downloading mapbox_tilesets-1.7.3a1-py3-none-any.whl (15 kB) ... $ tilesets --version 1.7.3a1 $ tilesets list <account> ... list of tilesets $ tilesets estimate-area valid.ldgeojson -p 10m Traceback (most recent call last): File "/Users/johnklancer/.pyenv/versions/fresh/bin/tilesets", line 8, in <module> sys.exit(cli()) File "/Users/johnklancer/.pyenv/versions/3.9.10/envs/fresh/lib/python3.9/site-packages/click/core.py", line 829, in __call__ return self.main(*args, **kwargs) File "/Users/johnklancer/.pyenv/versions/3.9.10/envs/fresh/lib/python3.9/site-packages/click/core.py", line 782, in main rv = self.invoke(ctx) File "/Users/johnklancer/.pyenv/versions/3.9.10/envs/fresh/lib/python3.9/site-packages/click/core.py", line 1259, in invoke return _process_result(sub_ctx.command.invoke(sub_ctx)) File "/Users/johnklancer/.pyenv/versions/3.9.10/envs/fresh/lib/python3.9/site-packages/click/core.py", line 1066, in invoke return ctx.invoke(self.callback, **ctx.params) File "/Users/johnklancer/.pyenv/versions/3.9.10/envs/fresh/lib/python3.9/site-packages/click/core.py", line 610, in invoke return callback(*args, **kwargs) File "/Users/johnklancer/.pyenv/versions/3.9.10/envs/fresh/lib/python3.9/site-packages/mapbox_tilesets/scripts/cli.py", line 756, in estimate_area filter_features = utils.load_module("supermercado.super_utils").filter_features File "/Users/johnklancer/.pyenv/versions/3.9.10/envs/fresh/lib/python3.9/site-packages/mapbox_tilesets/utils.py", line 18, in load_module raise ValueError( ValueError: Couldn't find supermercado.super_utils. Check installation steps in the readme for help.This test shows the full installation including estimate-area. Testing on an M1 with
brew install gdalalready run.After review
Once this is merged, I will bump the version to 1.7.3, tag, and verify it's published.