Skip to content

Commit

Permalink
Rel 1.10b2 (#1411)
Browse files Browse the repository at this point in the history
* This is 1.10b2

* Next dev version

* Reduce number of expected files in pyopener test

tests/data has 33 committed files
  • Loading branch information
sgillies authored Jul 11, 2024
1 parent 8c0a31e commit 6534ef7
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
11 changes: 8 additions & 3 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Changes

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

1.10b2 (TBD)
------------
1.10b2 (2024-07-10)
-------------------

Bug fixes:

Expand All @@ -14,7 +14,12 @@ Bug fixes:
plugin handlers cannot not be removed and so it may be observed that the size
of the Pyopener registry grows during the execution of a program.
- A CSLConstList ctypedef has been added and is used where appropriate (#1404).
- Fiona model objects have a informative, printable representation again (#).
- Fiona model objects have a informative, printable representation again
(#1380).

Packaging:

- PyPI wheels include GDAL 3.9.1 and curl 8.8.0.

1.10b1 (2024-04-16)
-------------------
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PYTHON_VERSION ?= 3.10
GDAL ?= ubuntu-small-3.6.4
GDAL ?= ubuntu-small-3.9.0
all: deps clean install test

.PHONY: docs
Expand Down Expand Up @@ -33,7 +33,7 @@ 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 -vvv --editable .[all] --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 tiledb && /venv/bin/python -m pip install -vvv --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'
Expand All @@ -51,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 .[all] --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 tiledb && /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)'
2 changes: 1 addition & 1 deletion fiona/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"remove",
]

__version__ = "1.10b2.dev0"
__version__ = "1.10b3.dev"
__gdal_version__ = get_gdal_release_name()

gdal_version = get_gdal_version_tuple()
Expand Down
2 changes: 1 addition & 1 deletion tests/test_pyopener.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def test_opener_fsspec_file_fs_listdir():
"""Use fsspec file filesystem as opener for listdir()."""
fs = fsspec.filesystem("file")
listing = fiona.listdir("tests/data", opener=fs)
assert len(listing) >= 35
assert len(listing) >= 33
assert set(
["coutwildrnp.shp", "coutwildrnp.dbf", "coutwildrnp.shx", "coutwildrnp.prj"]
) & set(listing)
Expand Down

0 comments on commit 6534ef7

Please sign in to comment.