diff --git a/.gitignore b/.gitignore index be23447..6526b10 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /Cartopy-0.23.0.tar.gz /cartopy-0.24.0.tar.gz /cartopy-0.24.1.tar.gz +/cartopy-0.25.0.tar.gz diff --git a/0001-Reduce-numpy-build-dependency.patch b/0001-Reduce-numpy-build-dependency.patch index 6db4edb..83a0ea5 100644 --- a/0001-Reduce-numpy-build-dependency.patch +++ b/0001-Reduce-numpy-build-dependency.patch @@ -1,7 +1,7 @@ -From 5d32389d966087efbd8a511a987df92a78dc8fe3 Mon Sep 17 00:00:00 2001 +From e3a61e272d5ab58a2b8f13c6ad05d1136d3a5ecc Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 25 Apr 2024 16:35:29 -0400 -Subject: [PATCH 1/2] Reduce numpy build dependency +Subject: [PATCH 1/3] Reduce numpy build dependency Signed-off-by: Elliott Sales de Andrade --- @@ -9,18 +9,18 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml -index 6e16bf74..322d3b7e 100644 +index f0172aac..4e012ede 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires = [ # Note that building against numpy 1.x works fine too - users and # redistributors can do this by installing the numpy version they like and # disabling build isolation. -- "numpy>=2.0.0rc1", -+ "numpy>=1.21", - "setuptools_scm >= 7.0.0", +- "numpy>=2.0.0", ++ "numpy>=1.23", + "setuptools_scm >= 8.0.0", ] build-backend = "setuptools.build_meta" -- -2.46.0 +2.50.0 diff --git a/0002-Increase-tolerance-for-new-FreeType.patch b/0002-Increase-tolerance-for-new-FreeType.patch index 3f1f119..cd108c8 100644 --- a/0002-Increase-tolerance-for-new-FreeType.patch +++ b/0002-Increase-tolerance-for-new-FreeType.patch @@ -1,7 +1,7 @@ -From 3ec843978d1932f42de8407f70cb361d8fd13806 Mon Sep 17 00:00:00 2001 +From d3d4e7a80ded257b3094d837e5133b199989b460 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 26 Feb 2018 02:42:50 -0500 -Subject: [PATCH 2/2] Increase tolerance for new FreeType +Subject: [PATCH 2/3] Increase tolerance for new FreeType Signed-off-by: Elliott Sales de Andrade --- @@ -25,7 +25,7 @@ index a7f64ac9..404d3d83 100644 from cartopy.tests.mpl.test_caching import sample_data fig = plt.figure() diff --git a/lib/cartopy/tests/mpl/test_gridliner.py b/lib/cartopy/tests/mpl/test_gridliner.py -index 18fcb411..b16652bd 100644 +index 66144070..3ff88139 100644 --- a/lib/cartopy/tests/mpl/test_gridliner.py +++ b/lib/cartopy/tests/mpl/test_gridliner.py @@ -130,15 +130,10 @@ def test_gridliner_specified_lines(): @@ -45,7 +45,7 @@ index 18fcb411..b16652bd 100644 def test_grid_labels(): fig = plt.figure(figsize=(10, 10)) -@@ -215,7 +210,7 @@ def test_grid_labels(): +@@ -211,7 +206,7 @@ def test_grid_labels(): @pytest.mark.skipif(geos_version == (3, 9, 0), reason="GEOS intersection bug") @pytest.mark.natural_earth @pytest.mark.mpl_image_compare(filename='gridliner_labels_tight.png', @@ -54,7 +54,7 @@ index 18fcb411..b16652bd 100644 def test_grid_labels_tight(): # Ensure tight layout accounts for gridlines fig = plt.figure(figsize=(7, 5)) -@@ -263,7 +258,7 @@ def test_grid_labels_tight(): +@@ -259,7 +254,7 @@ def test_grid_labels_tight(): @pytest.mark.mpl_image_compare( filename='gridliner_constrained_adjust_datalim.png', @@ -63,7 +63,7 @@ index 18fcb411..b16652bd 100644 def test_gridliner_constrained_adjust_datalim(): fig = plt.figure(figsize=(8, 4), layout="constrained") -@@ -297,7 +292,7 @@ def test_gridliner_constrained_adjust_datalim(): +@@ -293,7 +288,7 @@ def test_gridliner_constrained_adjust_datalim(): @pytest.mark.skipif(geos_version == (3, 9, 0), reason="GEOS intersection bug") @pytest.mark.natural_earth @pytest.mark.parametrize('proj', TEST_PROJS) @@ -72,7 +72,7 @@ index 18fcb411..b16652bd 100644 def test_grid_labels_inline(proj): fig = plt.figure() if isinstance(proj, tuple): -@@ -313,7 +308,7 @@ def test_grid_labels_inline(proj): +@@ -309,7 +304,7 @@ def test_grid_labels_inline(proj): @pytest.mark.skipif(geos_version == (3, 9, 0), reason="GEOS intersection bug") @pytest.mark.natural_earth @pytest.mark.parametrize('proj', TEST_PROJS) @@ -81,7 +81,7 @@ index 18fcb411..b16652bd 100644 def test_grid_labels_inline_usa(proj): top = 49.3457868 # north lat left = -124.7844079 # west long -@@ -338,7 +333,7 @@ def test_grid_labels_inline_usa(proj): +@@ -334,7 +329,7 @@ def test_grid_labels_inline_usa(proj): @pytest.mark.natural_earth @pytest.mark.skipif(geos_version == (3, 9, 0), reason="GEOS intersection bug") @pytest.mark.mpl_image_compare(filename='gridliner_labels_bbox_style.png', @@ -90,7 +90,7 @@ index 18fcb411..b16652bd 100644 def test_gridliner_labels_bbox_style(): top = 49.3457868 # north lat left = -124.7844079 # west long -@@ -525,7 +520,7 @@ def test_gridliner_save_tight_bbox(): +@@ -521,7 +516,7 @@ def test_gridliner_save_tight_bbox(): @pytest.mark.natural_earth @pytest.mark.mpl_image_compare(filename='gridliner_labels_title_adjust.png', @@ -100,10 +100,10 @@ index 18fcb411..b16652bd 100644 # Test that title do not overlap labels projs = [ccrs.Mercator(), ccrs.AlbersEqualArea(), ccrs.LambertConformal(), diff --git a/lib/cartopy/tests/mpl/test_mpl_integration.py b/lib/cartopy/tests/mpl/test_mpl_integration.py -index 6b528b98..3a19f629 100644 +index f1aeccdf..78866085 100644 --- a/lib/cartopy/tests/mpl/test_mpl_integration.py +++ b/lib/cartopy/tests/mpl/test_mpl_integration.py -@@ -1008,7 +1008,7 @@ def test_streamplot(): +@@ -1016,7 +1016,7 @@ def test_streamplot(): @pytest.mark.natural_earth @@ -166,5 +166,5 @@ index f75ad2d2..bc0ba0b7 100644 fig = plt.figure(figsize=(10, 10)) projections = (ccrs.PlateCarree(), -- -2.46.0 +2.50.0 diff --git a/0003-Allow-older-versions-of-setuptools.patch b/0003-Allow-older-versions-of-setuptools.patch new file mode 100644 index 0000000..0b3259b --- /dev/null +++ b/0003-Allow-older-versions-of-setuptools.patch @@ -0,0 +1,44 @@ +From 20da43627e09a1f9cf3545ff484ece36c6cdc477 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Sat, 2 Aug 2025 00:36:22 -0400 +Subject: [PATCH 3/3] Allow older versions of setuptools + +Revert "pep639: setuptools license and license-files fields" + +This reverts commit 5fc8006f300ca2203cdb3583c3081ecbb979dc3b. + +Signed-off-by: Elliott Sales de Andrade +--- + pyproject.toml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 4e012ede..6ba29dce 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,7 +1,7 @@ + [build-system] + requires = [ + "wheel", +- "setuptools >= 77.0.3", ++ "setuptools >= 40.6.0", + "Cython >= 0.29.24", + # numpy requirement for wheel builds for distribution on PyPI - building + # against 2.x yields wheels that are also compatible with numpy 1.x at +@@ -23,11 +23,11 @@ description = "A Python library for cartographic visualizations with Matplotlib" + readme = "README.md" + requires-python = ">=3.10" + keywords = ["cartography", "map", "transform", "projection", "pyproj", "shapely", "shapefile"] +-license = "BSD-3-Clause" +-license-files = ["LICENSE"] ++license = {file = "LICENSE"} + classifiers = [ + 'Development Status :: 4 - Beta', + 'Framework :: Matplotlib', ++ 'License :: OSI Approved :: BSD License', + 'Operating System :: MacOS :: MacOS X', + 'Operating System :: Microsoft :: Windows', + 'Operating System :: POSIX', +-- +2.50.0 + diff --git a/README.packit b/README.packit index 3f22dbc..3ad54d6 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 0.102.0.post1.dev4+g7e44ad87. +The file was generated using packit 1.11.0. diff --git a/python-cartopy.spec b/python-cartopy.spec index 4948ab1..0b08ec3 100644 --- a/python-cartopy.spec +++ b/python-cartopy.spec @@ -4,7 +4,7 @@ %bcond_with network Name: python-%{srcname} -Version: 0.24.1 +Version: 0.25.0 Release: %autorelease Summary: Cartographic Python library with Matplotlib visualisations @@ -18,6 +18,8 @@ Source1: siteconfig.py Patch: 0001-Reduce-numpy-build-dependency.patch # Might not go upstream in current form. Patch: 0002-Increase-tolerance-for-new-FreeType.patch +# Revert PEP639 change to allow older setuptools. +Patch: 0003-Allow-older-versions-of-setuptools.patch BuildRequires: gcc-c++ BuildRequires: proj-data-uk diff --git a/sources b/sources index 995ca70..5b897b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cartopy-0.24.1.tar.gz) = 68ac0415b395fac5e531d594f8b4f9520631f8f54da07ce437121dd64eb9d067f9698f8d5436366323387fb3b6b7ea643df30b2d7a4835158ff0bb692576b368 +SHA512 (cartopy-0.25.0.tar.gz) = 6e0576f87dbd154d7dec3c2bbec520d1602874e6b416ca6e461745ceb319dc0f38a53267ad0b1f73bcd0d81674151324c07b7a799fb0a3ad590d1a27c98b3ae7