Skip to content

Commit

Permalink
Bring onboard filter, map, and reduce from fio-planet (#1362)
Browse files Browse the repository at this point in the history
* Bring onboard filter, map, and reduce from fio-planet

With some refactoring and conditional enablement of commands that
require shapely.

* Updates to change log and docs

* Expect FutureWarning, move pyparsing, shapely dependencies.

* Add simplification examples

* Move images under docs

* Fix link.

* Mark jq
  • Loading branch information
sgillies committed Apr 3, 2024
1 parent 42ed681 commit 63f99ce
Show file tree
Hide file tree
Showing 23 changed files with 1,896 additions and 146 deletions.
15 changes: 14 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,22 @@ Changes

All issue numbers are relative to https://github.com/Toblerity/Fiona/issues.

1.01a2 (TBD)
1.10a2 (TBD)
------------

Deprecations:

The Python style of rio-filter expressions introduced in version 1.0 are
deprecated. Only the parenthesized list type of expression will be supported by
version 2.0.

New features:

The filter, map, and reduce CLI commands from the public domain version 1.1.0
of fio-planet have been incorporated into Fiona's core set of commands (#1362).
These commands are only available if pyparsing and shapely (each of these are
declared in the "calc" set of extra requirements) are installed.

Bug fixes:

- Add a 16-bit integer type "int16" based on OGR's OSFTInt16 integer sub-type
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ dockertestimage:
docker build --target gdal --build-arg GDAL=$(GDAL) --build-arg PYTHON_VERSION=$(PYTHON_VERSION) -t fiona:$(GDAL)-py$(PYTHON_VERSION) .

dockertest: dockertestimage
docker run -it -v $(shell pwd):/app -v /tmp:/tmp --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --entrypoint=/bin/bash fiona:$(GDAL)-py$(PYTHON_VERSION) -c '/venv/bin/python -m pip install --editable . --no-build-isolation && /venv/bin/python -B -m pytest -m "not wheel" --cov fiona --cov-report term-missing $(OPTS)'
docker run -it -v $(shell pwd):/app -v /tmp:/tmp --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --entrypoint=/bin/bash fiona:$(GDAL)-py$(PYTHON_VERSION) -c '/venv/bin/python -m pip install --editable .[all] --no-build-isolation && /venv/bin/python -B -m pytest -m "not wheel" --cov fiona --cov-report term-missing $(OPTS)'

dockershell: dockertestimage
docker run -it -v $(shell pwd):/app --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --entrypoint=/bin/bash fiona:$(GDAL)-py$(PYTHON_VERSION) -c '/venv/bin/python -m pip install --editable . --no-build-isolation && /bin/bash'

dockersdist: dockertestimage
docker run -it -v $(shell pwd):/app --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --entrypoint=/bin/bash fiona:$(GDAL)-py$(PYTHON_VERSION) -c '/venv/bin/python -m build --sdist'

Expand All @@ -50,4 +51,4 @@ dockertestimage-amd64:
docker build --platform linux/amd64 --target gdal --build-arg GDAL=$(GDAL) --build-arg PYTHON_VERSION=$(PYTHON_VERSION) -t fiona-amd64:$(GDAL)-py$(PYTHON_VERSION) .

dockertest-amd64: dockertestimage-amd64
docker run -it -v $(shell pwd):/app -v /tmp:/tmp --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --entrypoint=/bin/bash fiona-amd64:$(GDAL)-py$(PYTHON_VERSION) -c '/venv/bin/python -m pip install --editable . --no-build-isolation && /venv/bin/python -B -m pytest -m "not wheel" --cov fiona --cov-report term-missing $(OPTS)'
docker run -it -v $(shell pwd):/app -v /tmp:/tmp --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --entrypoint=/bin/bash fiona-amd64:$(GDAL)-py$(PYTHON_VERSION) -c '/venv/bin/python -m pip install --editable .[all] --no-build-isolation && /venv/bin/python -B -m pytest -m "not wheel" --cov fiona --cov-report term-missing $(OPTS)'
Loading

0 comments on commit 63f99ce

Please sign in to comment.