From 138595d962e71e7acaab1fc7ad6d1670e0c30531 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 11 Aug 2023 01:02:10 -0400 Subject: [PATCH 01/18] Drop speedups on i686 --- python-cartopy.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/python-cartopy.spec b/python-cartopy.spec index d59a741..9d06b3c 100644 --- a/python-cartopy.spec +++ b/python-cartopy.spec @@ -42,7 +42,9 @@ Summary: %{summary} Requires: python-%{srcname}-common = %{version}-%{release} Recommends: python3dist(cartopy[ows]) = %{version}-%{release} Recommends: python3dist(cartopy[plotting]) = %{version}-%{release} +%ifnarch %{ix86} Recommends: python3dist(cartopy[speedups]) = %{version}-%{release} +%endif %description -n python3-%{srcname} %{_description} @@ -62,7 +64,11 @@ Suggests: natural-earth-map-data-10m Data files for %{srcname}. +%ifnarch %{ix86} %pyproject_extras_subpkg -n python3-cartopy ows plotting speedups +%else +%pyproject_extras_subpkg -n python3-cartopy ows plotting +%endif %prep @@ -77,7 +83,11 @@ rm lib/cartopy/trace.cpp %generate_buildrequires +%ifnarch %{ix86} %pyproject_buildrequires -r -x ows,plotting,speedups,test +%else +%pyproject_buildrequires -r -x ows,plotting,test +%endif %build From feb2384c0510a0e4cd8cd3742f48c11abb4b57f3 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 13 Sep 2023 23:46:37 -0400 Subject: [PATCH 02/18] Fix tests with Matplotlib 3.8.0 --- 0001-Increase-tolerance-for-new-FreeType.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/0001-Increase-tolerance-for-new-FreeType.patch b/0001-Increase-tolerance-for-new-FreeType.patch index 2dc6483..8ad03d8 100644 --- a/0001-Increase-tolerance-for-new-FreeType.patch +++ b/0001-Increase-tolerance-for-new-FreeType.patch @@ -1,4 +1,4 @@ -From 09d403da6d8134a35bba90b7554cfe502877de57 Mon Sep 17 00:00:00 2001 +From 09ea43429f1cce6dbd67f17f29cdba22414886c5 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 26 Feb 2018 02:42:50 -0500 Subject: [PATCH] Increase tolerance for new FreeType. @@ -12,7 +12,7 @@ Signed-off-by: Elliott Sales de Andrade 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/lib/cartopy/tests/mpl/test_examples.py b/lib/cartopy/tests/mpl/test_examples.py -index 76f76d29..5eaeef08 100644 +index 76f76d29..e92035ca 100644 --- a/lib/cartopy/tests/mpl/test_examples.py +++ b/lib/cartopy/tests/mpl/test_examples.py @@ -34,7 +34,7 @@ def test_global_map(): @@ -20,7 +20,7 @@ index 76f76d29..5eaeef08 100644 @pytest.mark.mpl_image_compare( filename='contour_label.png', - tolerance=3.9 if MPL_VERSION.release[:2] >= (3, 8) else 0.5) -+ tolerance=10.4) ++ tolerance=11.1 if MPL_VERSION.release[:2] >= (3, 8) else 10.4) def test_contour_label(): from cartopy.tests.mpl.test_caching import sample_data fig = plt.figure() From 87e78b5ae762f27111394837b33d98cab7634c48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 00:01:16 +0000 Subject: [PATCH 03/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3550949e23b39990d057242ab4a53be933030519 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 02:17:21 +0000 Subject: [PATCH 04/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 919282549aa76053147b1c1adc4385da0cf2bfb1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 19 Jun 2024 18:28:32 +0200 Subject: [PATCH 05/18] Rebuilt for Python 3.13 From ac90935ea5afd6f3f27d133946f443e5ef360657 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 25 Jun 2024 19:06:23 -0400 Subject: [PATCH 06/18] Update to latest version (#2274386) --- .gitignore | 1 + 0001-Reduce-numpy-build-dependency.patch | 26 +++++ ...-Increase-tolerance-for-new-FreeType.patch | 85 +++++++++------ ...quest-2369-from-rcomer-ne-test-fixes.patch | 100 ++++++++++++++++++ python-cartopy.spec | 13 +-- sources | 2 +- 6 files changed, 190 insertions(+), 37 deletions(-) create mode 100644 0001-Reduce-numpy-build-dependency.patch rename 0001-Increase-tolerance-for-new-FreeType.patch => 0002-Increase-tolerance-for-new-FreeType.patch (66%) create mode 100644 0003-Merge-pull-request-2369-from-rcomer-ne-test-fixes.patch diff --git a/.gitignore b/.gitignore index 15b95fe..144b794 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /Cartopy-0.21.0.tar.gz /Cartopy-0.21.1.tar.gz /Cartopy-0.22.0.tar.gz +/Cartopy-0.23.0.tar.gz diff --git a/0001-Reduce-numpy-build-dependency.patch b/0001-Reduce-numpy-build-dependency.patch new file mode 100644 index 0000000..a8edd29 --- /dev/null +++ b/0001-Reduce-numpy-build-dependency.patch @@ -0,0 +1,26 @@ +From 063ce2909f8468ad4bc33235f23ae31a2b41a382 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Thu, 25 Apr 2024 16:35:29 -0400 +Subject: [PATCH 1/3] Reduce numpy build dependency + +Signed-off-by: Elliott Sales de Andrade +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 862805ff..e9ddc41e 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", + ] + build-backend = "setuptools.build_meta" +-- +2.45.2 + diff --git a/0001-Increase-tolerance-for-new-FreeType.patch b/0002-Increase-tolerance-for-new-FreeType.patch similarity index 66% rename from 0001-Increase-tolerance-for-new-FreeType.patch rename to 0002-Increase-tolerance-for-new-FreeType.patch index 8ad03d8..eecc085 100644 --- a/0001-Increase-tolerance-for-new-FreeType.patch +++ b/0002-Increase-tolerance-for-new-FreeType.patch @@ -1,53 +1,69 @@ -From 09ea43429f1cce6dbd67f17f29cdba22414886c5 Mon Sep 17 00:00:00 2001 +From f7bb83e3ae29a7d0b0ba6b72c67dd97a755eb56b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 26 Feb 2018 02:42:50 -0500 -Subject: [PATCH] Increase tolerance for new FreeType. +Subject: [PATCH 2/3] Increase tolerance for new FreeType Signed-off-by: Elliott Sales de Andrade --- lib/cartopy/tests/mpl/test_examples.py | 2 +- - lib/cartopy/tests/mpl/test_gridliner.py | 11 +++++++---- + lib/cartopy/tests/mpl/test_gridliner.py | 19 +++++++------------ lib/cartopy/tests/mpl/test_mpl_integration.py | 2 +- lib/cartopy/tests/mpl/test_ticks.py | 14 +++++++++----- - 4 files changed, 18 insertions(+), 11 deletions(-) + 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/lib/cartopy/tests/mpl/test_examples.py b/lib/cartopy/tests/mpl/test_examples.py -index 76f76d29..e92035ca 100644 +index a7f64ac9..404d3d83 100644 --- a/lib/cartopy/tests/mpl/test_examples.py +++ b/lib/cartopy/tests/mpl/test_examples.py -@@ -34,7 +34,7 @@ def test_global_map(): +@@ -37,7 +37,7 @@ def test_global_map(): + @pytest.mark.natural_earth @pytest.mark.mpl_image_compare( - filename='contour_label.png', -- tolerance=3.9 if MPL_VERSION.release[:2] >= (3, 8) else 0.5) -+ tolerance=11.1 if MPL_VERSION.release[:2] >= (3, 8) else 10.4) +- filename='contour_label.png', tolerance=3.9 if _MPL_38 else 0.5) ++ filename='contour_label.png', tolerance=11.2 if _MPL_38 else 0.5) def test_contour_label(): 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 120295c4..f855e0a0 100644 +index 7d82178a..16510f8b 100644 --- a/lib/cartopy/tests/mpl/test_gridliner.py +++ b/lib/cartopy/tests/mpl/test_gridliner.py -@@ -126,6 +126,9 @@ def test_gridliner_specified_lines(): - # of text objects. A new testing strategy is needed for this kind of test. - grid_label_tol = 3.9 +@@ -131,15 +131,10 @@ def test_gridliner_specified_lines(): + assert gl.ylocator.tick_values(None, None).tolist() == parallels -+# Force higher tolerance due to new FreeType on Fedora. -+grid_label_tol = 15.2 -+ +-# The tolerance on these tests are particularly high because of the high number +-# of text objects. A new testing strategy is needed for this kind of test. +-grid_label_tol = 3.9 +- +- @pytest.mark.skipif(geos_version == (3, 9, 0), reason="GEOS intersection bug") @pytest.mark.natural_earth -@@ -207,7 +210,7 @@ def test_grid_labels(): + @pytest.mark.mpl_image_compare(filename='gridliner_labels.png', +- tolerance=grid_label_tol) ++ tolerance=15.2) + def test_grid_labels(): + fig = plt.figure(figsize=(10, 10)) + +@@ -216,7 +211,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', -- tolerance=2.92) +- tolerance=2.9) + tolerance=47.1) def test_grid_labels_tight(): # Ensure tight layout accounts for gridlines fig = plt.figure(figsize=(7, 5)) -@@ -251,7 +254,7 @@ def test_grid_labels_tight(): +@@ -264,7 +259,7 @@ def test_grid_labels_tight(): + + @pytest.mark.mpl_image_compare( + filename='gridliner_constrained_adjust_datalim.png', +- tolerance=grid_label_tol) ++ tolerance=46.5) + def test_gridliner_constrained_adjust_datalim(): + fig = plt.figure(figsize=(8, 4), layout="constrained") + +@@ -298,7 +293,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) @@ -56,7 +72,7 @@ index 120295c4..f855e0a0 100644 def test_grid_labels_inline(proj): fig = plt.figure() if isinstance(proj, tuple): -@@ -267,7 +270,7 @@ def test_grid_labels_inline(proj): +@@ -314,7 +309,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) @@ -65,7 +81,7 @@ index 120295c4..f855e0a0 100644 def test_grid_labels_inline_usa(proj): top = 49.3457868 # north lat left = -124.7844079 # west long -@@ -291,7 +294,7 @@ def test_grid_labels_inline_usa(proj): +@@ -338,7 +333,7 @@ def test_grid_labels_inline_usa(proj): @pytest.mark.skipif(geos_version == (3, 9, 0), reason="GEOS intersection bug") @pytest.mark.mpl_image_compare(filename='gridliner_labels_bbox_style.png', @@ -74,11 +90,20 @@ index 120295c4..f855e0a0 100644 def test_gridliner_labels_bbox_style(): top = 49.3457868 # north lat left = -124.7844079 # west long +@@ -523,7 +518,7 @@ def test_gridliner_save_tight_bbox(): + + + @pytest.mark.mpl_image_compare(filename='gridliner_labels_title_adjust.png', +- tolerance=grid_label_tol) ++ tolerance=61.3) + def test_gridliner_title_adjust(): + # 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 8a60b6d9..ab84bae9 100644 +index 2e65d63d..1a4f5764 100644 --- a/lib/cartopy/tests/mpl/test_mpl_integration.py +++ b/lib/cartopy/tests/mpl/test_mpl_integration.py -@@ -980,7 +980,7 @@ def test_streamplot(): +@@ -981,7 +981,7 @@ def test_streamplot(): @pytest.mark.natural_earth @@ -88,10 +113,10 @@ index 8a60b6d9..ab84bae9 100644 """ test a variety of annotate options on multiple projections diff --git a/lib/cartopy/tests/mpl/test_ticks.py b/lib/cartopy/tests/mpl/test_ticks.py -index bb54b631..e9ef89fc 100644 +index f75ad2d2..bc0ba0b7 100644 --- a/lib/cartopy/tests/mpl/test_ticks.py +++ b/lib/cartopy/tests/mpl/test_ticks.py -@@ -11,7 +11,8 @@ from cartopy.mpl.ticker import LatitudeFormatter, LongitudeFormatter +@@ -10,7 +10,8 @@ from cartopy.mpl.ticker import LatitudeFormatter, LongitudeFormatter @pytest.mark.natural_earth @@ -101,7 +126,7 @@ index bb54b631..e9ef89fc 100644 def test_set_xticks_no_transform(): ax = plt.axes(projection=ccrs.PlateCarree()) ax.coastlines('110m') -@@ -22,7 +23,8 @@ def test_set_xticks_no_transform(): +@@ -21,7 +22,8 @@ def test_set_xticks_no_transform(): @pytest.mark.natural_earth @@ -111,7 +136,7 @@ index bb54b631..e9ef89fc 100644 def test_set_xticks_cylindrical(): ax = plt.axes(projection=ccrs.Mercator(min_latitude=-85, max_latitude=85)) ax.coastlines('110m') -@@ -41,7 +43,8 @@ def test_set_xticks_non_cylindrical(): +@@ -40,7 +42,8 @@ def test_set_xticks_non_cylindrical(): @pytest.mark.natural_earth @@ -121,7 +146,7 @@ index bb54b631..e9ef89fc 100644 def test_set_yticks_no_transform(): ax = plt.axes(projection=ccrs.PlateCarree()) ax.coastlines('110m') -@@ -52,7 +55,8 @@ def test_set_yticks_no_transform(): +@@ -51,7 +54,8 @@ def test_set_yticks_no_transform(): @pytest.mark.natural_earth @@ -131,7 +156,7 @@ index bb54b631..e9ef89fc 100644 def test_set_yticks_cylindrical(): ax = plt.axes(projection=ccrs.Mercator(min_latitude=-85, max_latitude=85)) ax.coastlines('110m') -@@ -73,7 +77,7 @@ def test_set_yticks_non_cylindrical(): +@@ -72,7 +76,7 @@ def test_set_yticks_non_cylindrical(): @pytest.mark.natural_earth @@ -141,5 +166,5 @@ index bb54b631..e9ef89fc 100644 fig = plt.figure(figsize=(10, 10)) projections = (ccrs.PlateCarree(), -- -2.41.0 +2.45.2 diff --git a/0003-Merge-pull-request-2369-from-rcomer-ne-test-fixes.patch b/0003-Merge-pull-request-2369-from-rcomer-ne-test-fixes.patch new file mode 100644 index 0000000..08ca24c --- /dev/null +++ b/0003-Merge-pull-request-2369-from-rcomer-ne-test-fixes.patch @@ -0,0 +1,100 @@ +From 72c5667d218c266332470bddaba83d93dceb963c Mon Sep 17 00:00:00 2001 +From: Greg Lucas +Date: Fri, 12 Apr 2024 06:46:25 -0600 +Subject: [PATCH 3/3] Merge pull request #2369 from rcomer/ne-test-fixes + +MNT: add missing 'needs network' markers +Signed-off-by: Elliott Sales de Andrade +--- + lib/cartopy/tests/mpl/test_feature_artist.py | 5 +++++ + lib/cartopy/tests/mpl/test_features.py | 1 + + lib/cartopy/tests/mpl/test_gridliner.py | 3 +++ + 3 files changed, 9 insertions(+) + +diff --git a/lib/cartopy/tests/mpl/test_feature_artist.py b/lib/cartopy/tests/mpl/test_feature_artist.py +index 1d243092..b7484287 100644 +--- a/lib/cartopy/tests/mpl/test_feature_artist.py ++++ b/lib/cartopy/tests/mpl/test_feature_artist.py +@@ -61,6 +61,7 @@ def cached_paths(geom, target_projection): + return geom_cache.get(target_projection, None) + + ++@pytest.mark.natural_earth + @pytest.mark.mpl_image_compare(filename='feature_artist.png') + def test_feature_artist_draw(feature): + fig, ax = robinson_map() +@@ -69,6 +70,7 @@ def test_feature_artist_draw(feature): + return fig + + ++@pytest.mark.natural_earth + @pytest.mark.mpl_image_compare(filename='feature_artist.png') + def test_feature_artist_draw_facecolor_list(feature): + fig, ax = robinson_map() +@@ -77,6 +79,7 @@ def test_feature_artist_draw_facecolor_list(feature): + return fig + + ++@pytest.mark.natural_earth + @pytest.mark.mpl_image_compare(filename='feature_artist.png') + def test_feature_artist_draw_cmap(feature): + fig, ax = robinson_map() +@@ -87,6 +90,7 @@ def test_feature_artist_draw_cmap(feature): + return fig + + ++@pytest.mark.natural_earth + @pytest.mark.mpl_image_compare(filename='feature_artist.png') + def test_feature_artist_draw_styled_feature(feature): + geoms = list(feature.geometries()) +@@ -98,6 +102,7 @@ def test_feature_artist_draw_styled_feature(feature): + return fig + + ++@pytest.mark.natural_earth + @pytest.mark.mpl_image_compare(filename='feature_artist.png') + def test_feature_artist_draw_styler(feature): + geoms = list(feature.geometries()) +diff --git a/lib/cartopy/tests/mpl/test_features.py b/lib/cartopy/tests/mpl/test_features.py +index 1b1b7fea..8f34ac40 100644 +--- a/lib/cartopy/tests/mpl/test_features.py ++++ b/lib/cartopy/tests/mpl/test_features.py +@@ -46,6 +46,7 @@ def test_natural_earth_custom(): + return ax.figure + + ++@pytest.mark.network + @pytest.mark.skipif(not _HAS_PYKDTREE_OR_SCIPY, reason='pykdtree or scipy is required') + @pytest.mark.mpl_image_compare(filename='gshhs_coastlines.png', tolerance=0.95) + def test_gshhs(): +diff --git a/lib/cartopy/tests/mpl/test_gridliner.py b/lib/cartopy/tests/mpl/test_gridliner.py +index 16510f8b..04ca8d79 100644 +--- a/lib/cartopy/tests/mpl/test_gridliner.py ++++ b/lib/cartopy/tests/mpl/test_gridliner.py +@@ -331,6 +331,7 @@ def test_grid_labels_inline_usa(proj): + return fig + + ++@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', + tolerance=41.5) +@@ -491,6 +492,7 @@ def test_gridliner_count_draws(): + mocked.assert_called_once() + + ++@pytest.mark.natural_earth + @pytest.mark.mpl_image_compare( + baseline_dir='baseline_images/mpl/test_mpl_integration', + filename='simple_global.png') +@@ -517,6 +519,7 @@ def test_gridliner_save_tight_bbox(): + fig.savefig(io.BytesIO(), bbox_inches='tight') + + ++@pytest.mark.natural_earth + @pytest.mark.mpl_image_compare(filename='gridliner_labels_title_adjust.png', + tolerance=61.3) + def test_gridliner_title_adjust(): +-- +2.45.2 + diff --git a/python-cartopy.spec b/python-cartopy.spec index 9d06b3c..6acbdc5 100644 --- a/python-cartopy.spec +++ b/python-cartopy.spec @@ -5,7 +5,7 @@ %bcond_with network Name: python-%{srcname} -Version: 0.22.0 +Version: 0.23.0 Release: %autorelease Summary: Cartographic Python library with Matplotlib visualisations @@ -15,8 +15,12 @@ Source0: %pypi_source %{Srcname} # Set location of Fedora-provided pre-existing data. Source1: siteconfig.py +# Fedora specific. +Patch: 0001-Reduce-numpy-build-dependency.patch # Might not go upstream in current form. -Patch: 0001-Increase-tolerance-for-new-FreeType.patch +Patch: 0002-Increase-tolerance-for-new-FreeType.patch +# https://github.com/SciTools/cartopy/pull/2369 +Patch: 0003-Merge-pull-request-2369-from-rcomer-ne-test-fixes.patch BuildRequires: gcc-c++ BuildRequires: proj-data-uk @@ -97,7 +101,7 @@ export FORCE_CYTHON=1 SETUPTOOLS_SCM_PRETEND_VERSION=%{version} %install %pyproject_install -%pyproject_save_files %{srcname} +%pyproject_save_files -l %{srcname} mkdir -p %{buildroot}%{_datadir}/cartopy/shapefiles/natural_earth/ for theme in physical cultural; do @@ -105,8 +109,6 @@ for theme in physical cultural; do %{buildroot}%{_datadir}/cartopy/shapefiles/natural_earth/${theme} done -mv %{buildroot}%{_bindir}/feature_download %{buildroot}%{_bindir}/cartopy_feature_download - %check MPLBACKEND=Agg \ @@ -120,7 +122,6 @@ MPLBACKEND=Agg \ %files -n python-%{srcname}-common %doc README.md -%license COPYING COPYING.LESSER lib/cartopy/data/LICENSE %{_datadir}/cartopy/ %files -n python3-%{srcname} -f %{pyproject_files} diff --git a/sources b/sources index c21cdcd..262538c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Cartopy-0.22.0.tar.gz) = fed45427e8bbd4c98c9abcee80f9148bf7dd5dc310adddb78384681da6ed9583c8daaed293ef3a27fdf3f72257f8ead7532c85d2b5e4fdf8119483625fb7a585 +SHA512 (Cartopy-0.23.0.tar.gz) = 0614b16b22ff3af752f8fd0c71ebc02ea07d3a3e07b492a80b53aae1382d53571ef6ce5ab1836ed89c4a950a6aa144f8812368d96c2606363bb41c6e37503c2c From f963ea5e0be792d1746dab92882c06d11a555bce Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 25 Jun 2024 20:44:46 -0400 Subject: [PATCH 07/18] Correct license tag --- python-cartopy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-cartopy.spec b/python-cartopy.spec index 6acbdc5..3a1e291 100644 --- a/python-cartopy.spec +++ b/python-cartopy.spec @@ -9,7 +9,7 @@ Version: 0.23.0 Release: %autorelease Summary: Cartographic Python library with Matplotlib visualisations -License: LGPL-3.0-only +License: BSD-3-Clause URL: https://scitools.org.uk/cartopy/docs/latest/ Source0: %pypi_source %{Srcname} # Set location of Fedora-provided pre-existing data. From 6a7aca5e1065162cc161a745d480e3338a071c86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 10:14:01 +0000 Subject: [PATCH 08/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a04112c2b7534afd6d243585994e7f6f5b53bb9d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 8 Oct 2024 16:48:50 -0400 Subject: [PATCH 09/18] Configure Packit for release automation --- .packit.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..b2a3bc6 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,20 @@ +# 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 + allowed_committers: + - all_admins + dist_git_branches: + - fedora-all + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-all From f46a01eadac15e0b7f92424563ed444b7d5019cf Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 8 Oct 2024 18:09:16 -0400 Subject: [PATCH 10/18] Update to latest version (#2317031) --- .gitignore | 1 + 0001-Reduce-numpy-build-dependency.patch | 8 +- ...-Increase-tolerance-for-new-FreeType.patch | 28 ++--- ...quest-2369-from-rcomer-ne-test-fixes.patch | 100 ------------------ python-cartopy.spec | 10 +- sources | 2 +- 6 files changed, 23 insertions(+), 126 deletions(-) delete mode 100644 0003-Merge-pull-request-2369-from-rcomer-ne-test-fixes.patch diff --git a/.gitignore b/.gitignore index 144b794..38351cd 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /Cartopy-0.21.1.tar.gz /Cartopy-0.22.0.tar.gz /Cartopy-0.23.0.tar.gz +/cartopy-0.24.0.tar.gz diff --git a/0001-Reduce-numpy-build-dependency.patch b/0001-Reduce-numpy-build-dependency.patch index a8edd29..6db4edb 100644 --- a/0001-Reduce-numpy-build-dependency.patch +++ b/0001-Reduce-numpy-build-dependency.patch @@ -1,7 +1,7 @@ -From 063ce2909f8468ad4bc33235f23ae31a2b41a382 Mon Sep 17 00:00:00 2001 +From 5d32389d966087efbd8a511a987df92a78dc8fe3 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 25 Apr 2024 16:35:29 -0400 -Subject: [PATCH 1/3] Reduce numpy build dependency +Subject: [PATCH 1/2] Reduce numpy build dependency Signed-off-by: Elliott Sales de Andrade --- @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml -index 862805ff..e9ddc41e 100644 +index 6e16bf74..322d3b7e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires = [ @@ -22,5 +22,5 @@ index 862805ff..e9ddc41e 100644 ] build-backend = "setuptools.build_meta" -- -2.45.2 +2.46.0 diff --git a/0002-Increase-tolerance-for-new-FreeType.patch b/0002-Increase-tolerance-for-new-FreeType.patch index eecc085..3f1f119 100644 --- a/0002-Increase-tolerance-for-new-FreeType.patch +++ b/0002-Increase-tolerance-for-new-FreeType.patch @@ -1,7 +1,7 @@ -From f7bb83e3ae29a7d0b0ba6b72c67dd97a755eb56b Mon Sep 17 00:00:00 2001 +From 3ec843978d1932f42de8407f70cb361d8fd13806 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 26 Feb 2018 02:42:50 -0500 -Subject: [PATCH 2/3] Increase tolerance for new FreeType +Subject: [PATCH 2/2] Increase tolerance for new FreeType Signed-off-by: Elliott Sales de Andrade --- @@ -25,10 +25,10 @@ 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 7d82178a..16510f8b 100644 +index 18fcb411..b16652bd 100644 --- a/lib/cartopy/tests/mpl/test_gridliner.py +++ b/lib/cartopy/tests/mpl/test_gridliner.py -@@ -131,15 +131,10 @@ def test_gridliner_specified_lines(): +@@ -130,15 +130,10 @@ def test_gridliner_specified_lines(): assert gl.ylocator.tick_values(None, None).tolist() == parallels @@ -45,7 +45,7 @@ index 7d82178a..16510f8b 100644 def test_grid_labels(): fig = plt.figure(figsize=(10, 10)) -@@ -216,7 +211,7 @@ def test_grid_labels(): +@@ -215,7 +210,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 7d82178a..16510f8b 100644 def test_grid_labels_tight(): # Ensure tight layout accounts for gridlines fig = plt.figure(figsize=(7, 5)) -@@ -264,7 +259,7 @@ def test_grid_labels_tight(): +@@ -263,7 +258,7 @@ def test_grid_labels_tight(): @pytest.mark.mpl_image_compare( filename='gridliner_constrained_adjust_datalim.png', @@ -63,7 +63,7 @@ index 7d82178a..16510f8b 100644 def test_gridliner_constrained_adjust_datalim(): fig = plt.figure(figsize=(8, 4), layout="constrained") -@@ -298,7 +293,7 @@ def test_gridliner_constrained_adjust_datalim(): +@@ -297,7 +292,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 7d82178a..16510f8b 100644 def test_grid_labels_inline(proj): fig = plt.figure() if isinstance(proj, tuple): -@@ -314,7 +309,7 @@ def test_grid_labels_inline(proj): +@@ -313,7 +308,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) @@ -82,7 +82,7 @@ index 7d82178a..16510f8b 100644 top = 49.3457868 # north lat left = -124.7844079 # west long @@ -338,7 +333,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', - tolerance=grid_label_tol) @@ -90,9 +90,9 @@ index 7d82178a..16510f8b 100644 def test_gridliner_labels_bbox_style(): top = 49.3457868 # north lat left = -124.7844079 # west long -@@ -523,7 +518,7 @@ def test_gridliner_save_tight_bbox(): - +@@ -525,7 +520,7 @@ def test_gridliner_save_tight_bbox(): + @pytest.mark.natural_earth @pytest.mark.mpl_image_compare(filename='gridliner_labels_title_adjust.png', - tolerance=grid_label_tol) + tolerance=61.3) @@ -100,10 +100,10 @@ index 7d82178a..16510f8b 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 2e65d63d..1a4f5764 100644 +index 6b528b98..3a19f629 100644 --- a/lib/cartopy/tests/mpl/test_mpl_integration.py +++ b/lib/cartopy/tests/mpl/test_mpl_integration.py -@@ -981,7 +981,7 @@ def test_streamplot(): +@@ -1008,7 +1008,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.45.2 +2.46.0 diff --git a/0003-Merge-pull-request-2369-from-rcomer-ne-test-fixes.patch b/0003-Merge-pull-request-2369-from-rcomer-ne-test-fixes.patch deleted file mode 100644 index 08ca24c..0000000 --- a/0003-Merge-pull-request-2369-from-rcomer-ne-test-fixes.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 72c5667d218c266332470bddaba83d93dceb963c Mon Sep 17 00:00:00 2001 -From: Greg Lucas -Date: Fri, 12 Apr 2024 06:46:25 -0600 -Subject: [PATCH 3/3] Merge pull request #2369 from rcomer/ne-test-fixes - -MNT: add missing 'needs network' markers -Signed-off-by: Elliott Sales de Andrade ---- - lib/cartopy/tests/mpl/test_feature_artist.py | 5 +++++ - lib/cartopy/tests/mpl/test_features.py | 1 + - lib/cartopy/tests/mpl/test_gridliner.py | 3 +++ - 3 files changed, 9 insertions(+) - -diff --git a/lib/cartopy/tests/mpl/test_feature_artist.py b/lib/cartopy/tests/mpl/test_feature_artist.py -index 1d243092..b7484287 100644 ---- a/lib/cartopy/tests/mpl/test_feature_artist.py -+++ b/lib/cartopy/tests/mpl/test_feature_artist.py -@@ -61,6 +61,7 @@ def cached_paths(geom, target_projection): - return geom_cache.get(target_projection, None) - - -+@pytest.mark.natural_earth - @pytest.mark.mpl_image_compare(filename='feature_artist.png') - def test_feature_artist_draw(feature): - fig, ax = robinson_map() -@@ -69,6 +70,7 @@ def test_feature_artist_draw(feature): - return fig - - -+@pytest.mark.natural_earth - @pytest.mark.mpl_image_compare(filename='feature_artist.png') - def test_feature_artist_draw_facecolor_list(feature): - fig, ax = robinson_map() -@@ -77,6 +79,7 @@ def test_feature_artist_draw_facecolor_list(feature): - return fig - - -+@pytest.mark.natural_earth - @pytest.mark.mpl_image_compare(filename='feature_artist.png') - def test_feature_artist_draw_cmap(feature): - fig, ax = robinson_map() -@@ -87,6 +90,7 @@ def test_feature_artist_draw_cmap(feature): - return fig - - -+@pytest.mark.natural_earth - @pytest.mark.mpl_image_compare(filename='feature_artist.png') - def test_feature_artist_draw_styled_feature(feature): - geoms = list(feature.geometries()) -@@ -98,6 +102,7 @@ def test_feature_artist_draw_styled_feature(feature): - return fig - - -+@pytest.mark.natural_earth - @pytest.mark.mpl_image_compare(filename='feature_artist.png') - def test_feature_artist_draw_styler(feature): - geoms = list(feature.geometries()) -diff --git a/lib/cartopy/tests/mpl/test_features.py b/lib/cartopy/tests/mpl/test_features.py -index 1b1b7fea..8f34ac40 100644 ---- a/lib/cartopy/tests/mpl/test_features.py -+++ b/lib/cartopy/tests/mpl/test_features.py -@@ -46,6 +46,7 @@ def test_natural_earth_custom(): - return ax.figure - - -+@pytest.mark.network - @pytest.mark.skipif(not _HAS_PYKDTREE_OR_SCIPY, reason='pykdtree or scipy is required') - @pytest.mark.mpl_image_compare(filename='gshhs_coastlines.png', tolerance=0.95) - def test_gshhs(): -diff --git a/lib/cartopy/tests/mpl/test_gridliner.py b/lib/cartopy/tests/mpl/test_gridliner.py -index 16510f8b..04ca8d79 100644 ---- a/lib/cartopy/tests/mpl/test_gridliner.py -+++ b/lib/cartopy/tests/mpl/test_gridliner.py -@@ -331,6 +331,7 @@ def test_grid_labels_inline_usa(proj): - return fig - - -+@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', - tolerance=41.5) -@@ -491,6 +492,7 @@ def test_gridliner_count_draws(): - mocked.assert_called_once() - - -+@pytest.mark.natural_earth - @pytest.mark.mpl_image_compare( - baseline_dir='baseline_images/mpl/test_mpl_integration', - filename='simple_global.png') -@@ -517,6 +519,7 @@ def test_gridliner_save_tight_bbox(): - fig.savefig(io.BytesIO(), bbox_inches='tight') - - -+@pytest.mark.natural_earth - @pytest.mark.mpl_image_compare(filename='gridliner_labels_title_adjust.png', - tolerance=61.3) - def test_gridliner_title_adjust(): --- -2.45.2 - diff --git a/python-cartopy.spec b/python-cartopy.spec index 3a1e291..77e4c61 100644 --- a/python-cartopy.spec +++ b/python-cartopy.spec @@ -1,17 +1,16 @@ %global srcname cartopy -%global Srcname Cartopy # Some tests use the network. %bcond_with network Name: python-%{srcname} -Version: 0.23.0 +Version: 0.24.0 Release: %autorelease Summary: Cartographic Python library with Matplotlib visualisations License: BSD-3-Clause URL: https://scitools.org.uk/cartopy/docs/latest/ -Source0: %pypi_source %{Srcname} +Source0: %pypi_source %{srcname} # Set location of Fedora-provided pre-existing data. Source1: siteconfig.py @@ -19,8 +18,6 @@ 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 -# https://github.com/SciTools/cartopy/pull/2369 -Patch: 0003-Merge-pull-request-2369-from-rcomer-ne-test-fixes.patch BuildRequires: gcc-c++ BuildRequires: proj-data-uk @@ -76,10 +73,9 @@ Data files for %{srcname}. %prep -%autosetup -n %{Srcname}-%{version} -p1 +%autosetup -n %{srcname}-%{version} -p1 cp -a %SOURCE1 lib/cartopy/ -sed -i -e 's/oldest-supported-numpy/numpy/g' pyproject.toml sed -i -e 's/, "pytest-cov", "coveralls"//g' pyproject.toml # Remove generated Cython sources diff --git a/sources b/sources index 262538c..8fa0b3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Cartopy-0.23.0.tar.gz) = 0614b16b22ff3af752f8fd0c71ebc02ea07d3a3e07b492a80b53aae1382d53571ef6ce5ab1836ed89c4a950a6aa144f8812368d96c2606363bb41c6e37503c2c +SHA512 (cartopy-0.24.0.tar.gz) = a2e346a4ef90ad4e52067e563d7aa1e537b216ef3150f528d513fa3e4319283b7eff0358278889cfe8ffca1954b525edcf89a6f5c28f351574c61760f1671ac3 From f2000c0cba63bae6523687e523a55f4e988b7df3 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 8 Oct 2024 23:29:03 +0000 Subject: [PATCH 11/18] Update to 0.24.1 upstream release - Resolves: rhbz#2317031 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 3 +++ python-cartopy.spec | 2 +- sources | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 38351cd..be23447 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /Cartopy-0.22.0.tar.gz /Cartopy-0.23.0.tar.gz /cartopy-0.24.0.tar.gz +/cartopy-0.24.1.tar.gz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..3f22dbc --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.102.0.post1.dev4+g7e44ad87. diff --git a/python-cartopy.spec b/python-cartopy.spec index 77e4c61..4948ab1 100644 --- a/python-cartopy.spec +++ b/python-cartopy.spec @@ -4,7 +4,7 @@ %bcond_with network Name: python-%{srcname} -Version: 0.24.0 +Version: 0.24.1 Release: %autorelease Summary: Cartographic Python library with Matplotlib visualisations diff --git a/sources b/sources index 8fa0b3d..995ca70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cartopy-0.24.0.tar.gz) = a2e346a4ef90ad4e52067e563d7aa1e537b216ef3150f528d513fa3e4319283b7eff0358278889cfe8ffca1954b525edcf89a6f5c28f351574c61760f1671ac3 +SHA512 (cartopy-0.24.1.tar.gz) = 68ac0415b395fac5e531d594f8b4f9520631f8f54da07ce437121dd64eb9d067f9698f8d5436366323387fb3b6b7ea643df30b2d7a4835158ff0bb692576b368 From db1263d5f03701666c4e7da15e1323e51bf54966 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 12:45:16 +0000 Subject: [PATCH 12/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 16f5d2534ed0720d91f829c67ded0b073c7dcca9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 18 Jun 2025 21:31:53 +0200 Subject: [PATCH 13/18] Rebuilt for Python 3.14 From 8241eb8deaba9d513005d073c6143bd6a33a38cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 07:07:28 +0000 Subject: [PATCH 14/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 2ec6011486c7a8d60b8ce404114db6716ffcd820 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 1 Aug 2025 14:18:58 +0000 Subject: [PATCH 15/18] Update to 0.25.0 upstream release - Resolves: rhbz#2385945 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + 0001-Reduce-numpy-build-dependency.patch | 12 +++++----- ...-Increase-tolerance-for-new-FreeType.patch | 22 +++++++++---------- README.packit | 2 +- python-cartopy.spec | 2 +- sources | 2 +- 6 files changed, 21 insertions(+), 20 deletions(-) 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..42c7c25 100644 --- a/0001-Reduce-numpy-build-dependency.patch +++ b/0001-Reduce-numpy-build-dependency.patch @@ -1,4 +1,4 @@ -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 @@ -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..cc87dde 100644 --- a/0002-Increase-tolerance-for-new-FreeType.patch +++ b/0002-Increase-tolerance-for-new-FreeType.patch @@ -1,4 +1,4 @@ -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 @@ -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/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..90d3c6b 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 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 From 20e8b0730d002da0958b750b0499f8b73babb042 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 11 Aug 2025 08:44:13 -0600 Subject: [PATCH 16/18] Stop building for 32-bit x86 --- python-cartopy.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/python-cartopy.spec b/python-cartopy.spec index 90d3c6b..ba75e74 100644 --- a/python-cartopy.spec +++ b/python-cartopy.spec @@ -19,6 +19,9 @@ Patch: 0001-Reduce-numpy-build-dependency.patch # Might not go upstream in current form. Patch: 0002-Increase-tolerance-for-new-FreeType.patch +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: gcc-c++ BuildRequires: proj-data-uk BuildRequires: python3-devel @@ -43,9 +46,7 @@ Summary: %{summary} Requires: python-%{srcname}-common = %{version}-%{release} Recommends: python3dist(cartopy[ows]) = %{version}-%{release} Recommends: python3dist(cartopy[plotting]) = %{version}-%{release} -%ifnarch %{ix86} Recommends: python3dist(cartopy[speedups]) = %{version}-%{release} -%endif %description -n python3-%{srcname} %{_description} @@ -65,11 +66,7 @@ Suggests: natural-earth-map-data-10m Data files for %{srcname}. -%ifnarch %{ix86} %pyproject_extras_subpkg -n python3-cartopy ows plotting speedups -%else -%pyproject_extras_subpkg -n python3-cartopy ows plotting -%endif %prep @@ -83,11 +80,7 @@ rm lib/cartopy/trace.cpp %generate_buildrequires -%ifnarch %{ix86} %pyproject_buildrequires -r -x ows,plotting,speedups,test -%else -%pyproject_buildrequires -r -x ows,plotting,test -%endif %build From e9295fafc0fb4616ebbf4c35e248bef4fbeeeadb Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 13:25:45 +0200 Subject: [PATCH 17/18] Rebuilt for Python 3.14.0rc2 bytecode From 87594fc04575f5786ba007811275a31befab1fca Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:57:27 +0200 Subject: [PATCH 18/18] Rebuilt for Python 3.14.0rc3 bytecode