From ac21e49f82a35c233c448185c15f497785c08531 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 24 Aug 2019 04:04:59 -0400 Subject: [PATCH 01/67] Update to latest release candidate. --- .gitignore | 1 + ...-test_overlay_nybb-on-broken-platforms.patch | 10 +++++----- python-geopandas.spec | 17 ++++++++++------- sources | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 7e7ec69..5f6c2c9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /geopandas-0.4.1.tar.gz /geopandas-0.5.0.tar.gz /geopandas-0.5.1.tar.gz +/geopandas-0.6.0rc1.tar.gz diff --git a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch index 700e788..6ce47a7 100644 --- a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch +++ b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch @@ -1,4 +1,4 @@ -From edc1e70f15da652dc2468e21d5dbb6b58f9ddeec Mon Sep 17 00:00:00 2001 +From 184b6c3f6838f6346f312d16d0e9109350d43ddb Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 29 Jul 2018 19:34:39 -0400 Subject: [PATCH] Skip test_overlay_nybb on broken platforms. @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 4 insertions(+) diff --git a/geopandas/tests/test_overlay.py b/geopandas/tests/test_overlay.py -index a5ab76d..bfd7641 100644 +index 4ebd217..1602625 100644 --- a/geopandas/tests/test_overlay.py +++ b/geopandas/tests/test_overlay.py @@ -1,6 +1,7 @@ @@ -17,10 +17,10 @@ index a5ab76d..bfd7641 100644 import os +import platform - from distutils.version import LooseVersion import pandas as pd -@@ -99,6 +100,9 @@ def test_overlay(dfs_index, how, use_sindex): + from shapely.geometry import Point, Polygon +@@ -94,6 +95,9 @@ def test_overlay(dfs_index, how, use_sindex): assert_geodataframe_equal(result, expected, check_column_type=False) @@ -31,5 +31,5 @@ index a5ab76d..bfd7641 100644 polydf = read_file(geopandas.datasets.get_path('nybb')) -- -2.20.1 +2.21.0 diff --git a/python-geopandas.spec b/python-geopandas.spec index 39e9f1b..e74c793 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,8 +1,8 @@ %global srcname geopandas Name: python-%{srcname} -Version: 0.5.1 -Release: 1%{?dist} +Version: 0.6.0 +Release: 0.1.rc1%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -15,7 +15,7 @@ otherwise require a spatial database such as PostGIS. License: BSD URL: https://pypi.python.org/pypi/%{srcname} -Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz +Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}rc1/%{srcname}-%{version}rc1.tar.gz Patch0001: 0001-Skip-test_overlay_nybb-on-broken-platforms.patch BuildArch: noarch @@ -31,13 +31,13 @@ BuildRequires: python3-devel BuildRequires: python3-six >= 1.3.0 BuildRequires: python3-descartes BuildRequires: python3-fiona >= 1.0.1 -BuildRequires: python3-pandas +BuildRequires: python3-pandas >= 0.23.4 BuildRequires: python3-pyproj >= 1.9.3 BuildRequires: python3-shapely >= 1.2.18 BuildRequires: python3-pytest BuildRequires: python3-rtree >= 0.8 -BuildRequires: python3-matplotlib >= 1.2.1 +BuildRequires: python3-matplotlib >= 2.0.1 Requires: python3-six >= 1.3.0 @@ -45,7 +45,7 @@ Requires: python3-six >= 1.3.0 %prep -%autosetup -n %{srcname}-%{version} -p1 +%autosetup -n %{srcname}-%{version}rc1 -p1 %build @@ -65,10 +65,13 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}" \ %license LICENSE.txt %doc README.md CHANGELOG.md %{python3_sitelib}/%{srcname} -%{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info +%{python3_sitelib}/%{srcname}-%{version}rc1-py?.?.egg-info %changelog +* Sat Aug 24 2019 Elliott Sales de Andrade - 0.6.0-0.1.rc1 +- Update to latest release candidate + * Sat Aug 24 2019 Elliott Sales de Andrade - 0.5.1-1 - Update to latest version diff --git a/sources b/sources index 1df00e4..996c370 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.5.1.tar.gz) = c88c9e75df4799550a644d0a2634fdbe78ca6cf35d4a83f406f97c07b80a3d0904c1b8ac1786edcae0dda50f2859ef61b598eb7907374029cdc6bc1999662e79 +SHA512 (geopandas-0.6.0rc1.tar.gz) = 335792e8edc23a6349896fa7155353aeb183399442a28b8ee709d24c323330eeff84138f57c7bbbe9e572215ec21c90b9ab849255606c00f319365d0a1ab8be3 From ad63b2667042ca9551d15a755bc8f2f898a7ae4a Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 29 Sep 2019 21:24:47 -0400 Subject: [PATCH 02/67] Update to latest version. --- .gitignore | 1 + 0001-Skip-test_overlay_nybb-on-broken-platforms.patch | 10 +++++----- python-geopandas.spec | 11 +++++++---- sources | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 5f6c2c9..23a7c81 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /geopandas-0.5.0.tar.gz /geopandas-0.5.1.tar.gz /geopandas-0.6.0rc1.tar.gz +/geopandas-0.6.0.tar.gz diff --git a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch index 6ce47a7..960c9ec 100644 --- a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch +++ b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch @@ -1,4 +1,4 @@ -From 184b6c3f6838f6346f312d16d0e9109350d43ddb Mon Sep 17 00:00:00 2001 +From 10bb559a63a926213f253ac085a0d973a70eb32a Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 29 Jul 2018 19:34:39 -0400 Subject: [PATCH] Skip test_overlay_nybb on broken platforms. @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 4 insertions(+) diff --git a/geopandas/tests/test_overlay.py b/geopandas/tests/test_overlay.py -index 4ebd217..1602625 100644 +index c99a3d9..488fc41 100644 --- a/geopandas/tests/test_overlay.py +++ b/geopandas/tests/test_overlay.py @@ -1,6 +1,7 @@ @@ -19,8 +19,8 @@ index 4ebd217..1602625 100644 +import platform import pandas as pd - from shapely.geometry import Point, Polygon -@@ -94,6 +95,9 @@ def test_overlay(dfs_index, how, use_sindex): + +@@ -102,6 +103,9 @@ def test_overlay(dfs_index, how, use_sindex): assert_geodataframe_equal(result, expected, check_column_type=False) @@ -28,7 +28,7 @@ index 4ebd217..1602625 100644 + platform.machine() in ('aarch64', 'ppc64', 'ppc64le', 's390x'), + reason='platform-specific problems') def test_overlay_nybb(how): - polydf = read_file(geopandas.datasets.get_path('nybb')) + polydf = read_file(geopandas.datasets.get_path("nybb")) -- 2.21.0 diff --git a/python-geopandas.spec b/python-geopandas.spec index e74c793..657caf0 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.6.0 -Release: 0.1.rc1%{?dist} +Release: 1%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -15,7 +15,7 @@ otherwise require a spatial database such as PostGIS. License: BSD URL: https://pypi.python.org/pypi/%{srcname} -Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}rc1/%{srcname}-%{version}rc1.tar.gz +Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz Patch0001: 0001-Skip-test_overlay_nybb-on-broken-platforms.patch BuildArch: noarch @@ -45,7 +45,7 @@ Requires: python3-six >= 1.3.0 %prep -%autosetup -n %{srcname}-%{version}rc1 -p1 +%autosetup -n %{srcname}-%{version} -p1 %build @@ -65,10 +65,13 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}" \ %license LICENSE.txt %doc README.md CHANGELOG.md %{python3_sitelib}/%{srcname} -%{python3_sitelib}/%{srcname}-%{version}rc1-py?.?.egg-info +%{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info %changelog +* Sun Sep 29 2019 Elliott Sales de Andrade - 0.6.0-1 +- Update to latest version + * Sat Aug 24 2019 Elliott Sales de Andrade - 0.6.0-0.1.rc1 - Update to latest release candidate diff --git a/sources b/sources index 996c370..d93b392 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.6.0rc1.tar.gz) = 335792e8edc23a6349896fa7155353aeb183399442a28b8ee709d24c323330eeff84138f57c7bbbe9e572215ec21c90b9ab849255606c00f319365d0a1ab8be3 +SHA512 (geopandas-0.6.0.tar.gz) = 6194ac98f8d99ff8460202ff0f3ba556cfdf30a82b0105c70133bbbb4d2d404d39cd759e5fc8cdea160918c76d98f79a85a79400047b0af1b344b9f757c3695d From dabe90e409cb6798b8fd7be033cec3f7a1a0a96f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 12:25:33 +0000 Subject: [PATCH 03/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-geopandas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index 657caf0..c9e36b3 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -69,6 +69,9 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}" \ %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Sep 29 2019 Elliott Sales de Andrade - 0.6.0-1 - Update to latest version From e6c8df90f67e358142391b6792a0c60d31017abe Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 8 Feb 2020 03:35:30 -0500 Subject: [PATCH 04/67] Update to latest version. --- .gitignore | 1 + python-geopandas.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 23a7c81..1fb0bed 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /geopandas-0.5.1.tar.gz /geopandas-0.6.0rc1.tar.gz /geopandas-0.6.0.tar.gz +/geopandas-0.6.3.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index c9e36b3..6e3d70c 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,8 +1,8 @@ %global srcname geopandas Name: python-%{srcname} -Version: 0.6.0 -Release: 2%{?dist} +Version: 0.6.3 +Release: 1%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -69,6 +69,9 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}" \ %changelog +* Sat Feb 08 2020 Elliott Sales de Andrade - 0.6.3-1 +- Update to latest version + * Thu Jan 30 2020 Fedora Release Engineering - 0.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index d93b392..c501db1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.6.0.tar.gz) = 6194ac98f8d99ff8460202ff0f3ba556cfdf30a82b0105c70133bbbb4d2d404d39cd759e5fc8cdea160918c76d98f79a85a79400047b0af1b344b9f757c3695d +SHA512 (geopandas-0.6.3.tar.gz) = 3c9267feba3535d9725c61f26cd48146582f21f684a70e8b1c5a85d08c04a3e999722c6877cf073ab6177d16f0c4bdbc0324b9799a146307fc568e8b360a2dfa From 885bb03eac35f04dfe9b994bb15144fddae76988 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 18 Feb 2020 03:49:49 -0500 Subject: [PATCH 05/67] Update to latest version. --- .gitignore | 1 + ...kip-test_overlay_nybb-on-broken-platforms.patch | 14 ++++++-------- python-geopandas.spec | 12 ++++++------ sources | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 1fb0bed..fa75941 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /geopandas-0.6.0rc1.tar.gz /geopandas-0.6.0.tar.gz /geopandas-0.6.3.tar.gz +/geopandas-0.7.0.tar.gz diff --git a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch index 960c9ec..fe43688 100644 --- a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch +++ b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch @@ -1,4 +1,4 @@ -From 10bb559a63a926213f253ac085a0d973a70eb32a Mon Sep 17 00:00:00 2001 +From 44aeb741aba986fcc6b1bceb85d49131d35e00f5 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 29 Jul 2018 19:34:39 -0400 Subject: [PATCH] Skip test_overlay_nybb on broken platforms. @@ -9,27 +9,25 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 4 insertions(+) diff --git a/geopandas/tests/test_overlay.py b/geopandas/tests/test_overlay.py -index c99a3d9..488fc41 100644 +index b344fed..b40e9b3 100644 --- a/geopandas/tests/test_overlay.py +++ b/geopandas/tests/test_overlay.py -@@ -1,6 +1,7 @@ - from __future__ import absolute_import - +@@ -1,4 +1,5 @@ import os +import platform import pandas as pd -@@ -102,6 +103,9 @@ def test_overlay(dfs_index, how, use_sindex): +@@ -100,6 +101,9 @@ def test_overlay(dfs_index, how): assert_geodataframe_equal(result, expected, check_column_type=False) +@pytest.mark.xfail( + platform.machine() in ('aarch64', 'ppc64', 'ppc64le', 's390x'), + reason='platform-specific problems') + @pytest.mark.filterwarnings("ignore:GeoSeries crs mismatch:UserWarning") def test_overlay_nybb(how): polydf = read_file(geopandas.datasets.get_path("nybb")) - -- -2.21.0 +2.21.1 diff --git a/python-geopandas.spec b/python-geopandas.spec index 6e3d70c..e1e2fe2 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,7 +1,7 @@ %global srcname geopandas Name: python-%{srcname} -Version: 0.6.3 +Version: 0.7.0 Release: 1%{?dist} Summary: Geographic Pandas extensions %global _description \ @@ -28,19 +28,16 @@ Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} BuildRequires: python3-devel -BuildRequires: python3-six >= 1.3.0 BuildRequires: python3-descartes BuildRequires: python3-fiona >= 1.0.1 -BuildRequires: python3-pandas >= 0.23.4 -BuildRequires: python3-pyproj >= 1.9.3 +BuildRequires: python3-pandas >= 0.23 +BuildRequires: python3-pyproj >= 2.2 BuildRequires: python3-shapely >= 1.2.18 BuildRequires: python3-pytest BuildRequires: python3-rtree >= 0.8 BuildRequires: python3-matplotlib >= 2.0.1 -Requires: python3-six >= 1.3.0 - %description -n python3-%{srcname} %{_description} @@ -69,6 +66,9 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}" \ %changelog +* Tue Feb 18 2020 Elliott Sales de Andrade - 0.7.0-1 +- Update to latest version + * Sat Feb 08 2020 Elliott Sales de Andrade - 0.6.3-1 - Update to latest version diff --git a/sources b/sources index c501db1..e87d1e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.6.3.tar.gz) = 3c9267feba3535d9725c61f26cd48146582f21f684a70e8b1c5a85d08c04a3e999722c6877cf073ab6177d16f0c4bdbc0324b9799a146307fc568e8b360a2dfa +SHA512 (geopandas-0.7.0.tar.gz) = 037b33f156179e1ca02ed82d0aaa2e6fc5d19e26f16a804d6f156a10715f4791e720fbf8d36e225b7333b599bf4f1f4b8b334cdbd7b8044fc9452aa336f2d1cc From d47db6dcded8f77b9f4b7ce3d426d09a65c52071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 09:05:56 +0200 Subject: [PATCH 06/67] Rebuilt for Python 3.9 --- python-geopandas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index e1e2fe2..f7bc2f0 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -66,6 +66,9 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}" \ %changelog +* Tue May 26 2020 Miro Hrončok - 0.7.0-2 +- Rebuilt for Python 3.9 + * Tue Feb 18 2020 Elliott Sales de Andrade - 0.7.0-1 - Update to latest version From 532a70ced9b28da1c995632fa4848fd0e52fd661 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 2 Jul 2020 03:35:02 -0400 Subject: [PATCH 07/67] Update to latest version. --- .gitignore | 1 + python-geopandas.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index fa75941..0dd6211 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /geopandas-0.6.0.tar.gz /geopandas-0.6.3.tar.gz /geopandas-0.7.0.tar.gz +/geopandas-0.8.0.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index f7bc2f0..05661d9 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,8 +1,8 @@ %global srcname geopandas Name: python-%{srcname} -Version: 0.7.0 -Release: 2%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -28,6 +28,7 @@ Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: python3-descartes BuildRequires: python3-fiona >= 1.0.1 BuildRequires: python3-pandas >= 0.23 @@ -62,10 +63,13 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}" \ %license LICENSE.txt %doc README.md CHANGELOG.md %{python3_sitelib}/%{srcname} -%{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info +%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info %changelog +* Thu Jul 02 2020 Elliott Sales de Andrade - 0.8.0-1 +- Update to latest version + * Tue May 26 2020 Miro Hrončok - 0.7.0-2 - Rebuilt for Python 3.9 diff --git a/sources b/sources index e87d1e2..0ea34c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.7.0.tar.gz) = 037b33f156179e1ca02ed82d0aaa2e6fc5d19e26f16a804d6f156a10715f4791e720fbf8d36e225b7333b599bf4f1f4b8b334cdbd7b8044fc9452aa336f2d1cc +SHA512 (geopandas-0.8.0.tar.gz) = ffd2ec476821c788c39367745e6cc8a1e8a8bcdbbd776944cca1e1d83fd10e13f6522c8bdf8df508a7153852cfdf0c3663b9b427b645222b2ded6ce6d0a0a343 From ae0905fd53c819f54066b7ee977a483152e9a8d1 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 16 Jul 2020 04:29:34 -0400 Subject: [PATCH 08/67] Update to latest version. --- .gitignore | 1 + python-geopandas.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0dd6211..931cb84 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /geopandas-0.6.3.tar.gz /geopandas-0.7.0.tar.gz /geopandas-0.8.0.tar.gz +/geopandas-0.8.1.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index 05661d9..3465cd5 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,7 +1,7 @@ %global srcname geopandas Name: python-%{srcname} -Version: 0.8.0 +Version: 0.8.1 Release: 1%{?dist} Summary: Geographic Pandas extensions %global _description \ @@ -67,6 +67,9 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}" \ %changelog +* Thu Jul 16 2020 Elliott Sales de Andrade - 0.8.1-1 +- Update to latest version + * Thu Jul 02 2020 Elliott Sales de Andrade - 0.8.0-1 - Update to latest version diff --git a/sources b/sources index 0ea34c7..820f69a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.8.0.tar.gz) = ffd2ec476821c788c39367745e6cc8a1e8a8bcdbbd776944cca1e1d83fd10e13f6522c8bdf8df508a7153852cfdf0c3663b9b427b645222b2ded6ce6d0a0a343 +SHA512 (geopandas-0.8.1.tar.gz) = 0b3993a5af5f57a2ad422a8ca7cc028ad0da99a173296acd6675b6d25fa294a0afe921335d4ca3503c7396f5b3e7c68f4b95d09d7b267adfe06feb7762b2e813 From eadba544e7df5778f32976dab0b8319670ef8874 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 17 Jul 2020 05:09:59 -0400 Subject: [PATCH 09/67] Fix alternate architecture patch. --- ...test_overlay_nybb-on-broken-platforms.patch | 18 +++++++++--------- python-geopandas.spec | 8 +++++--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch index fe43688..9085a3c 100644 --- a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch +++ b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch @@ -1,4 +1,4 @@ -From 44aeb741aba986fcc6b1bceb85d49131d35e00f5 Mon Sep 17 00:00:00 2001 +From d79b414d398651c4c2531012a7ab318209a0065f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 29 Jul 2018 19:34:39 -0400 Subject: [PATCH] Skip test_overlay_nybb on broken platforms. @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 4 insertions(+) diff --git a/geopandas/tests/test_overlay.py b/geopandas/tests/test_overlay.py -index b344fed..b40e9b3 100644 +index 467fbb9..e26c00a 100644 --- a/geopandas/tests/test_overlay.py +++ b/geopandas/tests/test_overlay.py @@ -1,4 +1,5 @@ @@ -18,16 +18,16 @@ index b344fed..b40e9b3 100644 import pandas as pd -@@ -100,6 +101,9 @@ def test_overlay(dfs_index, how): - assert_geodataframe_equal(result, expected, check_column_type=False) +@@ -107,6 +108,9 @@ def test_overlay(dfs_index, how): - -+@pytest.mark.xfail( -+ platform.machine() in ('aarch64', 'ppc64', 'ppc64le', 's390x'), -+ reason='platform-specific problems') @pytest.mark.filterwarnings("ignore:GeoSeries crs mismatch:UserWarning") def test_overlay_nybb(how): ++ if how != 'difference' and platform.machine() in ('aarch64', 'ppc64le', 's390x'): ++ pytest.xfail('platform-specific problems') ++ polydf = read_file(geopandas.datasets.get_path("nybb")) + + # construct circles dataframe -- -2.21.1 +2.25.4 diff --git a/python-geopandas.spec b/python-geopandas.spec index 3465cd5..383dda8 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -55,8 +55,7 @@ BuildRequires: python3-matplotlib >= 2.0.1 %check -PYTHONPATH="%{buildroot}%{python3_sitelib}" \ - py.test-%{python3_version} -ra geopandas -m 'not web' +%{pytest} -ra geopandas -m 'not web' %files -n python3-%{srcname} @@ -67,6 +66,9 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}" \ %changelog +* Fri Jul 17 2020 Elliott Sales de Andrade - 0.8.1-2 +- Fix alternate architecture patch. + * Thu Jul 16 2020 Elliott Sales de Andrade - 0.8.1-1 - Update to latest version From 670c3d0d981682dacee0927e3ef0d76cabc1176d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 01:15:52 +0000 Subject: [PATCH 10/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-geopandas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index 383dda8..84f2243 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -66,6 +66,9 @@ BuildRequires: python3-matplotlib >= 2.0.1 %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Elliott Sales de Andrade - 0.8.1-2 - Fix alternate architecture patch. From cf35c284c9150a6e51ac8e4d0c8998db58553004 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 10:51:54 +0000 Subject: [PATCH 11/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-geopandas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index 84f2243..8eaa473 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -66,6 +66,9 @@ BuildRequires: python3-matplotlib >= 2.0.1 %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.8.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7f5e506eabb86d303cca8a51a465d0e7cfa5448e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 6 Feb 2021 01:45:41 -0500 Subject: [PATCH 12/67] Update to latest version. --- .gitignore | 1 + python-geopandas.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 931cb84..5c8ea45 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /geopandas-0.7.0.tar.gz /geopandas-0.8.0.tar.gz /geopandas-0.8.1.tar.gz +/geopandas-0.8.2.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index 8eaa473..5ec9385 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,8 +1,8 @@ %global srcname geopandas Name: python-%{srcname} -Version: 0.8.1 -Release: 4%{?dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -66,6 +66,9 @@ BuildRequires: python3-matplotlib >= 2.0.1 %changelog +* Sat Feb 06 2021 Elliott Sales de Andrade - 0.8.2-1 +- Update to latest version (#1920235) + * Wed Jan 27 2021 Fedora Release Engineering - 0.8.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 820f69a..d7ae446 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.8.1.tar.gz) = 0b3993a5af5f57a2ad422a8ca7cc028ad0da99a173296acd6675b6d25fa294a0afe921335d4ca3503c7396f5b3e7c68f4b95d09d7b267adfe06feb7762b2e813 +SHA512 (geopandas-0.8.2.tar.gz) = 2eef8c15c0fcbb3ee1e36fe921aaecf9cc091664d45dd714c3bfba3d934633b44f720aa133c654fe2c61c2f03268a1ba1e61459b42131000d18addf3f2cd430f From a9dd7b678def190c9266b6063615f54d57786fee Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 25 Mar 2021 23:53:39 -0400 Subject: [PATCH 13/67] Update to latest version. --- .gitignore | 1 + 0001-Skip-test_overlay_nybb-on-broken-platforms.patch | 10 +++++----- python-geopandas.spec | 5 ++++- sources | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5c8ea45..8de1db0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /geopandas-0.8.0.tar.gz /geopandas-0.8.1.tar.gz /geopandas-0.8.2.tar.gz +/geopandas-0.9.0.tar.gz diff --git a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch index 9085a3c..8a35079 100644 --- a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch +++ b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch @@ -1,4 +1,4 @@ -From d79b414d398651c4c2531012a7ab318209a0065f Mon Sep 17 00:00:00 2001 +From 59761245b53f90f8c82b8eb88a2532d8f0d462b4 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 29 Jul 2018 19:34:39 -0400 Subject: [PATCH] Skip test_overlay_nybb on broken platforms. @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 4 insertions(+) diff --git a/geopandas/tests/test_overlay.py b/geopandas/tests/test_overlay.py -index 467fbb9..e26c00a 100644 +index f0c095a..e19e2d0 100644 --- a/geopandas/tests/test_overlay.py +++ b/geopandas/tests/test_overlay.py @@ -1,4 +1,5 @@ @@ -18,7 +18,7 @@ index 467fbb9..e26c00a 100644 import pandas as pd -@@ -107,6 +108,9 @@ def test_overlay(dfs_index, how): +@@ -105,6 +106,9 @@ def test_overlay(dfs_index, how): @pytest.mark.filterwarnings("ignore:GeoSeries crs mismatch:UserWarning") def test_overlay_nybb(how): @@ -27,7 +27,7 @@ index 467fbb9..e26c00a 100644 + polydf = read_file(geopandas.datasets.get_path("nybb")) - # construct circles dataframe + # The circles have been constructed and saved at the time the expected -- -2.25.4 +2.29.2 diff --git a/python-geopandas.spec b/python-geopandas.spec index 5ec9385..67cc30c 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,7 +1,7 @@ %global srcname geopandas Name: python-%{srcname} -Version: 0.8.2 +Version: 0.9.0 Release: 1%{?dist} Summary: Geographic Pandas extensions %global _description \ @@ -66,6 +66,9 @@ BuildRequires: python3-matplotlib >= 2.0.1 %changelog +* Sun Feb 28 2021 Elliott Sales de Andrade - 0.9.0-1 +- Update to latest version (#1933514) + * Sat Feb 06 2021 Elliott Sales de Andrade - 0.8.2-1 - Update to latest version (#1920235) diff --git a/sources b/sources index d7ae446..fa3b7c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.8.2.tar.gz) = 2eef8c15c0fcbb3ee1e36fe921aaecf9cc091664d45dd714c3bfba3d934633b44f720aa133c654fe2c61c2f03268a1ba1e61459b42131000d18addf3f2cd430f +SHA512 (geopandas-0.9.0.tar.gz) = e70e2f961b497a1006bf08f7177d50d87219c9a125bb550fb864fcebfbd327d3cee62ebd4448af31c3fbe54edf5c47829d34a9ab221ce40b010fa5db77de7638 From 76420207609180e7c7bee94d01451e87eb8b588e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:35:28 +0200 Subject: [PATCH 14/67] Rebuilt for Python 3.10 --- python-geopandas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index 67cc30c..e08bc25 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -66,6 +66,9 @@ BuildRequires: python3-matplotlib >= 2.0.1 %changelog +* Fri Jun 04 2021 Python Maint - 0.9.0-2 +- Rebuilt for Python 3.10 + * Sun Feb 28 2021 Elliott Sales de Andrade - 0.9.0-1 - Update to latest version (#1933514) From 94c56c7f9553bb794560c095e2ceb9de2dd01e18 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 17 Jun 2021 16:58:12 -0400 Subject: [PATCH 15/67] Update dependencies, dropping descartes. --- python-geopandas.spec | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index e08bc25..840fa7d 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -25,19 +25,18 @@ BuildArch: noarch %package -n python3-%{srcname} Summary: %{summary} -%{?python_provide:%python_provide python3-%{srcname}} BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-descartes -BuildRequires: python3-fiona >= 1.0.1 -BuildRequires: python3-pandas >= 0.23 -BuildRequires: python3-pyproj >= 2.2 -BuildRequires: python3-shapely >= 1.2.18 +BuildRequires: python3dist(setuptools) +BuildRequires: python3dist(fiona) >= 1.8 +BuildRequires: python3dist(numpy) >= 1.15 +BuildRequires: python3dist(pandas) >= 0.24 +BuildRequires: python3dist(pyproj) >= 2.2 +BuildRequires: python3dist(shapely) >= 1.6 -BuildRequires: python3-pytest -BuildRequires: python3-rtree >= 0.8 -BuildRequires: python3-matplotlib >= 2.0.1 +BuildRequires: python3dist(pytest) +BuildRequires: python3dist(rtree) >= 0.8 +BuildRequires: python3dist(matplotlib) >= 2.0.1 %description -n python3-%{srcname} %{_description} @@ -61,11 +60,14 @@ BuildRequires: python3-matplotlib >= 2.0.1 %files -n python3-%{srcname} %license LICENSE.txt %doc README.md CHANGELOG.md -%{python3_sitelib}/%{srcname} -%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info +%{python3_sitelib}/%{srcname}/ +%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/ %changelog +* Thu Jun 17 2021 Elliott Sales de Andrade - 0.9.0-2 +- Update & correct dependencies + * Fri Jun 04 2021 Python Maint - 0.9.0-2 - Rebuilt for Python 3.10 From 2468bf69ab07995b4c88466f4df95bc56aa80712 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 17 Jun 2021 16:58:50 -0400 Subject: [PATCH 16/67] Backport patch to fix tests with Proj 8.0.1. --- ...est_overlay_nybb-on-broken-platforms.patch | 4 +- ...roj4strings-test-for-PROJ-8.0.1-1958.patch | 74 +++++++++++++++++++ python-geopandas.spec | 3 + 3 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch diff --git a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch index 8a35079..ad7a47e 100644 --- a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch +++ b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch @@ -1,7 +1,7 @@ From 59761245b53f90f8c82b8eb88a2532d8f0d462b4 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 29 Jul 2018 19:34:39 -0400 -Subject: [PATCH] Skip test_overlay_nybb on broken platforms. +Subject: [PATCH 1/2] Skip test_overlay_nybb on broken platforms. Signed-off-by: Elliott Sales de Andrade --- @@ -29,5 +29,5 @@ index f0c095a..e19e2d0 100644 # The circles have been constructed and saved at the time the expected -- -2.29.2 +2.31.1 diff --git a/0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch b/0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch new file mode 100644 index 0000000..cec6ebf --- /dev/null +++ b/0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch @@ -0,0 +1,74 @@ +From fcb99998fed1580c29d19df3b5535c51fe475cb2 Mon Sep 17 00:00:00 2001 +From: Martin Fleischmann +Date: Wed, 2 Jun 2021 20:57:59 +0100 +Subject: [PATCH 2/2] TST: fix proj4strings test for PROJ 8.0.1 (#1958) + +Signed-off-by: Elliott Sales de Andrade +--- + geopandas/geoseries.py | 6 +++--- + geopandas/tests/test_geoseries.py | 10 +++++----- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/geopandas/geoseries.py b/geopandas/geoseries.py +index c60d1c8..3011fad 100644 +--- a/geopandas/geoseries.py ++++ b/geopandas/geoseries.py +@@ -132,9 +132,9 @@ class GeoSeries(GeoPandasBase, Series): + - Lat[north]: Geodetic latitude (degree) + - Lon[east]: Geodetic longitude (degree) + Area of Use: +- - name: World ++ - name: World. + - bounds: (-180.0, -90.0, 180.0, 90.0) +- Datum: World Geodetic System 1984 ++ Datum: World Geodetic System 1984 ensemble + - Ellipsoid: WGS 84 + - Prime Meridian: Greenwich + +@@ -578,7 +578,7 @@ class GeoSeries(GeoPandasBase, Series): + return result + + def __finalize__(self, other, method=None, **kwargs): +- """ propagate metadata from other to self """ ++ """propagate metadata from other to self""" + # NOTE: backported from pandas master (upcoming v0.13) + for name in self._metadata: + object.__setattr__(self, name, getattr(other, name, None)) +diff --git a/geopandas/tests/test_geoseries.py b/geopandas/tests/test_geoseries.py +index 80ffbbc..1cb6796 100644 +--- a/geopandas/tests/test_geoseries.py ++++ b/geopandas/tests/test_geoseries.py +@@ -262,25 +262,25 @@ class TestSeries: + + def test_proj4strings(self): + # As string +- reprojected = self.g3.to_crs("+proj=utm +zone=30N") ++ reprojected = self.g3.to_crs("+proj=utm +zone=30") + reprojected_back = reprojected.to_crs(epsg=4326) + assert np.all(self.g3.geom_almost_equals(reprojected_back)) + + # As dict +- reprojected = self.g3.to_crs({"proj": "utm", "zone": "30N"}) ++ reprojected = self.g3.to_crs({"proj": "utm", "zone": "30"}) + reprojected_back = reprojected.to_crs(epsg=4326) + assert np.all(self.g3.geom_almost_equals(reprojected_back)) + + # Set to equivalent string, convert, compare to original + copy = self.g3.copy() + copy.crs = "epsg:4326" +- reprojected = copy.to_crs({"proj": "utm", "zone": "30N"}) ++ reprojected = copy.to_crs({"proj": "utm", "zone": "30"}) + reprojected_back = reprojected.to_crs(epsg=4326) + assert np.all(self.g3.geom_almost_equals(reprojected_back)) + + # Conversions by different format +- reprojected_string = self.g3.to_crs("+proj=utm +zone=30N") +- reprojected_dict = self.g3.to_crs({"proj": "utm", "zone": "30N"}) ++ reprojected_string = self.g3.to_crs("+proj=utm +zone=30") ++ reprojected_dict = self.g3.to_crs({"proj": "utm", "zone": "30"}) + assert np.all(reprojected_string.geom_almost_equals(reprojected_dict)) + + def test_from_wkb(self): +-- +2.31.1 + diff --git a/python-geopandas.spec b/python-geopandas.spec index 840fa7d..cb616ce 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -17,6 +17,8 @@ License: BSD URL: https://pypi.python.org/pypi/%{srcname} Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz Patch0001: 0001-Skip-test_overlay_nybb-on-broken-platforms.patch +# https://github.com/geopandas/geopandas/pull/1958 +Patch0002: 0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch BuildArch: noarch @@ -67,6 +69,7 @@ BuildRequires: python3dist(matplotlib) >= 2.0.1 %changelog * Thu Jun 17 2021 Elliott Sales de Andrade - 0.9.0-2 - Update & correct dependencies +- Backport patch to fix tests with Proj 8.0.1 * Fri Jun 04 2021 Python Maint - 0.9.0-2 - Rebuilt for Python 3.10 From 4aaaeaf18cbe79c5053892f14a1760e41e24e331 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 17 Jun 2021 20:24:02 -0400 Subject: [PATCH 17/67] Skip tests broken on GDAL 3.3.0. --- python-geopandas.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index cb616ce..0f045b1 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -56,7 +56,10 @@ BuildRequires: python3dist(matplotlib) >= 2.0.1 %check -%{pytest} -ra geopandas -m 'not web' +# Skip tests broken on GDAL 3.3.0 +# https://github.com/geopandas/geopandas/issues/1975 +%{pytest} -ra geopandas -m 'not web' \ + -k 'not test_to_file_bool[GPKG-gpkg] and not test_to_file_datetime' %files -n python3-%{srcname} @@ -70,6 +73,7 @@ BuildRequires: python3dist(matplotlib) >= 2.0.1 * Thu Jun 17 2021 Elliott Sales de Andrade - 0.9.0-2 - Update & correct dependencies - Backport patch to fix tests with Proj 8.0.1 +- Skip tests broken on GDAL 3.3.0 * Fri Jun 04 2021 Python Maint - 0.9.0-2 - Rebuilt for Python 3.10 From ce9f1d222b94637f6e7d499378595dbdd76acec6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 06:32:12 +0000 Subject: [PATCH 18/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-geopandas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index 0f045b1..8e3bd7d 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -70,6 +70,9 @@ BuildRequires: python3dist(matplotlib) >= 2.0.1 %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 17 2021 Elliott Sales de Andrade - 0.9.0-2 - Update & correct dependencies - Backport patch to fix tests with Proj 8.0.1 From 38e802ee4aac1bdc25412efd3fd5585241716836 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 13 Sep 2021 03:21:59 -0400 Subject: [PATCH 19/67] Backport patches for GDAL 3.3 --- ...est_overlay_nybb-on-broken-platforms.patch | 2 +- ...roj4strings-test-for-PROJ-8.0.1-1958.patch | 2 +- ...-skip-pandas-master-fillna-test-1878.patch | 28 +++++ ...t-GPKG-tests-with-undefined-CRS-1986.patch | 110 ++++++++++++++++++ python-geopandas.spec | 14 ++- 5 files changed, 149 insertions(+), 7 deletions(-) create mode 100644 0003-TST-skip-pandas-master-fillna-test-1878.patch create mode 100644 0004-TST-adapt-GPKG-tests-with-undefined-CRS-1986.patch diff --git a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch index ad7a47e..e373247 100644 --- a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch +++ b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch @@ -1,7 +1,7 @@ From 59761245b53f90f8c82b8eb88a2532d8f0d462b4 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 29 Jul 2018 19:34:39 -0400 -Subject: [PATCH 1/2] Skip test_overlay_nybb on broken platforms. +Subject: [PATCH 1/4] Skip test_overlay_nybb on broken platforms. Signed-off-by: Elliott Sales de Andrade --- diff --git a/0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch b/0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch index cec6ebf..2c34a7d 100644 --- a/0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch +++ b/0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch @@ -1,7 +1,7 @@ From fcb99998fed1580c29d19df3b5535c51fe475cb2 Mon Sep 17 00:00:00 2001 From: Martin Fleischmann Date: Wed, 2 Jun 2021 20:57:59 +0100 -Subject: [PATCH 2/2] TST: fix proj4strings test for PROJ 8.0.1 (#1958) +Subject: [PATCH 2/4] TST: fix proj4strings test for PROJ 8.0.1 (#1958) Signed-off-by: Elliott Sales de Andrade --- diff --git a/0003-TST-skip-pandas-master-fillna-test-1878.patch b/0003-TST-skip-pandas-master-fillna-test-1878.patch new file mode 100644 index 0000000..753a4af --- /dev/null +++ b/0003-TST-skip-pandas-master-fillna-test-1878.patch @@ -0,0 +1,28 @@ +From 52a85d2cf043eef09c06c8a486e71a3044a6c292 Mon Sep 17 00:00:00 2001 +From: Martin Fleischmann +Date: Sun, 4 Apr 2021 09:37:36 +0100 +Subject: [PATCH 3/4] TST: skip pandas master fillna test (#1878) + +Signed-off-by: Elliott Sales de Andrade +--- + geopandas/tests/test_extension_array.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/geopandas/tests/test_extension_array.py b/geopandas/tests/test_extension_array.py +index 37d37a3..be09408 100644 +--- a/geopandas/tests/test_extension_array.py ++++ b/geopandas/tests/test_extension_array.py +@@ -366,6 +366,10 @@ class TestMissing(extension_tests.BaseMissingTests): + def test_fillna_series_method(self, data_missing, method): + pass + ++ @pytest.mark.skip("fillna method not supported") ++ def test_fillna_no_op_returns_copy(self, data): ++ pass ++ + + class TestReduce(extension_tests.BaseNoReduceTests): + @pytest.mark.skip("boolean reduce (any/all) tested in test_pandas_methods") +-- +2.31.1 + diff --git a/0004-TST-adapt-GPKG-tests-with-undefined-CRS-1986.patch b/0004-TST-adapt-GPKG-tests-with-undefined-CRS-1986.patch new file mode 100644 index 0000000..94b6c07 --- /dev/null +++ b/0004-TST-adapt-GPKG-tests-with-undefined-CRS-1986.patch @@ -0,0 +1,110 @@ +From 83a21379cbb45acd80d3418f5bcce0d7270a56a6 Mon Sep 17 00:00:00 2001 +From: Martin Fleischmann +Date: Fri, 2 Jul 2021 09:43:12 +0100 +Subject: [PATCH 4/4] TST: adapt GPKG tests with undefined CRS (#1986) + +Signed-off-by: Elliott Sales de Andrade +--- + geopandas/io/tests/test_file.py | 40 +++++++++++++++++++++++++-------- + 1 file changed, 31 insertions(+), 9 deletions(-) + +diff --git a/geopandas/io/tests/test_file.py b/geopandas/io/tests/test_file.py +index ac20d5e..ceb094d 100644 +--- a/geopandas/io/tests/test_file.py ++++ b/geopandas/io/tests/test_file.py +@@ -66,7 +66,7 @@ driver_ext_pairs = [("ESRI Shapefile", "shp"), ("GeoJSON", "geojson"), ("GPKG", + + @pytest.mark.parametrize("driver,ext", driver_ext_pairs) + def test_to_file(tmpdir, df_nybb, df_null, driver, ext): +- """ Test to_file and from_file """ ++ """Test to_file and from_file""" + tempfilename = os.path.join(str(tmpdir), "boros." + ext) + df_nybb.to_file(tempfilename, driver=driver) + # Read layer back in +@@ -87,7 +87,7 @@ def test_to_file(tmpdir, df_nybb, df_null, driver, ext): + + @pytest.mark.parametrize("driver,ext", driver_ext_pairs) + def test_to_file_pathlib(tmpdir, df_nybb, df_null, driver, ext): +- """ Test to_file and from_file """ ++ """Test to_file and from_file""" + temppath = pathlib.Path(os.path.join(str(tmpdir), "boros." + ext)) + df_nybb.to_file(temppath, driver=driver) + # Read layer back in +@@ -106,14 +106,12 @@ def test_to_file_bool(tmpdir, driver, ext): + "a": [1, 2, 3], + "b": [True, False, True], + "geometry": [Point(0, 0), Point(1, 1), Point(2, 2)], +- } ++ }, ++ crs=4326, + ) + + df.to_file(tempfilename, driver=driver) + result = read_file(tempfilename) +- if driver == "GeoJSON": +- # geojson by default assumes epsg:4326 +- result.crs = None + if driver == "ESRI Shapefile": + # Shapefile does not support boolean, so is read back as int + df["b"] = df["b"].astype("int64") +@@ -125,7 +123,7 @@ def test_to_file_datetime(tmpdir): + tempfilename = os.path.join(str(tmpdir), "test_datetime.gpkg") + point = Point(0, 0) + now = datetime.datetime.now() +- df = GeoDataFrame({"a": [1, 2], "b": [now, now]}, geometry=[point, point], crs={}) ++ df = GeoDataFrame({"a": [1, 2], "b": [now, now]}, geometry=[point, point], crs=4326) + df.to_file(tempfilename, driver="GPKG") + df_read = read_file(tempfilename) + assert_geoseries_equal(df.geometry, df_read.geometry) +@@ -158,7 +156,7 @@ def test_to_file_with_poly_z(tmpdir, ext, driver): + + + def test_to_file_types(tmpdir, df_points): +- """ Test various integer type columns (GH#93) """ ++ """Test various integer type columns (GH#93)""" + tempfilename = os.path.join(str(tmpdir), "int.shp") + int_types = [ + np.int8, +@@ -247,7 +245,7 @@ def test_to_file_column_len(tmpdir, df_points): + + @pytest.mark.parametrize("driver,ext", driver_ext_pairs) + def test_append_file(tmpdir, df_nybb, df_null, driver, ext): +- """ Test to_file with append mode and from_file """ ++ """Test to_file with append mode and from_file""" + from fiona import supported_drivers + + if "a" not in supported_drivers[driver]: +@@ -275,6 +273,30 @@ def test_append_file(tmpdir, df_nybb, df_null, driver, ext): + assert_geodataframe_equal(df, expected, check_less_precise=True) + + ++@pytest.mark.parametrize("driver,ext", driver_ext_pairs) ++def test_empty_crs(tmpdir, driver, ext): ++ """Test handling of undefined CRS with GPKG driver (GH #1975).""" ++ if driver == "GPKG": ++ pytest.xfail("GPKG is read with Undefined geographic SRS.") ++ ++ tempfilename = os.path.join(str(tmpdir), "boros." + ext) ++ df = GeoDataFrame( ++ { ++ "a": [1, 2, 3], ++ "geometry": [Point(0, 0), Point(1, 1), Point(2, 2)], ++ }, ++ ) ++ ++ df.to_file(tempfilename, driver=driver) ++ result = read_file(tempfilename) ++ ++ if driver == "GeoJSON": ++ # geojson by default assumes epsg:4326 ++ df.crs = "EPSG:4326" ++ ++ assert_geodataframe_equal(result, df) ++ ++ + # ----------------------------------------------------------------------------- + # read_file tests + # ----------------------------------------------------------------------------- +-- +2.31.1 + diff --git a/python-geopandas.spec b/python-geopandas.spec index 8e3bd7d..41923a6 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.9.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -19,6 +19,10 @@ Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{s Patch0001: 0001-Skip-test_overlay_nybb-on-broken-platforms.patch # https://github.com/geopandas/geopandas/pull/1958 Patch0002: 0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch +# https://github.com/geopandas/geopandas/pull/1878 +Patch0003: 0003-TST-skip-pandas-master-fillna-test-1878.patch +# https://github.com/geopandas/geopandas/issues/1975 +Patch0004: 0004-TST-adapt-GPKG-tests-with-undefined-CRS-1986.patch BuildArch: noarch @@ -56,10 +60,7 @@ BuildRequires: python3dist(matplotlib) >= 2.0.1 %check -# Skip tests broken on GDAL 3.3.0 -# https://github.com/geopandas/geopandas/issues/1975 -%{pytest} -ra geopandas -m 'not web' \ - -k 'not test_to_file_bool[GPKG-gpkg] and not test_to_file_datetime' +%{pytest} -ra geopandas -m 'not web' %files -n python3-%{srcname} @@ -70,6 +71,9 @@ BuildRequires: python3dist(matplotlib) >= 2.0.1 %changelog +* Mon Sep 13 2021 Elliott Sales de Andrade - 0.9.0-4 +- Backport patches for GDAL 3.3 (#1981675) + * Fri Jul 23 2021 Fedora Release Engineering - 0.9.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 6f736ecb57b83da9c19fc2bbf30eabf0af38dc3d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 3 Oct 2021 15:53:50 -0400 Subject: [PATCH 20/67] Convert to rpmautospec --- changelog | 113 ++++++++++++++++++++++++++++++++++++++++ python-geopandas.spec | 116 +----------------------------------------- 2 files changed, 115 insertions(+), 114 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..3b0a351 --- /dev/null +++ b/changelog @@ -0,0 +1,113 @@ +* Mon Sep 13 2021 Elliott Sales de Andrade - 0.9.0-4 +- Backport patches for GDAL 3.3 (#1981675) + +* Fri Jul 23 2021 Fedora Release Engineering - 0.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jun 17 2021 Elliott Sales de Andrade - 0.9.0-2 +- Update & correct dependencies +- Backport patch to fix tests with Proj 8.0.1 +- Skip tests broken on GDAL 3.3.0 + +* Fri Jun 04 2021 Python Maint - 0.9.0-2 +- Rebuilt for Python 3.10 + +* Sun Feb 28 2021 Elliott Sales de Andrade - 0.9.0-1 +- Update to latest version (#1933514) + +* Sat Feb 06 2021 Elliott Sales de Andrade - 0.8.2-1 +- Update to latest version (#1920235) + +* Wed Jan 27 2021 Fedora Release Engineering - 0.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 17 2020 Elliott Sales de Andrade - 0.8.1-2 +- Fix alternate architecture patch. + +* Thu Jul 16 2020 Elliott Sales de Andrade - 0.8.1-1 +- Update to latest version + +* Thu Jul 02 2020 Elliott Sales de Andrade - 0.8.0-1 +- Update to latest version + +* Tue May 26 2020 Miro Hrončok - 0.7.0-2 +- Rebuilt for Python 3.9 + +* Tue Feb 18 2020 Elliott Sales de Andrade - 0.7.0-1 +- Update to latest version + +* Sat Feb 08 2020 Elliott Sales de Andrade - 0.6.3-1 +- Update to latest version + +* Thu Jan 30 2020 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Sep 29 2019 Elliott Sales de Andrade - 0.6.0-1 +- Update to latest version + +* Sat Aug 24 2019 Elliott Sales de Andrade - 0.6.0-0.1.rc1 +- Update to latest release candidate + +* Sat Aug 24 2019 Elliott Sales de Andrade - 0.5.1-1 +- Update to latest version + +* Mon Aug 19 2019 Miro Hrončok - 0.5.0-3 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 0.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Apr 27 2019 Elliott Sales de Andrade - 0.5.0-1 +- Update to latest version + +* Sat Mar 09 2019 Elliott Sales de Andrade - 0.4.1-1 +- Update to latest version + +* Sat Feb 02 2019 Fedora Release Engineering - 0.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Sep 21 2018 Miro Hrončok - 0.4.0-2 +- Drop Python 2 subpackage + +* Wed Jul 18 2018 Elliott Sales de Andrade - 0.4.0-1 +- Update to latest version + +* Sat Jul 14 2018 Fedora Release Engineering - 0.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jul 11 2018 Elliott Sales de Andrade - 0.3.0-6 +- Add patch to build against Pandas 0.23.0 + +* Tue Jun 19 2018 Miro Hrončok - 0.3.0-6 +- Rebuilt for Python 3.7 + +* Wed Feb 14 2018 Elliott Sales de Andrade - 0.3.0-5 +- rebuilt + +* Fri Feb 09 2018 Fedora Release Engineering - 0.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Dec 09 2017 Elliott Sales de Andrade - 0.3.0-3 +- Add patch for non-x86 systems. +- Use python2-* BR. + +* Fri Dec 01 2017 Elliott Sales de Andrade - 0.3.0-2 +- Add patch for non-x86 systems. + +* Tue Sep 19 2017 Elliott Sales de Andrade - 0.3.0-1 +- Update to latest version. +- Use lowercase rtree dependency. +- Fix inconsistent capitalization. + +* Sat Aug 12 2017 Elliott Sales de Andrade - 0.2.1-3 +- Simplify spec with more macros. + +* Sun Jul 09 2017 Elliott Sales de Andrade - 0.2.1-2 +- Simplify spec a bit. +- Add patch for new Pandas compatibility. + +* Sun Mar 05 2017 Elliott Sales de Andrade - 0.2.1-1 +- Initial package release. diff --git a/python-geopandas.spec b/python-geopandas.spec index 41923a6..27b118c 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.9.0 -Release: 4%{?dist} +Release: %autorelease Summary: Geographic Pandas extensions %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ @@ -71,116 +71,4 @@ BuildRequires: python3dist(matplotlib) >= 2.0.1 %changelog -* Mon Sep 13 2021 Elliott Sales de Andrade - 0.9.0-4 -- Backport patches for GDAL 3.3 (#1981675) - -* Fri Jul 23 2021 Fedora Release Engineering - 0.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jun 17 2021 Elliott Sales de Andrade - 0.9.0-2 -- Update & correct dependencies -- Backport patch to fix tests with Proj 8.0.1 -- Skip tests broken on GDAL 3.3.0 - -* Fri Jun 04 2021 Python Maint - 0.9.0-2 -- Rebuilt for Python 3.10 - -* Sun Feb 28 2021 Elliott Sales de Andrade - 0.9.0-1 -- Update to latest version (#1933514) - -* Sat Feb 06 2021 Elliott Sales de Andrade - 0.8.2-1 -- Update to latest version (#1920235) - -* Wed Jan 27 2021 Fedora Release Engineering - 0.8.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.8.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 17 2020 Elliott Sales de Andrade - 0.8.1-2 -- Fix alternate architecture patch. - -* Thu Jul 16 2020 Elliott Sales de Andrade - 0.8.1-1 -- Update to latest version - -* Thu Jul 02 2020 Elliott Sales de Andrade - 0.8.0-1 -- Update to latest version - -* Tue May 26 2020 Miro Hrončok - 0.7.0-2 -- Rebuilt for Python 3.9 - -* Tue Feb 18 2020 Elliott Sales de Andrade - 0.7.0-1 -- Update to latest version - -* Sat Feb 08 2020 Elliott Sales de Andrade - 0.6.3-1 -- Update to latest version - -* Thu Jan 30 2020 Fedora Release Engineering - 0.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Sep 29 2019 Elliott Sales de Andrade - 0.6.0-1 -- Update to latest version - -* Sat Aug 24 2019 Elliott Sales de Andrade - 0.6.0-0.1.rc1 -- Update to latest release candidate - -* Sat Aug 24 2019 Elliott Sales de Andrade - 0.5.1-1 -- Update to latest version - -* Mon Aug 19 2019 Miro Hrončok - 0.5.0-3 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 0.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Apr 27 2019 Elliott Sales de Andrade - 0.5.0-1 -- Update to latest version - -* Sat Mar 09 2019 Elliott Sales de Andrade - 0.4.1-1 -- Update to latest version - -* Sat Feb 02 2019 Fedora Release Engineering - 0.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Sep 21 2018 Miro Hrončok - 0.4.0-2 -- Drop Python 2 subpackage - -* Wed Jul 18 2018 Elliott Sales de Andrade - 0.4.0-1 -- Update to latest version - -* Sat Jul 14 2018 Fedora Release Engineering - 0.3.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jul 11 2018 Elliott Sales de Andrade - 0.3.0-6 -- Add patch to build against Pandas 0.23.0 - -* Tue Jun 19 2018 Miro Hrončok - 0.3.0-6 -- Rebuilt for Python 3.7 - -* Wed Feb 14 2018 Elliott Sales de Andrade - 0.3.0-5 -- rebuilt - -* Fri Feb 09 2018 Fedora Release Engineering - 0.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Dec 09 2017 Elliott Sales de Andrade - 0.3.0-3 -- Add patch for non-x86 systems. -- Use python2-* BR. - -* Fri Dec 01 2017 Elliott Sales de Andrade - 0.3.0-2 -- Add patch for non-x86 systems. - -* Tue Sep 19 2017 Elliott Sales de Andrade - 0.3.0-1 -- Update to latest version. -- Use lowercase rtree dependency. -- Fix inconsistent capitalization. - -* Sat Aug 12 2017 Elliott Sales de Andrade - 0.2.1-3 -- Simplify spec with more macros. - -* Sun Jul 09 2017 Elliott Sales de Andrade - 0.2.1-2 -- Simplify spec a bit. -- Add patch for new Pandas compatibility. - -* Sun Mar 05 2017 Elliott Sales de Andrade - 0.2.1-1 -- Initial package release. +%autochangelog From 376ebe09d6b79163e67deff4f7209815c6b145e3 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 3 Oct 2021 16:01:21 -0400 Subject: [PATCH 21/67] Switch to latest Python macros --- python-geopandas.spec | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index 27b118c..a6e86e6 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -33,12 +33,7 @@ BuildArch: noarch Summary: %{summary} BuildRequires: python3-devel -BuildRequires: python3dist(setuptools) -BuildRequires: python3dist(fiona) >= 1.8 BuildRequires: python3dist(numpy) >= 1.15 -BuildRequires: python3dist(pandas) >= 0.24 -BuildRequires: python3dist(pyproj) >= 2.2 -BuildRequires: python3dist(shapely) >= 1.6 BuildRequires: python3dist(pytest) BuildRequires: python3dist(rtree) >= 0.8 @@ -46,29 +41,25 @@ BuildRequires: python3dist(matplotlib) >= 2.0.1 %description -n python3-%{srcname} %{_description} - %prep %autosetup -n %{srcname}-%{version} -p1 +%generate_buildrequires +%pyproject_buildrequires -r %build -%py3_build - +%pyproject_wheel %install -%py3_install - +%pyproject_install +%pyproject_save_files %{srcname} %check %{pytest} -ra geopandas -m 'not web' - -%files -n python3-%{srcname} +%files -n python3-%{srcname} -f %{pyproject_files} %license LICENSE.txt %doc README.md CHANGELOG.md -%{python3_sitelib}/%{srcname}/ -%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/ - %changelog %autochangelog From 62175216d5fc68a62097612c90c7d1feb147c690 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 3 Oct 2021 16:31:33 -0400 Subject: [PATCH 22/67] Update to latest version (#2010112) --- .gitignore | 1 + ...est_overlay_nybb-on-broken-platforms.patch | 11 +- ...roj4strings-test-for-PROJ-8.0.1-1958.patch | 74 ------------ ...-skip-pandas-master-fillna-test-1878.patch | 28 ----- ...t-GPKG-tests-with-undefined-CRS-1986.patch | 110 ------------------ python-geopandas.spec | 12 +- sources | 2 +- 7 files changed, 13 insertions(+), 225 deletions(-) delete mode 100644 0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch delete mode 100644 0003-TST-skip-pandas-master-fillna-test-1878.patch delete mode 100644 0004-TST-adapt-GPKG-tests-with-undefined-CRS-1986.patch diff --git a/.gitignore b/.gitignore index 8de1db0..9783b9b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /geopandas-0.8.1.tar.gz /geopandas-0.8.2.tar.gz /geopandas-0.9.0.tar.gz +/geopandas-0.10.0.tar.gz diff --git a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch index e373247..17515e0 100644 --- a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch +++ b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch @@ -1,7 +1,7 @@ -From 59761245b53f90f8c82b8eb88a2532d8f0d462b4 Mon Sep 17 00:00:00 2001 +From 7b960e13e478a908f601d636b32d5612ba51a691 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 29 Jul 2018 19:34:39 -0400 -Subject: [PATCH 1/4] Skip test_overlay_nybb on broken platforms. +Subject: [PATCH] Skip test_overlay_nybb on broken platforms. Signed-off-by: Elliott Sales de Andrade --- @@ -9,16 +9,17 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 4 insertions(+) diff --git a/geopandas/tests/test_overlay.py b/geopandas/tests/test_overlay.py -index f0c095a..e19e2d0 100644 +index ec9b682..39f6d4d 100644 --- a/geopandas/tests/test_overlay.py +++ b/geopandas/tests/test_overlay.py -@@ -1,4 +1,5 @@ +@@ -1,5 +1,6 @@ import os + from distutils.version import LooseVersion +import platform import pandas as pd -@@ -105,6 +106,9 @@ def test_overlay(dfs_index, how): +@@ -110,6 +111,9 @@ def test_overlay(dfs_index, how): @pytest.mark.filterwarnings("ignore:GeoSeries crs mismatch:UserWarning") def test_overlay_nybb(how): diff --git a/0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch b/0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch deleted file mode 100644 index 2c34a7d..0000000 --- a/0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch +++ /dev/null @@ -1,74 +0,0 @@ -From fcb99998fed1580c29d19df3b5535c51fe475cb2 Mon Sep 17 00:00:00 2001 -From: Martin Fleischmann -Date: Wed, 2 Jun 2021 20:57:59 +0100 -Subject: [PATCH 2/4] TST: fix proj4strings test for PROJ 8.0.1 (#1958) - -Signed-off-by: Elliott Sales de Andrade ---- - geopandas/geoseries.py | 6 +++--- - geopandas/tests/test_geoseries.py | 10 +++++----- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/geopandas/geoseries.py b/geopandas/geoseries.py -index c60d1c8..3011fad 100644 ---- a/geopandas/geoseries.py -+++ b/geopandas/geoseries.py -@@ -132,9 +132,9 @@ class GeoSeries(GeoPandasBase, Series): - - Lat[north]: Geodetic latitude (degree) - - Lon[east]: Geodetic longitude (degree) - Area of Use: -- - name: World -+ - name: World. - - bounds: (-180.0, -90.0, 180.0, 90.0) -- Datum: World Geodetic System 1984 -+ Datum: World Geodetic System 1984 ensemble - - Ellipsoid: WGS 84 - - Prime Meridian: Greenwich - -@@ -578,7 +578,7 @@ class GeoSeries(GeoPandasBase, Series): - return result - - def __finalize__(self, other, method=None, **kwargs): -- """ propagate metadata from other to self """ -+ """propagate metadata from other to self""" - # NOTE: backported from pandas master (upcoming v0.13) - for name in self._metadata: - object.__setattr__(self, name, getattr(other, name, None)) -diff --git a/geopandas/tests/test_geoseries.py b/geopandas/tests/test_geoseries.py -index 80ffbbc..1cb6796 100644 ---- a/geopandas/tests/test_geoseries.py -+++ b/geopandas/tests/test_geoseries.py -@@ -262,25 +262,25 @@ class TestSeries: - - def test_proj4strings(self): - # As string -- reprojected = self.g3.to_crs("+proj=utm +zone=30N") -+ reprojected = self.g3.to_crs("+proj=utm +zone=30") - reprojected_back = reprojected.to_crs(epsg=4326) - assert np.all(self.g3.geom_almost_equals(reprojected_back)) - - # As dict -- reprojected = self.g3.to_crs({"proj": "utm", "zone": "30N"}) -+ reprojected = self.g3.to_crs({"proj": "utm", "zone": "30"}) - reprojected_back = reprojected.to_crs(epsg=4326) - assert np.all(self.g3.geom_almost_equals(reprojected_back)) - - # Set to equivalent string, convert, compare to original - copy = self.g3.copy() - copy.crs = "epsg:4326" -- reprojected = copy.to_crs({"proj": "utm", "zone": "30N"}) -+ reprojected = copy.to_crs({"proj": "utm", "zone": "30"}) - reprojected_back = reprojected.to_crs(epsg=4326) - assert np.all(self.g3.geom_almost_equals(reprojected_back)) - - # Conversions by different format -- reprojected_string = self.g3.to_crs("+proj=utm +zone=30N") -- reprojected_dict = self.g3.to_crs({"proj": "utm", "zone": "30N"}) -+ reprojected_string = self.g3.to_crs("+proj=utm +zone=30") -+ reprojected_dict = self.g3.to_crs({"proj": "utm", "zone": "30"}) - assert np.all(reprojected_string.geom_almost_equals(reprojected_dict)) - - def test_from_wkb(self): --- -2.31.1 - diff --git a/0003-TST-skip-pandas-master-fillna-test-1878.patch b/0003-TST-skip-pandas-master-fillna-test-1878.patch deleted file mode 100644 index 753a4af..0000000 --- a/0003-TST-skip-pandas-master-fillna-test-1878.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 52a85d2cf043eef09c06c8a486e71a3044a6c292 Mon Sep 17 00:00:00 2001 -From: Martin Fleischmann -Date: Sun, 4 Apr 2021 09:37:36 +0100 -Subject: [PATCH 3/4] TST: skip pandas master fillna test (#1878) - -Signed-off-by: Elliott Sales de Andrade ---- - geopandas/tests/test_extension_array.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/geopandas/tests/test_extension_array.py b/geopandas/tests/test_extension_array.py -index 37d37a3..be09408 100644 ---- a/geopandas/tests/test_extension_array.py -+++ b/geopandas/tests/test_extension_array.py -@@ -366,6 +366,10 @@ class TestMissing(extension_tests.BaseMissingTests): - def test_fillna_series_method(self, data_missing, method): - pass - -+ @pytest.mark.skip("fillna method not supported") -+ def test_fillna_no_op_returns_copy(self, data): -+ pass -+ - - class TestReduce(extension_tests.BaseNoReduceTests): - @pytest.mark.skip("boolean reduce (any/all) tested in test_pandas_methods") --- -2.31.1 - diff --git a/0004-TST-adapt-GPKG-tests-with-undefined-CRS-1986.patch b/0004-TST-adapt-GPKG-tests-with-undefined-CRS-1986.patch deleted file mode 100644 index 94b6c07..0000000 --- a/0004-TST-adapt-GPKG-tests-with-undefined-CRS-1986.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 83a21379cbb45acd80d3418f5bcce0d7270a56a6 Mon Sep 17 00:00:00 2001 -From: Martin Fleischmann -Date: Fri, 2 Jul 2021 09:43:12 +0100 -Subject: [PATCH 4/4] TST: adapt GPKG tests with undefined CRS (#1986) - -Signed-off-by: Elliott Sales de Andrade ---- - geopandas/io/tests/test_file.py | 40 +++++++++++++++++++++++++-------- - 1 file changed, 31 insertions(+), 9 deletions(-) - -diff --git a/geopandas/io/tests/test_file.py b/geopandas/io/tests/test_file.py -index ac20d5e..ceb094d 100644 ---- a/geopandas/io/tests/test_file.py -+++ b/geopandas/io/tests/test_file.py -@@ -66,7 +66,7 @@ driver_ext_pairs = [("ESRI Shapefile", "shp"), ("GeoJSON", "geojson"), ("GPKG", - - @pytest.mark.parametrize("driver,ext", driver_ext_pairs) - def test_to_file(tmpdir, df_nybb, df_null, driver, ext): -- """ Test to_file and from_file """ -+ """Test to_file and from_file""" - tempfilename = os.path.join(str(tmpdir), "boros." + ext) - df_nybb.to_file(tempfilename, driver=driver) - # Read layer back in -@@ -87,7 +87,7 @@ def test_to_file(tmpdir, df_nybb, df_null, driver, ext): - - @pytest.mark.parametrize("driver,ext", driver_ext_pairs) - def test_to_file_pathlib(tmpdir, df_nybb, df_null, driver, ext): -- """ Test to_file and from_file """ -+ """Test to_file and from_file""" - temppath = pathlib.Path(os.path.join(str(tmpdir), "boros." + ext)) - df_nybb.to_file(temppath, driver=driver) - # Read layer back in -@@ -106,14 +106,12 @@ def test_to_file_bool(tmpdir, driver, ext): - "a": [1, 2, 3], - "b": [True, False, True], - "geometry": [Point(0, 0), Point(1, 1), Point(2, 2)], -- } -+ }, -+ crs=4326, - ) - - df.to_file(tempfilename, driver=driver) - result = read_file(tempfilename) -- if driver == "GeoJSON": -- # geojson by default assumes epsg:4326 -- result.crs = None - if driver == "ESRI Shapefile": - # Shapefile does not support boolean, so is read back as int - df["b"] = df["b"].astype("int64") -@@ -125,7 +123,7 @@ def test_to_file_datetime(tmpdir): - tempfilename = os.path.join(str(tmpdir), "test_datetime.gpkg") - point = Point(0, 0) - now = datetime.datetime.now() -- df = GeoDataFrame({"a": [1, 2], "b": [now, now]}, geometry=[point, point], crs={}) -+ df = GeoDataFrame({"a": [1, 2], "b": [now, now]}, geometry=[point, point], crs=4326) - df.to_file(tempfilename, driver="GPKG") - df_read = read_file(tempfilename) - assert_geoseries_equal(df.geometry, df_read.geometry) -@@ -158,7 +156,7 @@ def test_to_file_with_poly_z(tmpdir, ext, driver): - - - def test_to_file_types(tmpdir, df_points): -- """ Test various integer type columns (GH#93) """ -+ """Test various integer type columns (GH#93)""" - tempfilename = os.path.join(str(tmpdir), "int.shp") - int_types = [ - np.int8, -@@ -247,7 +245,7 @@ def test_to_file_column_len(tmpdir, df_points): - - @pytest.mark.parametrize("driver,ext", driver_ext_pairs) - def test_append_file(tmpdir, df_nybb, df_null, driver, ext): -- """ Test to_file with append mode and from_file """ -+ """Test to_file with append mode and from_file""" - from fiona import supported_drivers - - if "a" not in supported_drivers[driver]: -@@ -275,6 +273,30 @@ def test_append_file(tmpdir, df_nybb, df_null, driver, ext): - assert_geodataframe_equal(df, expected, check_less_precise=True) - - -+@pytest.mark.parametrize("driver,ext", driver_ext_pairs) -+def test_empty_crs(tmpdir, driver, ext): -+ """Test handling of undefined CRS with GPKG driver (GH #1975).""" -+ if driver == "GPKG": -+ pytest.xfail("GPKG is read with Undefined geographic SRS.") -+ -+ tempfilename = os.path.join(str(tmpdir), "boros." + ext) -+ df = GeoDataFrame( -+ { -+ "a": [1, 2, 3], -+ "geometry": [Point(0, 0), Point(1, 1), Point(2, 2)], -+ }, -+ ) -+ -+ df.to_file(tempfilename, driver=driver) -+ result = read_file(tempfilename) -+ -+ if driver == "GeoJSON": -+ # geojson by default assumes epsg:4326 -+ df.crs = "EPSG:4326" -+ -+ assert_geodataframe_equal(result, df) -+ -+ - # ----------------------------------------------------------------------------- - # read_file tests - # ----------------------------------------------------------------------------- --- -2.31.1 - diff --git a/python-geopandas.spec b/python-geopandas.spec index a6e86e6..244ac0b 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,7 +1,7 @@ %global srcname geopandas Name: python-%{srcname} -Version: 0.9.0 +Version: 0.10.0 Release: %autorelease Summary: Geographic Pandas extensions %global _description \ @@ -17,12 +17,6 @@ License: BSD URL: https://pypi.python.org/pypi/%{srcname} Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz Patch0001: 0001-Skip-test_overlay_nybb-on-broken-platforms.patch -# https://github.com/geopandas/geopandas/pull/1958 -Patch0002: 0002-TST-fix-proj4strings-test-for-PROJ-8.0.1-1958.patch -# https://github.com/geopandas/geopandas/pull/1878 -Patch0003: 0003-TST-skip-pandas-master-fillna-test-1878.patch -# https://github.com/geopandas/geopandas/issues/1975 -Patch0004: 0004-TST-adapt-GPKG-tests-with-undefined-CRS-1986.patch BuildArch: noarch @@ -36,8 +30,12 @@ BuildRequires: python3-devel 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) >= 2.0.1 +BuildRequires: python3dist(mapclassify) %description -n python3-%{srcname} %{_description} diff --git a/sources b/sources index fa3b7c8..9e01043 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.9.0.tar.gz) = e70e2f961b497a1006bf08f7177d50d87219c9a125bb550fb864fcebfbd327d3cee62ebd4448af31c3fbe54edf5c47829d34a9ab221ce40b010fa5db77de7638 +SHA512 (geopandas-0.10.0.tar.gz) = 34003904e4b5393a316fa222ab3437e19fc43c9a5a394f0012b7d085780769eea3fb446aaf91b6cd7b9dd56073df3958135ffe67913ecd98ac485ee235986b05 From 33d0b45c1e41a47c9ca213bdef09e50e133b7444 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 9 Oct 2021 02:19:04 -0400 Subject: [PATCH 23/67] Update to latest version (#2012104) --- .gitignore | 1 + ...est_overlay_nybb-on-broken-platforms.patch | 34 ------------------- python-geopandas.spec | 3 +- sources | 2 +- 4 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 0001-Skip-test_overlay_nybb-on-broken-platforms.patch diff --git a/.gitignore b/.gitignore index 9783b9b..e0ccbe0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /geopandas-0.8.2.tar.gz /geopandas-0.9.0.tar.gz /geopandas-0.10.0.tar.gz +/geopandas-0.10.1.tar.gz diff --git a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch deleted file mode 100644 index 17515e0..0000000 --- a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7b960e13e478a908f601d636b32d5612ba51a691 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Sun, 29 Jul 2018 19:34:39 -0400 -Subject: [PATCH] Skip test_overlay_nybb on broken platforms. - -Signed-off-by: Elliott Sales de Andrade ---- - geopandas/tests/test_overlay.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/geopandas/tests/test_overlay.py b/geopandas/tests/test_overlay.py -index ec9b682..39f6d4d 100644 ---- a/geopandas/tests/test_overlay.py -+++ b/geopandas/tests/test_overlay.py -@@ -1,5 +1,6 @@ - import os - from distutils.version import LooseVersion -+import platform - - import pandas as pd - -@@ -110,6 +111,9 @@ def test_overlay(dfs_index, how): - - @pytest.mark.filterwarnings("ignore:GeoSeries crs mismatch:UserWarning") - def test_overlay_nybb(how): -+ if how != 'difference' and platform.machine() in ('aarch64', 'ppc64le', 's390x'): -+ pytest.xfail('platform-specific problems') -+ - polydf = read_file(geopandas.datasets.get_path("nybb")) - - # The circles have been constructed and saved at the time the expected --- -2.31.1 - diff --git a/python-geopandas.spec b/python-geopandas.spec index 244ac0b..f9285c4 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,7 +1,7 @@ %global srcname geopandas Name: python-%{srcname} -Version: 0.10.0 +Version: 0.10.1 Release: %autorelease Summary: Geographic Pandas extensions %global _description \ @@ -16,7 +16,6 @@ otherwise require a spatial database such as PostGIS. License: BSD URL: https://pypi.python.org/pypi/%{srcname} Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz -Patch0001: 0001-Skip-test_overlay_nybb-on-broken-platforms.patch BuildArch: noarch diff --git a/sources b/sources index 9e01043..9cd800c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.10.0.tar.gz) = 34003904e4b5393a316fa222ab3437e19fc43c9a5a394f0012b7d085780769eea3fb446aaf91b6cd7b9dd56073df3958135ffe67913ecd98ac485ee235986b05 +SHA512 (geopandas-0.10.1.tar.gz) = 4288ab56cd47de773409202bd033f8b73395c323f510514144245f750d01e5c4166febd14198bcc1225b6fb5f54fff59eadaccb6e1943f22cf6127e6b03ad9fd From 2449180b6d41eef49c38c275f64ecc16e91c8392 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 16 Oct 2021 23:30:03 -0400 Subject: [PATCH 24/67] Update to latest version (#2014734) --- .gitignore | 1 + python-geopandas.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e0ccbe0..d90cfa3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /geopandas-0.9.0.tar.gz /geopandas-0.10.0.tar.gz /geopandas-0.10.1.tar.gz +/geopandas-0.10.2.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index f9285c4..4bc2606 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,7 +1,7 @@ %global srcname geopandas Name: python-%{srcname} -Version: 0.10.1 +Version: 0.10.2 Release: %autorelease Summary: Geographic Pandas extensions %global _description \ diff --git a/sources b/sources index 9cd800c..a8c4518 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.10.1.tar.gz) = 4288ab56cd47de773409202bd033f8b73395c323f510514144245f750d01e5c4166febd14198bcc1225b6fb5f54fff59eadaccb6e1943f22cf6127e6b03ad9fd +SHA512 (geopandas-0.10.2.tar.gz) = 2fee9f5de51c4573f156c4e3ba19d4124b391c102b583ca17d9dcb7742ded8f6088266e5007127cb2c70b14ef143a1cdaae51bc8a4d1d34131b244bdf4b7ac56 From cbda4d5a88e971b6047d6c90b01cf20cde51ab08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 12:21:05 +0000 Subject: [PATCH 25/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 750a9049251ae154e8d961ac621b2731da38b329 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 8 May 2022 08:15:50 -0400 Subject: [PATCH 26/67] Fix test failures with pandas 1.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport upstream PR’s #2219, #2289, #2298, and #2320 in order to resolve test failures with pandas 1.4. It seems that PR#2320 may also be needed for pandas 1.3.5, which should have been a compatible release. --- 2219.patch | 79 +++++++++++++++++ 2289.patch | 199 ++++++++++++++++++++++++++++++++++++++++++ 2298.patch | 116 ++++++++++++++++++++++++ 2320.patch | 21 +++++ python-geopandas.spec | 25 ++++++ 5 files changed, 440 insertions(+) create mode 100644 2219.patch create mode 100644 2289.patch create mode 100644 2298.patch create mode 100644 2320.patch diff --git a/2219.patch b/2219.patch new file mode 100644 index 0000000..066daad --- /dev/null +++ b/2219.patch @@ -0,0 +1,79 @@ +From ac67515c9df745b672cca1669adf05eaf5cb0f3b Mon Sep 17 00:00:00 2001 +From: Joris Van den Bossche +Date: Sat, 6 Nov 2021 11:20:08 +0100 +Subject: [PATCH 1/2] TST/COMPAT: update GeometryArray getitem error type + fix + tests + +--- + geopandas/array.py | 6 ++++-- + geopandas/tests/test_extension_array.py | 12 ++++++++++++ + 2 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/geopandas/array.py b/geopandas/array.py +index 0532c08b8..3319847ea 100644 +--- a/geopandas/array.py ++++ b/geopandas/array.py +@@ -363,10 +363,12 @@ def __getitem__(self, idx): + # for pandas >= 1.0, validate and convert IntegerArray/BooleanArray + # to numpy array, pass-through non-array-like indexers + idx = pd.api.indexers.check_array_indexer(self, idx) +- if isinstance(idx, (Iterable, slice)): + return GeometryArray(self.data[idx], crs=self.crs) + else: +- raise TypeError("Index type not supported", idx) ++ if isinstance(idx, (Iterable, slice)): ++ return GeometryArray(self.data[idx], crs=self.crs) ++ else: ++ raise TypeError("Index type not supported", idx) + + def __setitem__(self, key, value): + if compat.PANDAS_GE_10: +diff --git a/geopandas/tests/test_extension_array.py b/geopandas/tests/test_extension_array.py +index 6e1205b26..9582404b4 100644 +--- a/geopandas/tests/test_extension_array.py ++++ b/geopandas/tests/test_extension_array.py +@@ -231,6 +231,18 @@ def as_array(request): + return request.param + + ++@pytest.fixture ++def invalid_scalar(data): ++ """ ++ A scalar that *cannot* be held by this ExtensionArray. ++ ++ The default should work for most subclasses, but is not guaranteed. ++ ++ If the array can hold any item (i.e. object dtype), then use pytest.skip. ++ """ ++ return object.__new__(object) ++ ++ + # Fixtures defined in pandas/conftest.py that are also needed: defining them + # here instead of importing for compatibility + + +From 7d0de45cd794161c52ee998d3e1e4ac2f683e87b Mon Sep 17 00:00:00 2001 +From: Joris Van den Bossche +Date: Sat, 6 Nov 2021 16:40:22 +0100 +Subject: [PATCH 2/2] fix doctest for GEOS 3.10 + +--- + geopandas/array.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/geopandas/array.py b/geopandas/array.py +index 3319847ea..fd7b7fc6f 100644 +--- a/geopandas/array.py ++++ b/geopandas/array.py +@@ -742,8 +742,9 @@ def to_crs(self, crs=None, epsg=None): + + >>> a = a.to_crs(3857) + >>> to_wkt(a) +- array(['POINT (111319 111325)', 'POINT (222639 222684)', +- 'POINT (333958 334111)'], dtype=object) ++ array(['POINT (111319.490793 111325.142866)', ++ 'POINT (222638.981587 222684.208506)', ++ 'POINT (333958.47238 334111.171402)'], dtype=object) + >>> a.crs # doctest: +SKIP + + Name: WGS 84 / Pseudo-Mercator diff --git a/2289.patch b/2289.patch new file mode 100644 index 0000000..54807ac --- /dev/null +++ b/2289.patch @@ -0,0 +1,199 @@ +From f5998c419aef31d237a2bd316199cc6351221c4c Mon Sep 17 00:00:00 2001 +From: Matt Richards +Date: Wed, 5 Jan 2022 12:21:21 +1000 +Subject: [PATCH 1/5] TST: fix test_value_counts pandas master + +--- + geopandas/_compat.py | 1 + + geopandas/tests/test_pandas_methods.py | 19 +++++++++++++++---- + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/geopandas/_compat.py b/geopandas/_compat.py +index e5ac045df..9fe9e124a 100644 +--- a/geopandas/_compat.py ++++ b/geopandas/_compat.py +@@ -19,6 +19,7 @@ + PANDAS_GE_11 = str(pd.__version__) >= LooseVersion("1.1.0") + PANDAS_GE_115 = str(pd.__version__) >= LooseVersion("1.1.5") + PANDAS_GE_12 = str(pd.__version__) >= LooseVersion("1.2.0") ++PANDAS_GE_20 = str(pd.__version__) > LooseVersion("1.4.0.dev") + + + # ----------------------------------------------------------------------------- +diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py +index 709ad3da0..f9ce67e86 100644 +--- a/geopandas/tests/test_pandas_methods.py ++++ b/geopandas/tests/test_pandas_methods.py +@@ -445,33 +445,44 @@ def test_unique(): + assert_array_equal(s.unique(), exp) + + ++def pd20_compat_index(index): ++ if compat.PANDAS_GE_20: ++ return from_shapely(index) ++ else: ++ return index ++ ++ + def test_value_counts(): + # each object is considered unique + s = GeoSeries([Point(0, 0), Point(1, 1), Point(0, 0)]) + res = s.value_counts() + with compat.ignore_shapely2_warnings(): +- exp = pd.Series([2, 1], index=[Point(0, 0), Point(1, 1)]) ++ exp = pd.Series([2, 1], index=pd20_compat_index([Point(0, 0), Point(1, 1)])) + assert_series_equal(res, exp) + # Check crs doesn't make a difference - note it is not kept in output index anyway + s2 = GeoSeries([Point(0, 0), Point(1, 1), Point(0, 0)], crs="EPSG:4326") + res2 = s2.value_counts() + assert_series_equal(res2, exp) ++ if compat.PANDAS_GE_20: ++ # TODO should/ can we fix CRS being lost ++ assert s2.value_counts().index.array.crs is None + + # check mixed geometry + s3 = GeoSeries([Point(0, 0), LineString([[1, 1], [2, 2]]), Point(0, 0)]) + res3 = s3.value_counts() ++ index = pd20_compat_index([Point(0, 0), LineString([[1, 1], [2, 2]])]) + with compat.ignore_shapely2_warnings(): +- exp3 = pd.Series([2, 1], index=[Point(0, 0), LineString([[1, 1], [2, 2]])]) ++ exp3 = pd.Series([2, 1], index=index) + assert_series_equal(res3, exp3) + + # check None is handled + s4 = GeoSeries([Point(0, 0), None, Point(0, 0)]) + res4 = s4.value_counts(dropna=True) + with compat.ignore_shapely2_warnings(): +- exp4_dropna = pd.Series([2], index=[Point(0, 0)]) ++ exp4_dropna = pd.Series([2], index=pd20_compat_index([Point(0, 0)])) + assert_series_equal(res4, exp4_dropna) + with compat.ignore_shapely2_warnings(): +- exp4_keepna = pd.Series([2, 1], index=[Point(0, 0), None]) ++ exp4_keepna = pd.Series([2, 1], index=pd20_compat_index([Point(0, 0), None])) + res4_keepna = s4.value_counts(dropna=False) + assert_series_equal(res4_keepna, exp4_keepna) + + +From ecff4fd976fa619ae9f9792904ec1ecc291f092d Mon Sep 17 00:00:00 2001 +From: Matt Richards <45483497+m-richards@users.noreply.github.com> +Date: Sun, 9 Jan 2022 21:43:42 +1000 +Subject: [PATCH 2/5] Update geopandas/_compat.py + +Co-authored-by: Joris Van den Bossche +--- + geopandas/_compat.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/geopandas/_compat.py b/geopandas/_compat.py +index 9fe9e124a..000db2a60 100644 +--- a/geopandas/_compat.py ++++ b/geopandas/_compat.py +@@ -19,7 +19,7 @@ + PANDAS_GE_11 = str(pd.__version__) >= LooseVersion("1.1.0") + PANDAS_GE_115 = str(pd.__version__) >= LooseVersion("1.1.5") + PANDAS_GE_12 = str(pd.__version__) >= LooseVersion("1.2.0") +-PANDAS_GE_20 = str(pd.__version__) > LooseVersion("1.4.0.dev") ++PANDAS_GE_14 = str(pd.__version__) >= LooseVersion("1.4.0") + + + # ----------------------------------------------------------------------------- + +From 9f22ee43d6960d7c8b6cfdc1907e8e424dc99ba7 Mon Sep 17 00:00:00 2001 +From: Matt Richards <45483497+m-richards@users.noreply.github.com> +Date: Sun, 9 Jan 2022 21:44:25 +1000 +Subject: [PATCH 3/5] Update geopandas/tests/test_pandas_methods.py + +--- + geopandas/tests/test_pandas_methods.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py +index f9ce67e86..82a03869e 100644 +--- a/geopandas/tests/test_pandas_methods.py ++++ b/geopandas/tests/test_pandas_methods.py +@@ -446,7 +446,7 @@ def test_unique(): + + + def pd20_compat_index(index): +- if compat.PANDAS_GE_20: ++ if compat.PANDAS_GE_14: + return from_shapely(index) + else: + return index + +From 2281d167eba59df24a80607d28d6e54c9a20fedd Mon Sep 17 00:00:00 2001 +From: Matt Richards <45483497+m-richards@users.noreply.github.com> +Date: Sun, 9 Jan 2022 21:45:04 +1000 +Subject: [PATCH 4/5] Update test_pandas_methods.py + +--- + geopandas/tests/test_pandas_methods.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py +index 82a03869e..a78e9f0df 100644 +--- a/geopandas/tests/test_pandas_methods.py ++++ b/geopandas/tests/test_pandas_methods.py +@@ -463,7 +463,7 @@ def test_value_counts(): + s2 = GeoSeries([Point(0, 0), Point(1, 1), Point(0, 0)], crs="EPSG:4326") + res2 = s2.value_counts() + assert_series_equal(res2, exp) +- if compat.PANDAS_GE_20: ++ if compat.PANDAS_GE_14: + # TODO should/ can we fix CRS being lost + assert s2.value_counts().index.array.crs is None + + +From 40eb9185c7e18bebf5b6e3cb8da6de7d5520e81f Mon Sep 17 00:00:00 2001 +From: Matt Richards +Date: Sun, 9 Jan 2022 21:46:59 +1000 +Subject: [PATCH 5/5] CLN: finish renames + +--- + geopandas/tests/test_pandas_methods.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py +index a78e9f0df..ed080af46 100644 +--- a/geopandas/tests/test_pandas_methods.py ++++ b/geopandas/tests/test_pandas_methods.py +@@ -445,7 +445,7 @@ def test_unique(): + assert_array_equal(s.unique(), exp) + + +-def pd20_compat_index(index): ++def pd14_compat_index(index): + if compat.PANDAS_GE_14: + return from_shapely(index) + else: +@@ -457,7 +457,7 @@ def test_value_counts(): + s = GeoSeries([Point(0, 0), Point(1, 1), Point(0, 0)]) + res = s.value_counts() + with compat.ignore_shapely2_warnings(): +- exp = pd.Series([2, 1], index=pd20_compat_index([Point(0, 0), Point(1, 1)])) ++ exp = pd.Series([2, 1], index=pd14_compat_index([Point(0, 0), Point(1, 1)])) + assert_series_equal(res, exp) + # Check crs doesn't make a difference - note it is not kept in output index anyway + s2 = GeoSeries([Point(0, 0), Point(1, 1), Point(0, 0)], crs="EPSG:4326") +@@ -470,7 +470,7 @@ def test_value_counts(): + # check mixed geometry + s3 = GeoSeries([Point(0, 0), LineString([[1, 1], [2, 2]]), Point(0, 0)]) + res3 = s3.value_counts() +- index = pd20_compat_index([Point(0, 0), LineString([[1, 1], [2, 2]])]) ++ index = pd14_compat_index([Point(0, 0), LineString([[1, 1], [2, 2]])]) + with compat.ignore_shapely2_warnings(): + exp3 = pd.Series([2, 1], index=index) + assert_series_equal(res3, exp3) +@@ -479,10 +479,10 @@ def test_value_counts(): + s4 = GeoSeries([Point(0, 0), None, Point(0, 0)]) + res4 = s4.value_counts(dropna=True) + with compat.ignore_shapely2_warnings(): +- exp4_dropna = pd.Series([2], index=pd20_compat_index([Point(0, 0)])) ++ exp4_dropna = pd.Series([2], index=pd14_compat_index([Point(0, 0)])) + assert_series_equal(res4, exp4_dropna) + with compat.ignore_shapely2_warnings(): +- exp4_keepna = pd.Series([2, 1], index=pd20_compat_index([Point(0, 0), None])) ++ exp4_keepna = pd.Series([2, 1], index=pd14_compat_index([Point(0, 0), None])) + res4_keepna = s4.value_counts(dropna=False) + assert_series_equal(res4_keepna, exp4_keepna) + diff --git a/2298.patch b/2298.patch new file mode 100644 index 0000000..1b228f0 --- /dev/null +++ b/2298.patch @@ -0,0 +1,116 @@ +From 4121b08257d60cb1c9f504257ca2d8064461ea61 Mon Sep 17 00:00:00 2001 +From: Joris Van den Bossche +Date: Fri, 14 Jan 2022 10:58:10 +0100 +Subject: [PATCH 1/3] TST: test groupby apply with function that requires + GeoDataFrame attributes + +--- + geopandas/tests/test_pandas_methods.py | 34 ++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py +index ed080af46..41db42809 100644 +--- a/geopandas/tests/test_pandas_methods.py ++++ b/geopandas/tests/test_pandas_methods.py +@@ -558,6 +558,40 @@ def test_groupby_groups(df): + assert_frame_equal(res, exp) + + ++@pytest.mark.parametrize("crs", [None, "EPSG:4326"]) ++def test_groupby_metadata(crs): ++ # https://github.com/geopandas/geopandas/issues/2294 ++ df = GeoDataFrame( ++ { ++ "geometry": [Point(0, 0), Point(1, 1), Point(0, 0)], ++ "value1": np.arange(3, dtype="int64"), ++ "value2": np.array([1, 2, 1], dtype="int64"), ++ }, ++ crs=crs, ++ ) ++ ++ # dummy test asserting we can access the crs ++ def func(group): ++ assert isinstance(group, GeoDataFrame) ++ assert group.crs == crs ++ ++ df.groupby("value2").apply(func) ++ ++ # actual test with functionality ++ res = df.groupby("value2").apply( ++ lambda x: geopandas.sjoin(x, x[["geometry", "value1"]], how="inner") ++ ) ++ ++ expected = ( ++ df.take([0, 2, 0, 2, 1]) ++ .set_index("value2", drop=False, append=True) ++ .swaplevel() ++ .rename(columns={"value1": "value1_left"}) ++ .assign(value1_right=[0, 0, 2, 2, 1]) ++ ) ++ assert_geodataframe_equal(res.drop(columns=["index_right"]), expected) ++ ++ + def test_apply(s): + # function that returns geometry preserves GeoSeries class + def geom_func(geom): + +From df3fc9ec5a241a01d76640404dcd0dab9b6ef434 Mon Sep 17 00:00:00 2001 +From: Joris Van den Bossche +Date: Mon, 17 Jan 2022 17:11:59 +0100 +Subject: [PATCH 2/3] skip for pandas 1.3.5 + +--- + geopandas/_compat.py | 1 + + geopandas/tests/test_pandas_methods.py | 4 ++++ + 2 files changed, 5 insertions(+) + +diff --git a/geopandas/_compat.py b/geopandas/_compat.py +index 000db2a60..f233eee84 100644 +--- a/geopandas/_compat.py ++++ b/geopandas/_compat.py +@@ -19,6 +19,7 @@ + PANDAS_GE_11 = str(pd.__version__) >= LooseVersion("1.1.0") + PANDAS_GE_115 = str(pd.__version__) >= LooseVersion("1.1.5") + PANDAS_GE_12 = str(pd.__version__) >= LooseVersion("1.2.0") ++PANDAS_GE_13 = str(pd.__version__) >= LooseVersion("1.3.0") + PANDAS_GE_14 = str(pd.__version__) >= LooseVersion("1.4.0") + + +diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py +index 41db42809..6c55e7ef6 100644 +--- a/geopandas/tests/test_pandas_methods.py ++++ b/geopandas/tests/test_pandas_methods.py +@@ -558,6 +558,10 @@ def test_groupby_groups(df): + assert_frame_equal(res, exp) + + ++@pytest.mark.skipif( ++ compat.PANDAS_GE_13 and not compat.PANDAS_GE_14, ++ reason="this was broken in pandas 1.3.5", ++) + @pytest.mark.parametrize("crs", [None, "EPSG:4326"]) + def test_groupby_metadata(crs): + # https://github.com/geopandas/geopandas/issues/2294 + +From d9a52c7945c254b313232739c7aaeed778a4f436 Mon Sep 17 00:00:00 2001 +From: Joris Van den Bossche +Date: Tue, 18 Jan 2022 00:47:59 +0100 +Subject: [PATCH 3/3] add issue number in skip comment + +--- + geopandas/tests/test_pandas_methods.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py +index 6c55e7ef6..c6d04209b 100644 +--- a/geopandas/tests/test_pandas_methods.py ++++ b/geopandas/tests/test_pandas_methods.py +@@ -560,7 +560,7 @@ def test_groupby_groups(df): + + @pytest.mark.skipif( + compat.PANDAS_GE_13 and not compat.PANDAS_GE_14, +- reason="this was broken in pandas 1.3.5", ++ reason="this was broken in pandas 1.3.5 (GH-2294)", + ) + @pytest.mark.parametrize("crs", [None, "EPSG:4326"]) + def test_groupby_metadata(crs): diff --git a/2320.patch b/2320.patch new file mode 100644 index 0000000..cac555e --- /dev/null +++ b/2320.patch @@ -0,0 +1,21 @@ +From 197617180d78e72f6c8699dbde0ed7cff1c3c34e Mon Sep 17 00:00:00 2001 +From: Joris Van den Bossche +Date: Sun, 23 Jan 2022 10:35:25 +0100 +Subject: [PATCH] TST: skip pandas groupby test if no sindex available + +--- + geopandas/tests/test_pandas_methods.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py +index 72dbcffc0..42c79de7e 100644 +--- a/geopandas/tests/test_pandas_methods.py ++++ b/geopandas/tests/test_pandas_methods.py +@@ -558,6 +558,7 @@ def test_groupby_groups(df): + assert_frame_equal(res, exp) + + ++@pytest.mark.skip_no_sindex + @pytest.mark.skipif( + compat.PANDAS_GE_13 and not compat.PANDAS_GE_14, + reason="this was broken in pandas 1.3.5 (GH-2294)", diff --git a/python-geopandas.spec b/python-geopandas.spec index 4bc2606..c32e4ac 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -19,6 +19,31 @@ Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{s BuildArch: noarch +# TST/COMPAT: update GeometryArray getitem error type + fix tests +# https://github.com/geopandas/geopandas/pull/2219 +# +# Fixes: +# TST: tests with invalid values fail with pandas master +# https://github.com/geopandas/geopandas/issues/2207 +Patch: https://github.com/%{srcname}/%{srcname}/pull/2219.patch +# TST: fix test_value_counts test for pandas 1.4 +# https://github.com/geopandas/geopandas/pull/2289 +# +# Fixes: +# TST: test_value_counts breaking against pandas latest +# https://github.com/geopandas/geopandas/issues/2287 +Patch: https://github.com/%{srcname}/%{srcname}/pull/2289.patch +# TST: test groupby apply with function that requires GeoDataFrame attributes +# https://github.com/geopandas/geopandas/pull/2298 +# +# Fixes: +# BUG: Missing _crs attribute when using sjoin on grouped gdf and latest version of pandas +# https://github.com/geopandas/geopandas/issues/2294 +Patch: https://github.com/%{srcname}/%{srcname}/pull/2298.patch +# TST: skip pandas groupby test if no sindex available +# https://github.com/geopandas/geopandas/pull/2320 +Patch: https://github.com/%{srcname}/%{srcname}/pull/2320.patch + %description %{_description} From 4c748c4cf875dc830fb6a6f3950c05812335f2b0 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 22 May 2022 10:41:54 -0400 Subject: [PATCH 27/67] Add a BR on python3dist(pandas[test]) This is necessary since the geopandas tests inherit from the Pandas ones, and pandas.tests is now packaged in python3-pandas+test. --- python-geopandas.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python-geopandas.spec b/python-geopandas.spec index c32e4ac..17748a3 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -60,6 +60,10 @@ BuildRequires: python3dist(rtree) >= 0.8 BuildRequires: python3dist(sqlalchemy) BuildRequires: python3dist(matplotlib) >= 2.0.1 BuildRequires: python3dist(mapclassify) +# See: +# Depend on pandas[test] for testing +# https://github.com/geopandas/geopandas/pull/2438 +BuildRequires: python3dist(pandas[test]) %description -n python3-%{srcname} %{_description} From a46e3971a9eb62d03080036239f9a95a55e4a756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 15 Jun 2022 10:54:39 +0200 Subject: [PATCH 28/67] Introduce a tests bcond MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current loops are: • python-geopandas → python-mapclassify → python-libpysal → python-networkx → python-geopandas • python-geopandas → python-mapclassify → python-networkx → python-libpysal → python-geopandas • python-geopandas → python-mapclassify → python-networkx → python-geopandas • python-geopandas → python-networkx → python-libpysal → python-geopandas • python-geopandas → python-networkx → python-geopandas • python-geopandas → python-mapclassify → python-libpysal → python-geopandas • python-geopandas → python-mapclassify → python-geopandas --- python-geopandas.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index 17748a3..dff8e45 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,5 +1,10 @@ %global srcname geopandas +# There is a build dependency loop when built with tests. +# It involves libpysal, mapclassify, networkx. +# This bcons allows to bootstrap it. +%bcond_without tests + Name: python-%{srcname} Version: 0.10.2 Release: %autorelease @@ -49,10 +54,10 @@ Patch: https://github.com/%{srcname}/%{srcname}/pull/2320.patch %package -n python3-%{srcname} Summary: %{summary} - BuildRequires: python3-devel -BuildRequires: python3dist(numpy) >= 1.15 +%if %{with tests} +BuildRequires: python3dist(numpy) >= 1.15 BuildRequires: python3dist(pytest) BuildRequires: python3dist(fsspec) BuildRequires: python3dist(psycopg2) @@ -64,6 +69,7 @@ BuildRequires: python3dist(mapclassify) # Depend on pandas[test] for testing # https://github.com/geopandas/geopandas/pull/2438 BuildRequires: python3dist(pandas[test]) +%endif %description -n python3-%{srcname} %{_description} @@ -81,7 +87,12 @@ BuildRequires: python3dist(pandas[test]) %pyproject_save_files %{srcname} %check +%if %{with tests} %{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 +%endif %files -n python3-%{srcname} -f %{pyproject_files} %license LICENSE.txt From b431b0577da75c74a2e67e231e46a4ac0c1ec4a7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 21 Jun 2022 18:35:11 +0200 Subject: [PATCH 29/67] Bootstrap for Python 3.11 --- python-geopandas.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-geopandas.spec b/python-geopandas.spec index dff8e45..739f716 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 %global srcname geopandas # There is a build dependency loop when built with tests. From 96ce582c50f26897285e8a7c5655bdd6e8ae4a7e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 4 Jul 2022 10:44:10 +0200 Subject: [PATCH 30/67] Rebuilt for Python 3.11 --- python-geopandas.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index 739f716..dff8e45 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 %global srcname geopandas # There is a build dependency loop when built with tests. From 3a3805a604c66c59ce446ae1c59cb49c706c2902 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 18:43:20 +0000 Subject: [PATCH 31/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f78643fbd79ad078caf0762e13271a2093d995ad Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 31 Jul 2022 14:58:20 -0400 Subject: [PATCH 32/67] Update to latest version (#2099491) --- .gitignore | 1 + 2219.patch | 79 ----------------- 2289.patch | 199 ------------------------------------------ 2298.patch | 116 ------------------------ 2320.patch | 21 ----- python-geopandas.spec | 40 ++------- sources | 2 +- 7 files changed, 10 insertions(+), 448 deletions(-) delete mode 100644 2219.patch delete mode 100644 2289.patch delete mode 100644 2298.patch delete mode 100644 2320.patch diff --git a/.gitignore b/.gitignore index d90cfa3..25c9eb6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /geopandas-0.10.0.tar.gz /geopandas-0.10.1.tar.gz /geopandas-0.10.2.tar.gz +/geopandas-0.11.1.tar.gz diff --git a/2219.patch b/2219.patch deleted file mode 100644 index 066daad..0000000 --- a/2219.patch +++ /dev/null @@ -1,79 +0,0 @@ -From ac67515c9df745b672cca1669adf05eaf5cb0f3b Mon Sep 17 00:00:00 2001 -From: Joris Van den Bossche -Date: Sat, 6 Nov 2021 11:20:08 +0100 -Subject: [PATCH 1/2] TST/COMPAT: update GeometryArray getitem error type + fix - tests - ---- - geopandas/array.py | 6 ++++-- - geopandas/tests/test_extension_array.py | 12 ++++++++++++ - 2 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/geopandas/array.py b/geopandas/array.py -index 0532c08b8..3319847ea 100644 ---- a/geopandas/array.py -+++ b/geopandas/array.py -@@ -363,10 +363,12 @@ def __getitem__(self, idx): - # for pandas >= 1.0, validate and convert IntegerArray/BooleanArray - # to numpy array, pass-through non-array-like indexers - idx = pd.api.indexers.check_array_indexer(self, idx) -- if isinstance(idx, (Iterable, slice)): - return GeometryArray(self.data[idx], crs=self.crs) - else: -- raise TypeError("Index type not supported", idx) -+ if isinstance(idx, (Iterable, slice)): -+ return GeometryArray(self.data[idx], crs=self.crs) -+ else: -+ raise TypeError("Index type not supported", idx) - - def __setitem__(self, key, value): - if compat.PANDAS_GE_10: -diff --git a/geopandas/tests/test_extension_array.py b/geopandas/tests/test_extension_array.py -index 6e1205b26..9582404b4 100644 ---- a/geopandas/tests/test_extension_array.py -+++ b/geopandas/tests/test_extension_array.py -@@ -231,6 +231,18 @@ def as_array(request): - return request.param - - -+@pytest.fixture -+def invalid_scalar(data): -+ """ -+ A scalar that *cannot* be held by this ExtensionArray. -+ -+ The default should work for most subclasses, but is not guaranteed. -+ -+ If the array can hold any item (i.e. object dtype), then use pytest.skip. -+ """ -+ return object.__new__(object) -+ -+ - # Fixtures defined in pandas/conftest.py that are also needed: defining them - # here instead of importing for compatibility - - -From 7d0de45cd794161c52ee998d3e1e4ac2f683e87b Mon Sep 17 00:00:00 2001 -From: Joris Van den Bossche -Date: Sat, 6 Nov 2021 16:40:22 +0100 -Subject: [PATCH 2/2] fix doctest for GEOS 3.10 - ---- - geopandas/array.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/geopandas/array.py b/geopandas/array.py -index 3319847ea..fd7b7fc6f 100644 ---- a/geopandas/array.py -+++ b/geopandas/array.py -@@ -742,8 +742,9 @@ def to_crs(self, crs=None, epsg=None): - - >>> a = a.to_crs(3857) - >>> to_wkt(a) -- array(['POINT (111319 111325)', 'POINT (222639 222684)', -- 'POINT (333958 334111)'], dtype=object) -+ array(['POINT (111319.490793 111325.142866)', -+ 'POINT (222638.981587 222684.208506)', -+ 'POINT (333958.47238 334111.171402)'], dtype=object) - >>> a.crs # doctest: +SKIP - - Name: WGS 84 / Pseudo-Mercator diff --git a/2289.patch b/2289.patch deleted file mode 100644 index 54807ac..0000000 --- a/2289.patch +++ /dev/null @@ -1,199 +0,0 @@ -From f5998c419aef31d237a2bd316199cc6351221c4c Mon Sep 17 00:00:00 2001 -From: Matt Richards -Date: Wed, 5 Jan 2022 12:21:21 +1000 -Subject: [PATCH 1/5] TST: fix test_value_counts pandas master - ---- - geopandas/_compat.py | 1 + - geopandas/tests/test_pandas_methods.py | 19 +++++++++++++++---- - 2 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/geopandas/_compat.py b/geopandas/_compat.py -index e5ac045df..9fe9e124a 100644 ---- a/geopandas/_compat.py -+++ b/geopandas/_compat.py -@@ -19,6 +19,7 @@ - PANDAS_GE_11 = str(pd.__version__) >= LooseVersion("1.1.0") - PANDAS_GE_115 = str(pd.__version__) >= LooseVersion("1.1.5") - PANDAS_GE_12 = str(pd.__version__) >= LooseVersion("1.2.0") -+PANDAS_GE_20 = str(pd.__version__) > LooseVersion("1.4.0.dev") - - - # ----------------------------------------------------------------------------- -diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py -index 709ad3da0..f9ce67e86 100644 ---- a/geopandas/tests/test_pandas_methods.py -+++ b/geopandas/tests/test_pandas_methods.py -@@ -445,33 +445,44 @@ def test_unique(): - assert_array_equal(s.unique(), exp) - - -+def pd20_compat_index(index): -+ if compat.PANDAS_GE_20: -+ return from_shapely(index) -+ else: -+ return index -+ -+ - def test_value_counts(): - # each object is considered unique - s = GeoSeries([Point(0, 0), Point(1, 1), Point(0, 0)]) - res = s.value_counts() - with compat.ignore_shapely2_warnings(): -- exp = pd.Series([2, 1], index=[Point(0, 0), Point(1, 1)]) -+ exp = pd.Series([2, 1], index=pd20_compat_index([Point(0, 0), Point(1, 1)])) - assert_series_equal(res, exp) - # Check crs doesn't make a difference - note it is not kept in output index anyway - s2 = GeoSeries([Point(0, 0), Point(1, 1), Point(0, 0)], crs="EPSG:4326") - res2 = s2.value_counts() - assert_series_equal(res2, exp) -+ if compat.PANDAS_GE_20: -+ # TODO should/ can we fix CRS being lost -+ assert s2.value_counts().index.array.crs is None - - # check mixed geometry - s3 = GeoSeries([Point(0, 0), LineString([[1, 1], [2, 2]]), Point(0, 0)]) - res3 = s3.value_counts() -+ index = pd20_compat_index([Point(0, 0), LineString([[1, 1], [2, 2]])]) - with compat.ignore_shapely2_warnings(): -- exp3 = pd.Series([2, 1], index=[Point(0, 0), LineString([[1, 1], [2, 2]])]) -+ exp3 = pd.Series([2, 1], index=index) - assert_series_equal(res3, exp3) - - # check None is handled - s4 = GeoSeries([Point(0, 0), None, Point(0, 0)]) - res4 = s4.value_counts(dropna=True) - with compat.ignore_shapely2_warnings(): -- exp4_dropna = pd.Series([2], index=[Point(0, 0)]) -+ exp4_dropna = pd.Series([2], index=pd20_compat_index([Point(0, 0)])) - assert_series_equal(res4, exp4_dropna) - with compat.ignore_shapely2_warnings(): -- exp4_keepna = pd.Series([2, 1], index=[Point(0, 0), None]) -+ exp4_keepna = pd.Series([2, 1], index=pd20_compat_index([Point(0, 0), None])) - res4_keepna = s4.value_counts(dropna=False) - assert_series_equal(res4_keepna, exp4_keepna) - - -From ecff4fd976fa619ae9f9792904ec1ecc291f092d Mon Sep 17 00:00:00 2001 -From: Matt Richards <45483497+m-richards@users.noreply.github.com> -Date: Sun, 9 Jan 2022 21:43:42 +1000 -Subject: [PATCH 2/5] Update geopandas/_compat.py - -Co-authored-by: Joris Van den Bossche ---- - geopandas/_compat.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/geopandas/_compat.py b/geopandas/_compat.py -index 9fe9e124a..000db2a60 100644 ---- a/geopandas/_compat.py -+++ b/geopandas/_compat.py -@@ -19,7 +19,7 @@ - PANDAS_GE_11 = str(pd.__version__) >= LooseVersion("1.1.0") - PANDAS_GE_115 = str(pd.__version__) >= LooseVersion("1.1.5") - PANDAS_GE_12 = str(pd.__version__) >= LooseVersion("1.2.0") --PANDAS_GE_20 = str(pd.__version__) > LooseVersion("1.4.0.dev") -+PANDAS_GE_14 = str(pd.__version__) >= LooseVersion("1.4.0") - - - # ----------------------------------------------------------------------------- - -From 9f22ee43d6960d7c8b6cfdc1907e8e424dc99ba7 Mon Sep 17 00:00:00 2001 -From: Matt Richards <45483497+m-richards@users.noreply.github.com> -Date: Sun, 9 Jan 2022 21:44:25 +1000 -Subject: [PATCH 3/5] Update geopandas/tests/test_pandas_methods.py - ---- - geopandas/tests/test_pandas_methods.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py -index f9ce67e86..82a03869e 100644 ---- a/geopandas/tests/test_pandas_methods.py -+++ b/geopandas/tests/test_pandas_methods.py -@@ -446,7 +446,7 @@ def test_unique(): - - - def pd20_compat_index(index): -- if compat.PANDAS_GE_20: -+ if compat.PANDAS_GE_14: - return from_shapely(index) - else: - return index - -From 2281d167eba59df24a80607d28d6e54c9a20fedd Mon Sep 17 00:00:00 2001 -From: Matt Richards <45483497+m-richards@users.noreply.github.com> -Date: Sun, 9 Jan 2022 21:45:04 +1000 -Subject: [PATCH 4/5] Update test_pandas_methods.py - ---- - geopandas/tests/test_pandas_methods.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py -index 82a03869e..a78e9f0df 100644 ---- a/geopandas/tests/test_pandas_methods.py -+++ b/geopandas/tests/test_pandas_methods.py -@@ -463,7 +463,7 @@ def test_value_counts(): - s2 = GeoSeries([Point(0, 0), Point(1, 1), Point(0, 0)], crs="EPSG:4326") - res2 = s2.value_counts() - assert_series_equal(res2, exp) -- if compat.PANDAS_GE_20: -+ if compat.PANDAS_GE_14: - # TODO should/ can we fix CRS being lost - assert s2.value_counts().index.array.crs is None - - -From 40eb9185c7e18bebf5b6e3cb8da6de7d5520e81f Mon Sep 17 00:00:00 2001 -From: Matt Richards -Date: Sun, 9 Jan 2022 21:46:59 +1000 -Subject: [PATCH 5/5] CLN: finish renames - ---- - geopandas/tests/test_pandas_methods.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py -index a78e9f0df..ed080af46 100644 ---- a/geopandas/tests/test_pandas_methods.py -+++ b/geopandas/tests/test_pandas_methods.py -@@ -445,7 +445,7 @@ def test_unique(): - assert_array_equal(s.unique(), exp) - - --def pd20_compat_index(index): -+def pd14_compat_index(index): - if compat.PANDAS_GE_14: - return from_shapely(index) - else: -@@ -457,7 +457,7 @@ def test_value_counts(): - s = GeoSeries([Point(0, 0), Point(1, 1), Point(0, 0)]) - res = s.value_counts() - with compat.ignore_shapely2_warnings(): -- exp = pd.Series([2, 1], index=pd20_compat_index([Point(0, 0), Point(1, 1)])) -+ exp = pd.Series([2, 1], index=pd14_compat_index([Point(0, 0), Point(1, 1)])) - assert_series_equal(res, exp) - # Check crs doesn't make a difference - note it is not kept in output index anyway - s2 = GeoSeries([Point(0, 0), Point(1, 1), Point(0, 0)], crs="EPSG:4326") -@@ -470,7 +470,7 @@ def test_value_counts(): - # check mixed geometry - s3 = GeoSeries([Point(0, 0), LineString([[1, 1], [2, 2]]), Point(0, 0)]) - res3 = s3.value_counts() -- index = pd20_compat_index([Point(0, 0), LineString([[1, 1], [2, 2]])]) -+ index = pd14_compat_index([Point(0, 0), LineString([[1, 1], [2, 2]])]) - with compat.ignore_shapely2_warnings(): - exp3 = pd.Series([2, 1], index=index) - assert_series_equal(res3, exp3) -@@ -479,10 +479,10 @@ def test_value_counts(): - s4 = GeoSeries([Point(0, 0), None, Point(0, 0)]) - res4 = s4.value_counts(dropna=True) - with compat.ignore_shapely2_warnings(): -- exp4_dropna = pd.Series([2], index=pd20_compat_index([Point(0, 0)])) -+ exp4_dropna = pd.Series([2], index=pd14_compat_index([Point(0, 0)])) - assert_series_equal(res4, exp4_dropna) - with compat.ignore_shapely2_warnings(): -- exp4_keepna = pd.Series([2, 1], index=pd20_compat_index([Point(0, 0), None])) -+ exp4_keepna = pd.Series([2, 1], index=pd14_compat_index([Point(0, 0), None])) - res4_keepna = s4.value_counts(dropna=False) - assert_series_equal(res4_keepna, exp4_keepna) - diff --git a/2298.patch b/2298.patch deleted file mode 100644 index 1b228f0..0000000 --- a/2298.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 4121b08257d60cb1c9f504257ca2d8064461ea61 Mon Sep 17 00:00:00 2001 -From: Joris Van den Bossche -Date: Fri, 14 Jan 2022 10:58:10 +0100 -Subject: [PATCH 1/3] TST: test groupby apply with function that requires - GeoDataFrame attributes - ---- - geopandas/tests/test_pandas_methods.py | 34 ++++++++++++++++++++++++++ - 1 file changed, 34 insertions(+) - -diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py -index ed080af46..41db42809 100644 ---- a/geopandas/tests/test_pandas_methods.py -+++ b/geopandas/tests/test_pandas_methods.py -@@ -558,6 +558,40 @@ def test_groupby_groups(df): - assert_frame_equal(res, exp) - - -+@pytest.mark.parametrize("crs", [None, "EPSG:4326"]) -+def test_groupby_metadata(crs): -+ # https://github.com/geopandas/geopandas/issues/2294 -+ df = GeoDataFrame( -+ { -+ "geometry": [Point(0, 0), Point(1, 1), Point(0, 0)], -+ "value1": np.arange(3, dtype="int64"), -+ "value2": np.array([1, 2, 1], dtype="int64"), -+ }, -+ crs=crs, -+ ) -+ -+ # dummy test asserting we can access the crs -+ def func(group): -+ assert isinstance(group, GeoDataFrame) -+ assert group.crs == crs -+ -+ df.groupby("value2").apply(func) -+ -+ # actual test with functionality -+ res = df.groupby("value2").apply( -+ lambda x: geopandas.sjoin(x, x[["geometry", "value1"]], how="inner") -+ ) -+ -+ expected = ( -+ df.take([0, 2, 0, 2, 1]) -+ .set_index("value2", drop=False, append=True) -+ .swaplevel() -+ .rename(columns={"value1": "value1_left"}) -+ .assign(value1_right=[0, 0, 2, 2, 1]) -+ ) -+ assert_geodataframe_equal(res.drop(columns=["index_right"]), expected) -+ -+ - def test_apply(s): - # function that returns geometry preserves GeoSeries class - def geom_func(geom): - -From df3fc9ec5a241a01d76640404dcd0dab9b6ef434 Mon Sep 17 00:00:00 2001 -From: Joris Van den Bossche -Date: Mon, 17 Jan 2022 17:11:59 +0100 -Subject: [PATCH 2/3] skip for pandas 1.3.5 - ---- - geopandas/_compat.py | 1 + - geopandas/tests/test_pandas_methods.py | 4 ++++ - 2 files changed, 5 insertions(+) - -diff --git a/geopandas/_compat.py b/geopandas/_compat.py -index 000db2a60..f233eee84 100644 ---- a/geopandas/_compat.py -+++ b/geopandas/_compat.py -@@ -19,6 +19,7 @@ - PANDAS_GE_11 = str(pd.__version__) >= LooseVersion("1.1.0") - PANDAS_GE_115 = str(pd.__version__) >= LooseVersion("1.1.5") - PANDAS_GE_12 = str(pd.__version__) >= LooseVersion("1.2.0") -+PANDAS_GE_13 = str(pd.__version__) >= LooseVersion("1.3.0") - PANDAS_GE_14 = str(pd.__version__) >= LooseVersion("1.4.0") - - -diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py -index 41db42809..6c55e7ef6 100644 ---- a/geopandas/tests/test_pandas_methods.py -+++ b/geopandas/tests/test_pandas_methods.py -@@ -558,6 +558,10 @@ def test_groupby_groups(df): - assert_frame_equal(res, exp) - - -+@pytest.mark.skipif( -+ compat.PANDAS_GE_13 and not compat.PANDAS_GE_14, -+ reason="this was broken in pandas 1.3.5", -+) - @pytest.mark.parametrize("crs", [None, "EPSG:4326"]) - def test_groupby_metadata(crs): - # https://github.com/geopandas/geopandas/issues/2294 - -From d9a52c7945c254b313232739c7aaeed778a4f436 Mon Sep 17 00:00:00 2001 -From: Joris Van den Bossche -Date: Tue, 18 Jan 2022 00:47:59 +0100 -Subject: [PATCH 3/3] add issue number in skip comment - ---- - geopandas/tests/test_pandas_methods.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py -index 6c55e7ef6..c6d04209b 100644 ---- a/geopandas/tests/test_pandas_methods.py -+++ b/geopandas/tests/test_pandas_methods.py -@@ -560,7 +560,7 @@ def test_groupby_groups(df): - - @pytest.mark.skipif( - compat.PANDAS_GE_13 and not compat.PANDAS_GE_14, -- reason="this was broken in pandas 1.3.5", -+ reason="this was broken in pandas 1.3.5 (GH-2294)", - ) - @pytest.mark.parametrize("crs", [None, "EPSG:4326"]) - def test_groupby_metadata(crs): diff --git a/2320.patch b/2320.patch deleted file mode 100644 index cac555e..0000000 --- a/2320.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 197617180d78e72f6c8699dbde0ed7cff1c3c34e Mon Sep 17 00:00:00 2001 -From: Joris Van den Bossche -Date: Sun, 23 Jan 2022 10:35:25 +0100 -Subject: [PATCH] TST: skip pandas groupby test if no sindex available - ---- - geopandas/tests/test_pandas_methods.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/geopandas/tests/test_pandas_methods.py b/geopandas/tests/test_pandas_methods.py -index 72dbcffc0..42c79de7e 100644 ---- a/geopandas/tests/test_pandas_methods.py -+++ b/geopandas/tests/test_pandas_methods.py -@@ -558,6 +558,7 @@ def test_groupby_groups(df): - assert_frame_equal(res, exp) - - -+@pytest.mark.skip_no_sindex - @pytest.mark.skipif( - compat.PANDAS_GE_13 and not compat.PANDAS_GE_14, - reason="this was broken in pandas 1.3.5 (GH-2294)", diff --git a/python-geopandas.spec b/python-geopandas.spec index dff8e45..4367c5f 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,9 +6,16 @@ %bcond_without tests Name: python-%{srcname} -Version: 0.10.2 +Version: 0.11.1 Release: %autorelease Summary: Geographic Pandas extensions + +License: BSD +URL: https://pypi.python.org/pypi/%{srcname} +Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz + +BuildArch: noarch + %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ \ @@ -18,37 +25,6 @@ operations in Pandas and a high-level interface to multiple geometries to \ Shapely. GeoPandas enables you to easily do operations in Python that would \ otherwise require a spatial database such as PostGIS. -License: BSD -URL: https://pypi.python.org/pypi/%{srcname} -Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz - -BuildArch: noarch - -# TST/COMPAT: update GeometryArray getitem error type + fix tests -# https://github.com/geopandas/geopandas/pull/2219 -# -# Fixes: -# TST: tests with invalid values fail with pandas master -# https://github.com/geopandas/geopandas/issues/2207 -Patch: https://github.com/%{srcname}/%{srcname}/pull/2219.patch -# TST: fix test_value_counts test for pandas 1.4 -# https://github.com/geopandas/geopandas/pull/2289 -# -# Fixes: -# TST: test_value_counts breaking against pandas latest -# https://github.com/geopandas/geopandas/issues/2287 -Patch: https://github.com/%{srcname}/%{srcname}/pull/2289.patch -# TST: test groupby apply with function that requires GeoDataFrame attributes -# https://github.com/geopandas/geopandas/pull/2298 -# -# Fixes: -# BUG: Missing _crs attribute when using sjoin on grouped gdf and latest version of pandas -# https://github.com/geopandas/geopandas/issues/2294 -Patch: https://github.com/%{srcname}/%{srcname}/pull/2298.patch -# TST: skip pandas groupby test if no sindex available -# https://github.com/geopandas/geopandas/pull/2320 -Patch: https://github.com/%{srcname}/%{srcname}/pull/2320.patch - %description %{_description} diff --git a/sources b/sources index a8c4518..fce0b0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.10.2.tar.gz) = 2fee9f5de51c4573f156c4e3ba19d4124b391c102b583ca17d9dcb7742ded8f6088266e5007127cb2c70b14ef143a1cdaae51bc8a4d1d34131b244bdf4b7ac56 +SHA512 (geopandas-0.11.1.tar.gz) = e4cc968c6b93f9870aeaeaab59833f65d74a7d63312c40432e2259f08cf822a463f8682e012088b83b47805f4fd7805e281571e3c41f629fdfa72a86ac198b56 From 395a4e3b7e862014da7963d9e5eae60a270f947c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 20 Nov 2022 17:56:27 -0500 Subject: [PATCH 33/67] Update to latest version (#2137275) --- .gitignore | 1 + python-geopandas.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 25c9eb6..c65e16b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /geopandas-0.10.1.tar.gz /geopandas-0.10.2.tar.gz /geopandas-0.11.1.tar.gz +/geopandas-0.12.1.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index 4367c5f..a817eb7 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -2,15 +2,15 @@ # There is a build dependency loop when built with tests. # It involves libpysal, mapclassify, networkx. -# This bcons allows to bootstrap it. +# This bcond allows to bootstrap it. %bcond_without tests Name: python-%{srcname} -Version: 0.11.1 +Version: 0.12.1 Release: %autorelease Summary: Geographic Pandas extensions -License: BSD +License: BSD-3-Clause URL: https://pypi.python.org/pypi/%{srcname} Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz diff --git a/sources b/sources index fce0b0a..d73fbb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.11.1.tar.gz) = e4cc968c6b93f9870aeaeaab59833f65d74a7d63312c40432e2259f08cf822a463f8682e012088b83b47805f4fd7805e281571e3c41f629fdfa72a86ac198b56 +SHA512 (geopandas-0.12.1.tar.gz) = 42f70d7d919e819e0ab5872d7389ede769868599221c1717ea18c0f4fe24ec3cc736ef7c7b26766c43abaa456e46a4f9283ab9f4364d13ae171aaf705ff3d168 From faa4ee9990df8279d0fed0937e5422cbb40982eb Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 10 Dec 2022 17:20:18 -0500 Subject: [PATCH 34/67] Update to latest version (#2152334) --- .gitignore | 1 + python-geopandas.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c65e16b..df91bc0 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /geopandas-0.10.2.tar.gz /geopandas-0.11.1.tar.gz /geopandas-0.12.1.tar.gz +/geopandas-0.12.2.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index a817eb7..896c739 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,7 +6,7 @@ %bcond_without tests Name: python-%{srcname} -Version: 0.12.1 +Version: 0.12.2 Release: %autorelease Summary: Geographic Pandas extensions diff --git a/sources b/sources index d73fbb7..63f8cc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.12.1.tar.gz) = 42f70d7d919e819e0ab5872d7389ede769868599221c1717ea18c0f4fe24ec3cc736ef7c7b26766c43abaa456e46a4f9283ab9f4364d13ae171aaf705ff3d168 +SHA512 (geopandas-0.12.2.tar.gz) = 6470bf45360bb6486607870ee643f295a8823ce3109b777ec9d1eb576bc11c717d3dc40777481748ffe8d17a6d9869245efff5298bea274ec108ca9d0b1502ba From 8d4b2aa8cf9b5853340e6fe5b0e5488123d67eca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 13:26:05 +0000 Subject: [PATCH 35/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 6bfd0f69f3db31faa7efadbeca689d352d3c7397 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 7 May 2023 05:05:42 -0400 Subject: [PATCH 36/67] Update to latest version (#2195910) --- .gitignore | 1 + python-geopandas.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index df91bc0..7c74fc3 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /geopandas-0.11.1.tar.gz /geopandas-0.12.1.tar.gz /geopandas-0.12.2.tar.gz +/geopandas-0.13.0.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index 896c739..a5fad63 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,7 +6,7 @@ %bcond_without tests Name: python-%{srcname} -Version: 0.12.2 +Version: 0.13.0 Release: %autorelease Summary: Geographic Pandas extensions @@ -39,7 +39,7 @@ BuildRequires: python3dist(fsspec) BuildRequires: python3dist(psycopg2) BuildRequires: python3dist(rtree) >= 0.8 BuildRequires: python3dist(sqlalchemy) -BuildRequires: python3dist(matplotlib) >= 2.0.1 +BuildRequires: python3dist(matplotlib) >= 3.3.4 BuildRequires: python3dist(mapclassify) # See: # Depend on pandas[test] for testing @@ -53,7 +53,7 @@ BuildRequires: python3dist(pandas[test]) %autosetup -n %{srcname}-%{version} -p1 %generate_buildrequires -%pyproject_buildrequires -r +%pyproject_buildrequires %build %pyproject_wheel diff --git a/sources b/sources index 63f8cc2..b9cdb50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.12.2.tar.gz) = 6470bf45360bb6486607870ee643f295a8823ce3109b777ec9d1eb576bc11c717d3dc40777481748ffe8d17a6d9869245efff5298bea274ec108ca9d0b1502ba +SHA512 (geopandas-0.13.0.tar.gz) = 88e09e394548711d2182c67611b1a23c5c3a476f3fbfbfd4242da85ecebad055914cca24900f0ed6e7b9d66a67e85e7d737fa9d8fe805750cdb00b16ab4dbc38 From 91b6f37f3f20e25c98b7a91b327f0fcc5644fe12 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 11 Jun 2023 03:47:49 -0400 Subject: [PATCH 37/67] Update to latest version (#2212271) --- .gitignore | 1 + python-geopandas.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7c74fc3..53d3e90 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /geopandas-0.12.1.tar.gz /geopandas-0.12.2.tar.gz /geopandas-0.13.0.tar.gz +/geopandas-0.13.2.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index a5fad63..57a29e1 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,7 +6,7 @@ %bcond_without tests Name: python-%{srcname} -Version: 0.13.0 +Version: 0.13.2 Release: %autorelease Summary: Geographic Pandas extensions diff --git a/sources b/sources index b9cdb50..cf00d51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.13.0.tar.gz) = 88e09e394548711d2182c67611b1a23c5c3a476f3fbfbfd4242da85ecebad055914cca24900f0ed6e7b9d66a67e85e7d737fa9d8fe805750cdb00b16ab4dbc38 +SHA512 (geopandas-0.13.2.tar.gz) = 4dff4bfeca2490081c02c41edf92037fa8a8f4b030b6f6a0cdc231b3119f829604af39277125db9535c66aac0698d2d4dcfac2bb58b92d31bea83f0ee296e21a From 9163648b50cf9e51d3489e196bb15d07e0265788 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 19 Jul 2023 20:55:04 -0400 Subject: [PATCH 38/67] Bootstrap for Python 3.12b4 --- python-geopandas.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index 57a29e1..04708ad 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -3,7 +3,7 @@ # There is a build dependency loop when built with tests. # It involves libpysal, mapclassify, networkx. # This bcond allows to bootstrap it. -%bcond_without tests +%bcond bootstrap 1 Name: python-%{srcname} Version: 0.13.2 @@ -32,7 +32,7 @@ otherwise require a spatial database such as PostGIS. Summary: %{summary} BuildRequires: python3-devel -%if %{with tests} +%if %{without bootstrap} BuildRequires: python3dist(numpy) >= 1.15 BuildRequires: python3dist(pytest) BuildRequires: python3dist(fsspec) @@ -63,7 +63,7 @@ BuildRequires: python3dist(pandas[test]) %pyproject_save_files %{srcname} %check -%if %{with tests} +%if %{without bootstrap} %{pytest} -ra geopandas -m 'not web' %else # naturalearth_creation assumes zipfile from naturalearthdata was downloaded to current directory From 53d4167f98a828d95067cbc0765df4c553208c9d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 16 Sep 2023 19:18:11 -0400 Subject: [PATCH 39/67] Update to latest version (#2239113) --- .gitignore | 1 + python-geopandas.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 53d3e90..09f9e62 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /geopandas-0.12.2.tar.gz /geopandas-0.13.0.tar.gz /geopandas-0.13.2.tar.gz +/geopandas-0.14.0.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index 04708ad..313f387 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,7 +6,7 @@ %bcond bootstrap 1 Name: python-%{srcname} -Version: 0.13.2 +Version: 0.14.0 Release: %autorelease Summary: Geographic Pandas extensions diff --git a/sources b/sources index cf00d51..c9c8f0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.13.2.tar.gz) = 4dff4bfeca2490081c02c41edf92037fa8a8f4b030b6f6a0cdc231b3119f829604af39277125db9535c66aac0698d2d4dcfac2bb58b92d31bea83f0ee296e21a +SHA512 (geopandas-0.14.0.tar.gz) = add1b6add7a3d0d32719aec000a7e54e99a166f7f2bdf088884d01664adc6f6e91811fb5c9e5f2bd4c24c6eee38a3e2660c8b416c163e9229a05afd0f7250989 From 553b0f64c788361d173ab596b29ef8dde8be7bec Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 16 Sep 2023 19:35:31 -0400 Subject: [PATCH 40/67] Disable bootstrap [skip changelog] --- python-geopandas.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index 313f387..46d034b 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -3,7 +3,7 @@ # There is a build dependency loop when built with tests. # It involves libpysal, mapclassify, networkx. # This bcond allows to bootstrap it. -%bcond bootstrap 1 +%bcond bootstrap 0 Name: python-%{srcname} Version: 0.14.0 From 0a8a83a0e9294f97bfa4d1090e312d2125bfd58d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 20 Nov 2023 01:39:42 -0500 Subject: [PATCH 41/67] Update to latest version (#2249215) --- .gitignore | 1 + python-geopandas.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 09f9e62..f225c1b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /geopandas-0.13.0.tar.gz /geopandas-0.13.2.tar.gz /geopandas-0.14.0.tar.gz +/geopandas-0.14.1.tar.gz diff --git a/python-geopandas.spec b/python-geopandas.spec index 46d034b..0ae1806 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -6,7 +6,7 @@ %bcond bootstrap 0 Name: python-%{srcname} -Version: 0.14.0 +Version: 0.14.1 Release: %autorelease Summary: Geographic Pandas extensions diff --git a/sources b/sources index c9c8f0b..69ae17f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-0.14.0.tar.gz) = add1b6add7a3d0d32719aec000a7e54e99a166f7f2bdf088884d01664adc6f6e91811fb5c9e5f2bd4c24c6eee38a3e2660c8b416c163e9229a05afd0f7250989 +SHA512 (geopandas-0.14.1.tar.gz) = ef9bfc215ffe1533c1497b8ea0cb740f497f686b2e50067197b2b44fde2554fcadfefa9c1bbc117c4de2f925d1477a17211afafb65bfbaab01088fed333a93b4 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 42/67] 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 43/67] 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 44/67] 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 45/67] 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 46/67] 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 47/67] 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 48/67] 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 49/67] 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 50/67] 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 51/67] 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 52/67] 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 53/67] 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 54/67] 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 55/67] 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 56/67] 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 57/67] 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 58/67] 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 59/67] 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 60/67] 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 61/67] 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 62/67] 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 63/67] 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 64/67] 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 65/67] 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 66/67] 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 67/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild