[Git][debian-gis-team/fiona][experimental] 5 commits: New upstream version 1.10.0~rc1
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Fri Aug 23 07:36:09 BST 2024
Bas Couwenberg pushed to branch experimental at Debian GIS Project / fiona
Commits:
3a18f4d5 by Bas Couwenberg at 2024-08-23T08:28:01+02:00
New upstream version 1.10.0~rc1
- - - - -
29580a25 by Bas Couwenberg at 2024-08-23T08:28:02+02:00
Update upstream source from tag 'upstream/1.10.0_rc1'
Update to upstream version '1.10.0~rc1'
with Debian dir e84d685fc5882feb0245a1acda4c1940a57f5500
- - - - -
63edb19c by Bas Couwenberg at 2024-08-23T08:28:20+02:00
New upstream release candidate.
- - - - -
141c92d7 by Bas Couwenberg at 2024-08-23T08:31:17+02:00
Drop python3-munch from build dependencies.
- - - - -
730350c2 by Bas Couwenberg at 2024-08-23T08:31:34+02:00
Set distribution to experimental.
- - - - -
13 changed files:
- .github/dependabot.yml
- .github/workflows/scorecard.yml
- .github/workflows/test_gdal_latest.yml
- .github/workflows/tests.yml
- CHANGES.txt
- debian/changelog
- debian/control
- fiona/__init__.py
- fiona/model.py
- pyproject.toml
- requirements.txt
- − setup.cfg
- tests/test_model.py
Changes:
=====================================
.github/dependabot.yml
=====================================
@@ -6,3 +6,7 @@ updates:
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"
+ groups:
+ actions:
+ patterns:
+ - "*"
=====================================
.github/workflows/scorecard.yml
=====================================
@@ -59,7 +59,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
- uses: actions/upload-artifact at 0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+ uses: actions/upload-artifact at 834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
with:
name: SARIF file
path: results.sarif
@@ -67,6 +67,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif at afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+ uses: github/codeql-action/upload-sarif at eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
with:
sarif_file: results.sarif
=====================================
.github/workflows/test_gdal_latest.yml
=====================================
@@ -7,7 +7,7 @@ on:
- cron: '0 0 * * 0'
pull_request: # also build on PRs touching this file
paths:
- - ".github/workflows/test_gdal_latest.yaml"
+ - ".github/workflows/test_gdal_latest.yml"
- "ci/gdal-compile.sh"
concurrency:
=====================================
.github/workflows/tests.yml
=====================================
@@ -93,11 +93,11 @@ jobs:
matrix:
include:
- os: macos-13
- python-version: '3.11'
+ python-version: '3.12'
- os: macos-14
- python-version: '3.11'
+ python-version: '3.12'
- os: windows-latest
- python-version: '3.11'
+ python-version: '3.12'
steps:
- uses: actions/checkout at v4
@@ -109,6 +109,7 @@ jobs:
use-mamba: true
auto-update-conda: true
use-only-tar-bz2: false
+ python-version: ${{ matrix.python-version }}
- name: Install Env (OSX)
if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
@@ -116,7 +117,7 @@ jobs:
run: |
conda config --prepend channels conda-forge
conda config --set channel_priority strict
- conda create -n test python=${{ matrix.python-version }} libgdal geos=3.11 cython=3
+ conda create -n test python=${{ matrix.python-version }} libgdal geos=3.12 cython=3
conda activate test
python -m pip install -e . || python -m pip install -e .
python -m pip install -r requirements-dev.txt
@@ -127,7 +128,7 @@ jobs:
run: |
conda config --prepend channels conda-forge
conda config --set channel_priority strict
- conda create -n test python=${{ matrix.python-version }} libgdal geos=3.11 cython=3
+ conda create -n test python=${{ matrix.python-version }} libgdal geos=3.12 cython=3
conda activate test
GDAL_VERSION="3.7" python setup.py build_ext -I"/c/Users/runneradmin/miniconda3/envs/test/Library/include" -lgdal -L"/c/Users/runneradmin/miniconda3/envs/test/Library/lib" install
python -m pip install -r requirements-dev.txt
@@ -152,5 +153,3 @@ jobs:
run: |
conda activate test
python -m pytest -v -m "not wheel" -rxXs --cov fiona --cov-report term-missing
-
- - uses: codecov/codecov-action at v3
=====================================
CHANGES.txt
=====================================
@@ -3,6 +3,19 @@ Changes
All issue numbers are relative to https://github.com/Toblerity/Fiona/issues.
+1.10.0rc1 (2024-08-21)
+----------------------
+
+This is the first release candidate for 1.10.0.
+
+Changes:
+
+- Mutable item access to Feature, Geometry, and Properties instances has been
+ restored (reported in #1430). This usage should be avoided as instances of
+ these classes will be immutable in a future version.
+- The setup.cfg duplicates project configuration in pyproject.toml and has been
+ removed.
+
1.10b3 (2024-07-29)
-------------------
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+fiona (1.10.0~rc1-1~exp1) experimental; urgency=medium
+
+ * Team upload.
+ * New upstream release candidate.
+ * Drop python3-munch from build dependencies.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 23 Aug 2024 08:31:19 +0200
+
fiona (1.10~b3-1~exp1) experimental; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -19,7 +19,6 @@ Build-Depends: debhelper-compat (= 13),
python3-click-plugins,
python3-cligj,
python3-fsspec <!nocheck>,
- python3-munch,
python3-pyparsing,
python3-pytest <!nocheck>,
python3-requests <!nocheck>,
=====================================
fiona/__init__.py
=====================================
@@ -78,7 +78,7 @@ __all__ = [
"remove",
]
-__version__ = "1.10b3"
+__version__ = "1.10.0rc1"
__gdal_version__ = get_gdal_release_name()
gdal_version = get_gdal_version_tuple()
=====================================
fiona/model.py
=====================================
@@ -139,12 +139,15 @@ class Object(MutableMapping):
}
def __getitem__(self, item):
- props = {
- k: (dict(v) if isinstance(v, Object) else v)
- for k, v in self._props().items()
- }
- props.update(**self._data)
- return props[item]
+ if item in self._delegated_properties:
+ return getattr(self._delegate, item)
+ else:
+ props = {
+ k: (dict(v) if isinstance(v, Object) else v)
+ for k, v in self._props().items()
+ }
+ props.update(**self._data)
+ return props[item]
def __iter__(self):
props = self._props()
=====================================
pyproject.toml
=====================================
@@ -42,6 +42,8 @@ all = ["fiona[calc,s3,test]"]
calc = ["pyparsing", "shapely"]
s3 = ["boto3>=1.3.1"]
test = [
+ "aiohttp",
+ "fsspec",
"fiona[s3]",
"pytest>=7",
"pytest-cov",
=====================================
requirements.txt
=====================================
@@ -3,5 +3,4 @@ click~=8.0
click-plugins
cligj>=0.5.0
importlib-metadata;python_version<"3.10"
-munch>=2.3.2
certifi
=====================================
setup.cfg deleted
=====================================
@@ -1,3 +0,0 @@
-[options.entry_points]
-console_scripts =
- fio = fiona.fio.main:main_group
=====================================
tests/test_model.py
=====================================
@@ -342,3 +342,12 @@ def test_feature_repr():
properties=Properties(a=1, foo="bar"),
)
assert repr(feat) == "fiona.Feature(geometry=fiona.Geometry(coordinates=[(0, 0), ...], type='LineString'), id='1', properties=fiona.Properties(a=1, foo='bar'))"
+
+
+def test_issue1430():
+ """__getitem__() returns property, not disconnected dict."""
+ feat = Feature(properties=Properties())
+ with pytest.warns(FionaDeprecationWarning, match="immutable"):
+ feat["properties"]["foo"] = "bar"
+ assert feat["properties"]["foo"] == "bar"
+ assert feat.properties["foo"] == "bar"
View it on GitLab: https://salsa.debian.org/debian-gis-team/fiona/-/compare/02911509a935d752b4fcd4684caa7f4c82b44b25...730350c29c239a6950252f35941779f088acbcf7
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/fiona/-/compare/02911509a935d752b4fcd4684caa7f4c82b44b25...730350c29c239a6950252f35941779f088acbcf7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240823/bc5084ba/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list