From 8dd7f0b5446c887ce6f02911096ac0114a2847b0 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 7 Jan 2024 03:20:46 -0500 Subject: [PATCH 01/26] Update to latest version (#2256876) --- .gitignore | 1 + python-geopandas.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f225c1b..88410ca 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /geopandas-0.13.2.tar.gz /geopandas-0.14.0.tar.gz /geopandas-0.14.1.tar.gz +/geopandas-0.14.2.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index 0ae1806..75defe9 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,7 +6,7 @@ %bcond bootstrap 0 Name: python-%{srcname} -Version: 0.14.1 +Version: 0.14.2 Release: %autorelease Summary: Geographic Pandas extensions diff --git a/sources b/sources index 69ae17f..b04d986 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.14.1.tar.gz) = ef9bfc215ffe1533c1497b8ea0cb740f497f686b2e50067197b2b44fde2554fcadfefa9c1bbc117c4de2f925d1477a17211afafb65bfbaab01088fed333a93b4 +SHA512 (geopandas-0.14.2.tar.gz) = 1f5da5aee0565612e3535c52b3c4a725b9a61fc2e2f83d5c2ad99b8df12c47207d32a5be08a3f85d3872899adfde60abc97cc66e40f9624cb17b763248f05d68 From ad77d690577f1ccbfdf0fc66073bda612d39c327 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 01:39:48 +0000 Subject: [PATCH 02/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 312fece844936ad745df67ce2620d2bb2f008d17 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 04:43:08 +0000 Subject: [PATCH 03/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7a4dc12b6638bc8d17d27d14df5e68acc24c282f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 4 Feb 2024 20:23:24 -0500 Subject: [PATCH 04/26] Update to latest version (#2262154) --- .gitignore | 1 + python-geopandas.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 88410ca..0ed4e2e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /geopandas-0.14.0.tar.gz /geopandas-0.14.1.tar.gz /geopandas-0.14.2.tar.gz +/geopandas-0.14.3.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index 75defe9..4fc00c8 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,7 +6,7 @@ %bcond bootstrap 0 Name: python-%{srcname} -Version: 0.14.2 +Version: 0.14.3 Release: %autorelease Summary: Geographic Pandas extensions diff --git a/sources b/sources index b04d986..329cbe0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.14.2.tar.gz) = 1f5da5aee0565612e3535c52b3c4a725b9a61fc2e2f83d5c2ad99b8df12c47207d32a5be08a3f85d3872899adfde60abc97cc66e40f9624cb17b763248f05d68 +SHA512 (geopandas-0.14.3.tar.gz) = 0be32ccd6699b52b9982683b48a6506e7d72e29dd39d282b27cc785964ef593dcb20dec0aebaaf35f04a8a979209e1f6b55f46b77b8f66aa44eb9cca549b1c4f From 1c3d63420f618c8b0e473caca625fe069c0846fb Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 25 Jun 2024 21:44:15 -0400 Subject: [PATCH 05/26] Update to latest version (#2274937) --- .gitignore | 1 + python-geopandas.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0ed4e2e..eae5ca0 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /geopandas-0.14.1.tar.gz /geopandas-0.14.2.tar.gz /geopandas-0.14.3.tar.gz +/geopandas-0.14.4.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index 4fc00c8..3b5d636 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,7 +6,7 @@ %bcond bootstrap 0 Name: python-%{srcname} -Version: 0.14.3 +Version: 0.14.4 Release: %autorelease Summary: Geographic Pandas extensions diff --git a/sources b/sources index 329cbe0..46ef993 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.14.3.tar.gz) = 0be32ccd6699b52b9982683b48a6506e7d72e29dd39d282b27cc785964ef593dcb20dec0aebaaf35f04a8a979209e1f6b55f46b77b8f66aa44eb9cca549b1c4f +SHA512 (geopandas-0.14.4.tar.gz) = 2e6a5075662a6b2a1c7202a1a6d7f001ad9c3c5c76794b69b2e6d5b97aa7f05e60ac59b494031227b48340d188dc243945289558fe22fd336608b75413c4b717 From 6578064576c3c6da7a068b0f91f27dacf199872e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 26 Jun 2024 02:31:48 -0400 Subject: [PATCH 06/26] Backport fixes for GDAL 3.9 --- 0001-Backport-fixes-for-GDAL-3.9.patch | 34 ++++++++++++++++++++++++++ python-geopandas.spec | 3 +++ 2 files changed, 37 insertions(+) create mode 100644 0001-Backport-fixes-for-GDAL-3.9.patch diff --git a/0001-Backport-fixes-for-GDAL-3.9.patch b/0001-Backport-fixes-for-GDAL-3.9.patch new file mode 100644 index 0000000..cb782c0 --- /dev/null +++ b/0001-Backport-fixes-for-GDAL-3.9.patch @@ -0,0 +1,34 @@ +From e0db755cb3680977463c1c71dee600038b464216 Mon Sep 17 00:00:00 2001 +From: Martin Fleischmann +Date: Fri, 17 May 2024 09:31:36 +0200 +Subject: [PATCH] Backport fixes for GDAL 3.9 + +This backports two commits: +- TST: GDAL 3.9 compat for boolean array in shp (#3286) +- TST: GDAL 3.9 compat for boolean array in shp for fiona (#3303) + +Signed-off-by: Elliott Sales de Andrade +--- + geopandas/io/tests/test_file.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/geopandas/io/tests/test_file.py b/geopandas/io/tests/test_file.py +index 4b516276..005a4c27 100644 +--- a/geopandas/io/tests/test_file.py ++++ b/geopandas/io/tests/test_file.py +@@ -174,9 +174,10 @@ def test_to_file_bool(tmpdir, driver, ext, engine): + result = read_file(tempfilename, engine=engine) + if ext in (".shp", ""): + # Shapefile does not support boolean, so is read back as int +- if engine == "fiona": ++ # but since GDAL 3.9 supports boolean fields in SHP ++ if engine == "fiona" and fiona.gdal_version.minor < 9: + df["col"] = df["col"].astype("int64") +- else: ++ elif engine == "pyogrio" and pyogrio.__gdal_version__ < (3, 9): + df["col"] = df["col"].astype("int32") + assert_geodataframe_equal(result, df) + # check the expected driver +-- +2.45.2 + diff --git a/python-geopandas.spec b/python-geopandas.spec index 3b5d636..76932a1 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -13,6 +13,9 @@ Summary: Geographic Pandas extensions License: BSD-3-Clause URL: https://pypi.python.org/pypi/%{srcname} Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz +# https://github.com/geopandas/geopandas/pull/3286 +# https://github.com/geopandas/geopandas/pull/3303 +Patch: 0001-Backport-fixes-for-GDAL-3.9.patch BuildArch: noarch From 721851873bf59cb49951636b2579f4126e17a364 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 11:52:31 +0000 Subject: [PATCH 07/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6d812c87430381bbc52a946cd2084f145602de1a Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 17 Nov 2024 06:39:04 -0500 Subject: [PATCH 08/26] Update to latest version (#2295479) --- .gitignore | 1 + 0001-Backport-fixes-for-GDAL-3.9.patch | 34 -------------------------- python-geopandas.spec | 25 +++++++++---------- sources | 2 +- 4 files changed, 14 insertions(+), 48 deletions(-) delete mode 100644 0001-Backport-fixes-for-GDAL-3.9.patch diff --git a/.gitignore b/.gitignore index eae5ca0..9fc9f92 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /geopandas-0.14.2.tar.gz /geopandas-0.14.3.tar.gz /geopandas-0.14.4.tar.gz +/geopandas-1.0.1.tar.gz diff --git a/0001-Backport-fixes-for-GDAL-3.9.patch b/0001-Backport-fixes-for-GDAL-3.9.patch deleted file mode 100644 index cb782c0..0000000 --- a/0001-Backport-fixes-for-GDAL-3.9.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e0db755cb3680977463c1c71dee600038b464216 Mon Sep 17 00:00:00 2001 -From: Martin Fleischmann -Date: Fri, 17 May 2024 09:31:36 +0200 -Subject: [PATCH] Backport fixes for GDAL 3.9 - -This backports two commits: -- TST: GDAL 3.9 compat for boolean array in shp (#3286) -- TST: GDAL 3.9 compat for boolean array in shp for fiona (#3303) - -Signed-off-by: Elliott Sales de Andrade ---- - geopandas/io/tests/test_file.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/geopandas/io/tests/test_file.py b/geopandas/io/tests/test_file.py -index 4b516276..005a4c27 100644 ---- a/geopandas/io/tests/test_file.py -+++ b/geopandas/io/tests/test_file.py -@@ -174,9 +174,10 @@ def test_to_file_bool(tmpdir, driver, ext, engine): - result = read_file(tempfilename, engine=engine) - if ext in (".shp", ""): - # Shapefile does not support boolean, so is read back as int -- if engine == "fiona": -+ # but since GDAL 3.9 supports boolean fields in SHP -+ if engine == "fiona" and fiona.gdal_version.minor < 9: - df["col"] = df["col"].astype("int64") -- else: -+ elif engine == "pyogrio" and pyogrio.__gdal_version__ < (3, 9): - df["col"] = df["col"].astype("int32") - assert_geodataframe_equal(result, df) - # check the expected driver --- -2.45.2 - diff --git a/python-geopandas.spec b/python-geopandas.spec index 76932a1..b990c75 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,16 +6,14 @@ %bcond bootstrap 0 Name: python-%{srcname} -Version: 0.14.4 +Version: 1.0.1 Release: %autorelease Summary: Geographic Pandas extensions License: BSD-3-Clause URL: https://pypi.python.org/pypi/%{srcname} -Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz -# https://github.com/geopandas/geopandas/pull/3286 -# https://github.com/geopandas/geopandas/pull/3303 -Patch: 0001-Backport-fixes-for-GDAL-3.9.patch +# PyPI source does not have test data. +Source: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz BuildArch: noarch @@ -36,14 +34,16 @@ Summary: %{summary} BuildRequires: python3-devel %if %{without bootstrap} -BuildRequires: python3dist(numpy) >= 1.15 -BuildRequires: python3dist(pytest) BuildRequires: python3dist(fsspec) -BuildRequires: python3dist(psycopg2) -BuildRequires: python3dist(rtree) >= 0.8 -BuildRequires: python3dist(sqlalchemy) -BuildRequires: python3dist(matplotlib) >= 3.3.4 +BuildRequires: python3dist(fiona) +BuildRequires: python3dist(geopy) BuildRequires: python3dist(mapclassify) +BuildRequires: python3dist(matplotlib) >= 3.5 +BuildRequires: python3dist(psycopg) >= 3.1 +BuildRequires: python3dist(pyarrow) >= 8 +BuildRequires: python3dist(pytest) +BuildRequires: python3dist(sqlalchemy) >= 1.3 +BuildRequires: python3dist(xyzservices) # See: # Depend on pandas[test] for testing # https://github.com/geopandas/geopandas/pull/2438 @@ -69,8 +69,7 @@ BuildRequires: python3dist(pandas[test]) %if %{without bootstrap} %{pytest} -ra geopandas -m 'not web' %else -# naturalearth_creation assumes zipfile from naturalearthdata was downloaded to current directory -%pyproject_check_import -e 'geopandas.*test*' -e geopandas.datasets.naturalearth_creation +%pyproject_check_import -e 'geopandas.*test*' %endif %files -n python3-%{srcname} -f %{pyproject_files} diff --git a/sources b/sources index 46ef993..d90dd19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.14.4.tar.gz) = 2e6a5075662a6b2a1c7202a1a6d7f001ad9c3c5c76794b69b2e6d5b97aa7f05e60ac59b494031227b48340d188dc243945289558fe22fd336608b75413c4b717 +SHA512 (geopandas-1.0.1.tar.gz) = 41ed79c1c798837b063ee45b1cda677b9f205cbc38e0ead019f86406a626fb8cfaae111ca8cead369c46155102665da094fa6d9ae2588290fa38b546a3875d87 From fc0537bda5c08ab1123411f60b5387cf8f09713a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 27 Nov 2024 14:52:31 +0000 Subject: [PATCH 09/26] Rebuild for libarrow 18 From 86b3e8f5aaf3d9351f2759d09b503d55ce446b83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 14:38:11 +0000 Subject: [PATCH 10/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 2548b4023e13b7a7b44c048c35df83099c6eb4eb Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 2 Jun 2025 13:23:32 -0400 Subject: [PATCH 11/26] Add Packit configuration --- .packit.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..d11d5ba --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,18 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ +--- +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + rawhide: + fast_forward_merge_into: + - fedora-branched + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-all + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-all From 3d9937b7db67368e04a56f3209230e7da0995fe5 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 2 Jun 2025 13:23:55 -0400 Subject: [PATCH 12/26] Update to latest version --- .gitignore | 1 + python-geopandas.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9fc9f92..6b2ee21 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /geopandas-0.14.3.tar.gz /geopandas-0.14.4.tar.gz /geopandas-1.0.1.tar.gz +/geopandas-1.1.0.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index b990c75..3f01717 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,7 +6,7 @@ %bcond bootstrap 0 Name: python-%{srcname} -Version: 1.0.1 +Version: 1.1.0 Release: %autorelease Summary: Geographic Pandas extensions @@ -35,14 +35,14 @@ BuildRequires: python3-devel %if %{without bootstrap} BuildRequires: python3dist(fsspec) -BuildRequires: python3dist(fiona) +BuildRequires: python3dist(fiona) >= 1.8.21 BuildRequires: python3dist(geopy) -BuildRequires: python3dist(mapclassify) -BuildRequires: python3dist(matplotlib) >= 3.5 +BuildRequires: python3dist(mapclassify) >= 2.5 +BuildRequires: python3dist(matplotlib) >= 3.7 BuildRequires: python3dist(psycopg) >= 3.1 BuildRequires: python3dist(pyarrow) >= 8 BuildRequires: python3dist(pytest) -BuildRequires: python3dist(sqlalchemy) >= 1.3 +BuildRequires: python3dist(sqlalchemy) >= 2 BuildRequires: python3dist(xyzservices) # See: # Depend on pandas[test] for testing diff --git a/sources b/sources index d90dd19..d6abed1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-1.0.1.tar.gz) = 41ed79c1c798837b063ee45b1cda677b9f205cbc38e0ead019f86406a626fb8cfaae111ca8cead369c46155102665da094fa6d9ae2588290fa38b546a3875d87 +SHA512 (geopandas-1.1.0.tar.gz) = 12dfc4f9fab0088858ca8405a0a7ff314a7ed557e32078e23c5b2730a2b9ea7df6b70aa63387da78e5879a285086363989c3bab8362d79bfc1e267c5443ad5af From d06bff8bbfc639d012b2de44423d6ad3bb834580 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 18 Jun 2025 21:31:53 +0200 Subject: [PATCH 13/26] Bootstrap for Python 3.14 --- python-geopandas.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-geopandas.spec b/python-geopandas.spec index 3f01717..331cdbc 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 %global srcname geopandas # There is a build dependency loop when built with tests. From 060efb3a98556989037062e2848bcfaae5e6dd85 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 21 Jul 2025 11:30:04 +0200 Subject: [PATCH 14/26] Unbootstrap for Python 3.14 --- python-geopandas.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index 331cdbc..3f01717 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 %global srcname geopandas # There is a build dependency loop when built with tests. From f4c7ba07b4537a399a8f51088e4d1b3b5f24d285 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 08:04:56 +0000 Subject: [PATCH 15/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e1ff79ca6260cfe3a99497d9d109f401c1b513f0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 13:48:36 +0200 Subject: [PATCH 16/26] Rebuilt for Python 3.14.0rc2 bytecode From adda4debfdd74b8108b35a8ce2c80c54c33c5147 Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 7 Sep 2025 07:50:05 +0000 Subject: [PATCH 17/26] Update to 1.1.1 upstream release - Resolves: rhbz#2369643 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 3 +++ python-geopandas.spec | 2 +- sources | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 6b2ee21..1fc04d0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /geopandas-0.14.4.tar.gz /geopandas-1.0.1.tar.gz /geopandas-1.1.0.tar.gz +/geopandas-1.1.1.tar.gz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..fb341a1 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. diff --git a/python-geopandas.spec b/python-geopandas.spec index 3f01717..f1ab769 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,7 +6,7 @@ %bcond bootstrap 0 Name: python-%{srcname} -Version: 1.1.0 +Version: 1.1.1 Release: %autorelease Summary: Geographic Pandas extensions diff --git a/sources b/sources index d6abed1..e4c6f7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-1.1.0.tar.gz) = 12dfc4f9fab0088858ca8405a0a7ff314a7ed557e32078e23c5b2730a2b9ea7df6b70aa63387da78e5879a285086363989c3bab8362d79bfc1e267c5443ad5af +SHA512 (geopandas-1.1.1.tar.gz) = 096630e7f7d17c36bb7855f00d83f728c68a9c9e43ebe46608eef97220f839bb520815cd3b8bbf71953387cc91e65d15af155495238fe3fd862c1bc54e1e5f74 From 1932cf508541c5ba95448ff0e31e8d01beca5530 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 13:22:33 +0200 Subject: [PATCH 18/26] Rebuilt for Python 3.14.0rc3 bytecode From 15a43a8ec735194404a994f53cbc29ca5f9f67c1 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 23 Sep 2025 19:23:03 -0400 Subject: [PATCH 19/26] Fix tests with GEOS 3.14 --- ...8fe055f8bf10bf7a0ae64dc39a10799cf99e.patch | 89 +++++++++++++++++++ python-geopandas.spec | 2 + 2 files changed, 91 insertions(+) create mode 100644 1d598fe055f8bf10bf7a0ae64dc39a10799cf99e.patch diff --git a/1d598fe055f8bf10bf7a0ae64dc39a10799cf99e.patch b/1d598fe055f8bf10bf7a0ae64dc39a10799cf99e.patch new file mode 100644 index 0000000..a2facc0 --- /dev/null +++ b/1d598fe055f8bf10bf7a0ae64dc39a10799cf99e.patch @@ -0,0 +1,89 @@ +From 1d598fe055f8bf10bf7a0ae64dc39a10799cf99e Mon Sep 17 00:00:00 2001 +From: Matt Richards <45483497+m-richards@users.noreply.github.com> +Date: Tue, 23 Sep 2025 17:57:22 +1000 +Subject: [PATCH] TST: Max Inscribed circle for GEOS 3.14 (#3645) + +Co-authored-by: Joris Van den Bossche +--- + geopandas/base.py | 14 +++++++------- + geopandas/tests/test_geom_methods.py | 29 +++++++++++++++------------- + 2 files changed, 23 insertions(+), 20 deletions(-) + +diff --git a/geopandas/base.py b/geopandas/base.py +index 32bbc8f21a..a37e1e0214 100644 +--- a/geopandas/base.py ++++ b/geopandas/base.py +@@ -1888,22 +1888,22 @@ def maximum_inscribed_circle(self, *, tolerance=None): + >>> s = geopandas.GeoSeries( + ... [ + ... Polygon([(0, 0), (1, 1), (0, 1), (0, 0)]), +- ... Polygon([(0, 0), (10, 10), (0, 10), (0, 0)]), ++ ... Polygon([(0, 0), (0.5, -1), (1, 0), (1, 1), (-0.5, 0.5)]), + ... ] + ... ) + >>> s +- 0 POLYGON ((0 0, 1 1, 0 1, 0 0)) +- 1 POLYGON ((0 0, 10 10, 0 10, 0 0)) ++ 0 POLYGON ((0 0, 1 1, 0 1, 0 0)) ++ 1 POLYGON ((0 0, 0.5 -1, 1 0, 1 1, -0.5 0.5, 0 0)) + dtype: geometry + + >>> s.maximum_inscribed_circle() +- 0 LINESTRING (0.29297 0.70703, 0.5 0.5) +- 1 LINESTRING (2.92969 7.07031, 5 5) ++ 0 LINESTRING (0.29289 0.70711, 0.5 0.5) ++ 1 LINESTRING (0.4668 0.25977, 1 0.25977) + dtype: geometry + + >>> s.maximum_inscribed_circle(tolerance=2) +- 0 LINESTRING (0.25 0.5, 0.375 0.375) +- 1 LINESTRING (2.5 7.5, 2.5 10) ++ 0 LINESTRING (0.29289 0.70711, 0.5 0.5) ++ 1 LINESTRING (0.375 0.25, 0 0) + dtype: geometry + + See Also +diff --git a/geopandas/tests/test_geom_methods.py b/geopandas/tests/test_geom_methods.py +index 866faff5d2..c5d597bbc6 100644 +--- a/geopandas/tests/test_geom_methods.py ++++ b/geopandas/tests/test_geom_methods.py +@@ -1613,23 +1613,26 @@ def test_minimum_bounding_circle(self): + + @pytest.mark.skipif(not SHAPELY_GE_21, reason="requires shapely 2.1") + def test_maximum_inscribed_circle(self): +- mic = self.g1.maximum_inscribed_circle() +- expected = GeoSeries( ++ gs = GeoSeries( + [ +- LineString([(0.70703125, 0.29296875), (0.5, 0.5)]), +- LineString([(0.5, 0.5), (0.5, 0)]), ++ Polygon([(0, 0), (1, 0), (1, 1), (0, 1)]), ++ Polygon([(0, 0), (0.5, -1), (1, 0), (1, 1), (-0.5, 0.5)]), + ] + ) +- assert_geoseries_equal(mic, expected) +- +- mic_tolerance = self.g1.maximum_inscribed_circle(tolerance=np.array([10, 0])) +- expected_tol = GeoSeries( +- [ +- LineString([(0.75, 0.5), (0.625, 0.625)]), +- LineString([(0.5, 0.5), (0.5, 0)]), +- ] ++ mic = gs.maximum_inscribed_circle() ++ assert (mic.geom_type == "LineString").all() ++ assert (shapely.get_num_points(mic) == 2).all() ++ expected_centers = GeoSeries([Point(0.5, 0.5), Point(0.466796875, 0.259765625)]) ++ expected_length = Series([0.5, 0.533203125]) ++ assert_geoseries_equal( ++ shapely.get_point(mic, 0), expected_centers, check_less_precise=True + ) +- assert_geoseries_equal(mic_tolerance, expected_tol) ++ assert_series_equal(shapely.length(mic), expected_length) ++ ++ # with tolerance for second polygon -> stops earlier with smaller circle, thus ++ # just assert the length of the resulting line is lower ++ mic_tolerance = gs.maximum_inscribed_circle(tolerance=np.array([0, 10])) ++ assert (shapely.length(mic_tolerance) <= 0.5).all() + + def test_total_bounds(self): + bbox = self.sol.x, self.sol.y, self.esb.x, self.esb.y diff --git a/python-geopandas.spec b/python-geopandas.spec index f1ab769..b215512 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -14,6 +14,8 @@ License: BSD-3-Clause URL: https://pypi.python.org/pypi/%{srcname} # PyPI source does not have test data. Source: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz +# Fix tests with GEOS 3.14. +Patch: https://github.com/geopandas/geopandas/commit/1d598fe055f8bf10bf7a0ae64dc39a10799cf99e.patch BuildArch: noarch From 9197676276b1dd6ba296211d1e43c04a6d7e4ee9 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 22 Dec 2025 22:43:43 +0000 Subject: [PATCH 20/26] Update to 1.1.2 upstream release - Resolves: rhbz#2424519 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + ...8fe055f8bf10bf7a0ae64dc39a10799cf99e.patch | 89 ------------------- README.packit | 2 +- python-geopandas.spec | 4 +- sources | 2 +- 5 files changed, 4 insertions(+), 94 deletions(-) delete mode 100644 1d598fe055f8bf10bf7a0ae64dc39a10799cf99e.patch diff --git a/.gitignore b/.gitignore index 1fc04d0..998d13e 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /geopandas-1.0.1.tar.gz /geopandas-1.1.0.tar.gz /geopandas-1.1.1.tar.gz +/geopandas-1.1.2.tar.gz diff --git a/1d598fe055f8bf10bf7a0ae64dc39a10799cf99e.patch b/1d598fe055f8bf10bf7a0ae64dc39a10799cf99e.patch deleted file mode 100644 index a2facc0..0000000 --- a/1d598fe055f8bf10bf7a0ae64dc39a10799cf99e.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 1d598fe055f8bf10bf7a0ae64dc39a10799cf99e Mon Sep 17 00:00:00 2001 -From: Matt Richards <45483497+m-richards@users.noreply.github.com> -Date: Tue, 23 Sep 2025 17:57:22 +1000 -Subject: [PATCH] TST: Max Inscribed circle for GEOS 3.14 (#3645) - -Co-authored-by: Joris Van den Bossche ---- - geopandas/base.py | 14 +++++++------- - geopandas/tests/test_geom_methods.py | 29 +++++++++++++++------------- - 2 files changed, 23 insertions(+), 20 deletions(-) - -diff --git a/geopandas/base.py b/geopandas/base.py -index 32bbc8f21a..a37e1e0214 100644 ---- a/geopandas/base.py -+++ b/geopandas/base.py -@@ -1888,22 +1888,22 @@ def maximum_inscribed_circle(self, *, tolerance=None): - >>> s = geopandas.GeoSeries( - ... [ - ... Polygon([(0, 0), (1, 1), (0, 1), (0, 0)]), -- ... Polygon([(0, 0), (10, 10), (0, 10), (0, 0)]), -+ ... Polygon([(0, 0), (0.5, -1), (1, 0), (1, 1), (-0.5, 0.5)]), - ... ] - ... ) - >>> s -- 0 POLYGON ((0 0, 1 1, 0 1, 0 0)) -- 1 POLYGON ((0 0, 10 10, 0 10, 0 0)) -+ 0 POLYGON ((0 0, 1 1, 0 1, 0 0)) -+ 1 POLYGON ((0 0, 0.5 -1, 1 0, 1 1, -0.5 0.5, 0 0)) - dtype: geometry - - >>> s.maximum_inscribed_circle() -- 0 LINESTRING (0.29297 0.70703, 0.5 0.5) -- 1 LINESTRING (2.92969 7.07031, 5 5) -+ 0 LINESTRING (0.29289 0.70711, 0.5 0.5) -+ 1 LINESTRING (0.4668 0.25977, 1 0.25977) - dtype: geometry - - >>> s.maximum_inscribed_circle(tolerance=2) -- 0 LINESTRING (0.25 0.5, 0.375 0.375) -- 1 LINESTRING (2.5 7.5, 2.5 10) -+ 0 LINESTRING (0.29289 0.70711, 0.5 0.5) -+ 1 LINESTRING (0.375 0.25, 0 0) - dtype: geometry - - See Also -diff --git a/geopandas/tests/test_geom_methods.py b/geopandas/tests/test_geom_methods.py -index 866faff5d2..c5d597bbc6 100644 ---- a/geopandas/tests/test_geom_methods.py -+++ b/geopandas/tests/test_geom_methods.py -@@ -1613,23 +1613,26 @@ def test_minimum_bounding_circle(self): - - @pytest.mark.skipif(not SHAPELY_GE_21, reason="requires shapely 2.1") - def test_maximum_inscribed_circle(self): -- mic = self.g1.maximum_inscribed_circle() -- expected = GeoSeries( -+ gs = GeoSeries( - [ -- LineString([(0.70703125, 0.29296875), (0.5, 0.5)]), -- LineString([(0.5, 0.5), (0.5, 0)]), -+ Polygon([(0, 0), (1, 0), (1, 1), (0, 1)]), -+ Polygon([(0, 0), (0.5, -1), (1, 0), (1, 1), (-0.5, 0.5)]), - ] - ) -- assert_geoseries_equal(mic, expected) -- -- mic_tolerance = self.g1.maximum_inscribed_circle(tolerance=np.array([10, 0])) -- expected_tol = GeoSeries( -- [ -- LineString([(0.75, 0.5), (0.625, 0.625)]), -- LineString([(0.5, 0.5), (0.5, 0)]), -- ] -+ mic = gs.maximum_inscribed_circle() -+ assert (mic.geom_type == "LineString").all() -+ assert (shapely.get_num_points(mic) == 2).all() -+ expected_centers = GeoSeries([Point(0.5, 0.5), Point(0.466796875, 0.259765625)]) -+ expected_length = Series([0.5, 0.533203125]) -+ assert_geoseries_equal( -+ shapely.get_point(mic, 0), expected_centers, check_less_precise=True - ) -- assert_geoseries_equal(mic_tolerance, expected_tol) -+ assert_series_equal(shapely.length(mic), expected_length) -+ -+ # with tolerance for second polygon -> stops earlier with smaller circle, thus -+ # just assert the length of the resulting line is lower -+ mic_tolerance = gs.maximum_inscribed_circle(tolerance=np.array([0, 10])) -+ assert (shapely.length(mic_tolerance) <= 0.5).all() - - def test_total_bounds(self): - bbox = self.sol.x, self.sol.y, self.esb.x, self.esb.y diff --git a/README.packit b/README.packit index fb341a1..9bb65f0 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. +The file was generated using packit 1.13.0.post1.dev2+g84134016c. diff --git a/python-geopandas.spec b/python-geopandas.spec index b215512..7562739 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,7 +6,7 @@ %bcond bootstrap 0 Name: python-%{srcname} -Version: 1.1.1 +Version: 1.1.2 Release: %autorelease Summary: Geographic Pandas extensions @@ -14,8 +14,6 @@ License: BSD-3-Clause URL: https://pypi.python.org/pypi/%{srcname} # PyPI source does not have test data. Source: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz -# Fix tests with GEOS 3.14. -Patch: https://github.com/geopandas/geopandas/commit/1d598fe055f8bf10bf7a0ae64dc39a10799cf99e.patch BuildArch: noarch diff --git a/sources b/sources index e4c6f7a..73dff9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-1.1.1.tar.gz) = 096630e7f7d17c36bb7855f00d83f728c68a9c9e43ebe46608eef97220f839bb520815cd3b8bbf71953387cc91e65d15af155495238fe3fd862c1bc54e1e5f74 +SHA512 (geopandas-1.1.2.tar.gz) = d130a1a89f7eddc3215c48a103e541238aa75a2341b17a45517617b0bba316f1085486c80f557b9aed6c981c75f91233d89bf339911a06bd304cf0b9bda7f2dd From 1a2c63d7af6e53daa3e375c24c01186729881eb2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 07:37:04 +0000 Subject: [PATCH 21/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 110a3a616544698d0ddecac6f0af660f61d09f34 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 9 Mar 2026 21:54:41 +0000 Subject: [PATCH 22/26] Update to 1.1.3 upstream release - Resolves: rhbz#2445875 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- python-geopandas.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 998d13e..7cb1bd0 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /geopandas-1.1.0.tar.gz /geopandas-1.1.1.tar.gz /geopandas-1.1.2.tar.gz +/geopandas-1.1.3.tar.gz diff --git a/README.packit b/README.packit index 9bb65f0..b0c77e3 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.13.0.post1.dev2+g84134016c. +The file was generated using packit 1.15.0.post1.dev6+g98b589859. diff --git a/python-geopandas.spec b/python-geopandas.spec index 7562739..ec7a62b 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,7 +6,7 @@ %bcond bootstrap 0 Name: python-%{srcname} -Version: 1.1.2 +Version: 1.1.3 Release: %autorelease Summary: Geographic Pandas extensions diff --git a/sources b/sources index 73dff9f..2ea9005 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-1.1.2.tar.gz) = d130a1a89f7eddc3215c48a103e541238aa75a2341b17a45517617b0bba316f1085486c80f557b9aed6c981c75f91233d89bf339911a06bd304cf0b9bda7f2dd +SHA512 (geopandas-1.1.3.tar.gz) = 39254df8a7e544e1f32a612831c7603f700036d0d10de14fdd1c11a420d5cbffad265ea8db36fdf63694b0080c844f9879e3d5bfc1ad20b528d43227c5c7f49e From 90dd5b55671f4761fcf06c5e01c478674bfd52cf Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 22 May 2026 14:38:54 +0100 Subject: [PATCH 23/26] Rebuild for Pandas3 From 4e5b8ff68383795e0fb600bf9eeca3caa0f11d47 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 5 Jun 2026 21:00:28 +0200 Subject: [PATCH 24/26] Rebuilt for Python 3.15 From d2d3c3f96a13c1afa3caa851fbd15eacd026112b Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 26 Jun 2026 20:14:33 +0000 Subject: [PATCH 25/26] Update to 1.1.4 upstream release - Resolves: rhbz#2493684 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- python-geopandas.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7cb1bd0..5fa314f 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /geopandas-1.1.1.tar.gz /geopandas-1.1.2.tar.gz /geopandas-1.1.3.tar.gz +/geopandas-1.1.4.tar.gz diff --git a/README.packit b/README.packit index b0c77e3..dd0af79 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.15.0.post1.dev6+g98b589859. +The file was generated using packit 1.16.1. diff --git a/python-geopandas.spec b/python-geopandas.spec index ec7a62b..47100b5 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,7 +6,7 @@ %bcond bootstrap 0 Name: python-%{srcname} -Version: 1.1.3 +Version: 1.1.4 Release: %autorelease Summary: Geographic Pandas extensions diff --git a/sources b/sources index 2ea9005..b798a00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-1.1.3.tar.gz) = 39254df8a7e544e1f32a612831c7603f700036d0d10de14fdd1c11a420d5cbffad265ea8db36fdf63694b0080c844f9879e3d5bfc1ad20b528d43227c5c7f49e +SHA512 (geopandas-1.1.4.tar.gz) = 70e30407e50acee8ff8d081d3db097ab188a078467bffe2e9765c5d64d9e1d88be76c4f37747a5c107cb96d75c9fa53a7f779e0b406b784386be7d5fef899878 From bf30296f9e9e06a5282bec883c46c00ec08998e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jul 2026 19:33:40 +0000 Subject: [PATCH 26/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild