public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python-cartopy] f45: Update to 0.26.0 upstream release
@ 2026-09-17 7:27 Packit
0 siblings, 0 replies; only message in thread
From: Packit @ 2026-09-17 7:27 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/python-cartopy
Branch : f45
Commit : f0e6e7d3ab57770252dd264f7b87d678c5fc90c8
Author : Packit <hello@packit.dev>
Date : 2026-09-17T02:11:04-04:00
Stats : +4/-204 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/python-cartopy/c/f0e6e7d3ab57770252dd264f7b87d678c5fc90c8?branch=f45
Log:
Update to 0.26.0 upstream release
- Resolves: rhbz#2535816
Commit authored by Packit automation (https://packit.dev/)
---
diff --git a/.gitignore b/.gitignore
index 6526b10..78b2b84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/cartopy-0.24.0.tar.gz
/cartopy-0.24.1.tar.gz
/cartopy-0.25.0.tar.gz
+/cartopy-0.26.0.tar.gz
diff --git a/0001-Reduce-numpy-build-dependency.patch b/0001-Reduce-numpy-build-dependency.patch
deleted file mode 100644
index 42c7c25..0000000
--- a/0001-Reduce-numpy-build-dependency.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e3a61e272d5ab58a2b8f13c6ad05d1136d3a5ecc Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Thu, 25 Apr 2024 16:35:29 -0400
-Subject: [PATCH 1/2] Reduce numpy build dependency
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- pyproject.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-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.0",
-+ "numpy>=1.23",
- "setuptools_scm >= 8.0.0",
- ]
- build-backend = "setuptools.build_meta"
---
-2.50.0
-
diff --git a/0002-Increase-tolerance-for-new-FreeType.patch b/0002-Increase-tolerance-for-new-FreeType.patch
deleted file mode 100644
index 579937b..0000000
--- a/0002-Increase-tolerance-for-new-FreeType.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From d3d4e7a80ded257b3094d837e5133b199989b460 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Mon, 26 Feb 2018 02:42:50 -0500
-Subject: [PATCH 2/2] Increase tolerance for new FreeType
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- lib/cartopy/tests/mpl/test_examples.py | 2 +-
- 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(+), 19 deletions(-)
-
-diff --git a/lib/cartopy/tests/mpl/test_examples.py b/lib/cartopy/tests/mpl/test_examples.py
-index a7f64ac9..404d3d83 100644
---- a/lib/cartopy/tests/mpl/test_examples.py
-+++ b/lib/cartopy/tests/mpl/test_examples.py
-@@ -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_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 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():
- assert gl.ylocator.tick_values(None, None).tolist() == parallels
-
-
--# 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
- @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))
-
-@@ -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',
-- tolerance=2.9)
-+ tolerance=47.1)
- def test_grid_labels_tight():
- # Ensure tight layout accounts for gridlines
- fig = plt.figure(figsize=(7, 5))
-@@ -259,7 +254,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")
-
-@@ -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)
--@pytest.mark.mpl_image_compare(style='mpl20')
-+@pytest.mark.mpl_image_compare(style='mpl20', tolerance=8.36)
- def test_grid_labels_inline(proj):
- fig = plt.figure()
- if isinstance(proj, tuple):
-@@ -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)
--@pytest.mark.mpl_image_compare(style='mpl20', tolerance=0.79)
-+@pytest.mark.mpl_image_compare(style='mpl20', tolerance=7.76)
- def test_grid_labels_inline_usa(proj):
- top = 49.3457868 # north lat
- left = -124.7844079 # west long
-@@ -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',
-- tolerance=grid_label_tol)
-+ tolerance=41.5)
- def test_gridliner_labels_bbox_style():
- top = 49.3457868 # north lat
- left = -124.7844079 # west long
-@@ -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',
-- 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 f1aeccdf..78866085 100644
---- a/lib/cartopy/tests/mpl/test_mpl_integration.py
-+++ b/lib/cartopy/tests/mpl/test_mpl_integration.py
-@@ -1016,7 +1016,7 @@ def test_streamplot():
-
-
- @pytest.mark.natural_earth
--@pytest.mark.mpl_image_compare()
-+@pytest.mark.mpl_image_compare(tolerance=3.97)
- def test_annotate():
- """ 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 f75ad2d2..bc0ba0b7 100644
---- a/lib/cartopy/tests/mpl/test_ticks.py
-+++ b/lib/cartopy/tests/mpl/test_ticks.py
-@@ -10,7 +10,8 @@ from cartopy.mpl.ticker import LatitudeFormatter, LongitudeFormatter
-
-
- @pytest.mark.natural_earth
--@pytest.mark.mpl_image_compare(filename='xticks_no_transform.png')
-+@pytest.mark.mpl_image_compare(filename='xticks_no_transform.png',
-+ tolerance=6.71)
- def test_set_xticks_no_transform():
- ax = plt.axes(projection=ccrs.PlateCarree())
- ax.coastlines('110m')
-@@ -21,7 +22,8 @@ def test_set_xticks_no_transform():
-
-
- @pytest.mark.natural_earth
--@pytest.mark.mpl_image_compare(filename='xticks_cylindrical.png')
-+@pytest.mark.mpl_image_compare(filename='xticks_cylindrical.png',
-+ tolerance=7.13)
- def test_set_xticks_cylindrical():
- ax = plt.axes(projection=ccrs.Mercator(min_latitude=-85, max_latitude=85))
- ax.coastlines('110m')
-@@ -40,7 +42,8 @@ def test_set_xticks_non_cylindrical():
-
-
- @pytest.mark.natural_earth
--@pytest.mark.mpl_image_compare(filename='yticks_no_transform.png')
-+@pytest.mark.mpl_image_compare(filename='yticks_no_transform.png',
-+ tolerance=3.75)
- def test_set_yticks_no_transform():
- ax = plt.axes(projection=ccrs.PlateCarree())
- ax.coastlines('110m')
-@@ -51,7 +54,8 @@ def test_set_yticks_no_transform():
-
-
- @pytest.mark.natural_earth
--@pytest.mark.mpl_image_compare(filename='yticks_cylindrical.png')
-+@pytest.mark.mpl_image_compare(filename='yticks_cylindrical.png',
-+ tolerance=4.37)
- def test_set_yticks_cylindrical():
- ax = plt.axes(projection=ccrs.Mercator(min_latitude=-85, max_latitude=85))
- ax.coastlines('110m')
-@@ -72,7 +76,7 @@ def test_set_yticks_non_cylindrical():
-
-
- @pytest.mark.natural_earth
--@pytest.mark.mpl_image_compare(filename='xyticks.png')
-+@pytest.mark.mpl_image_compare(filename='xyticks.png', tolerance=7.19)
- def test_set_xyticks():
- fig = plt.figure(figsize=(10, 10))
- projections = (ccrs.PlateCarree(),
---
-2.50.0
-
diff --git a/README.packit b/README.packit
index 3ad54d6..5fae86e 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.
+The file was generated using packit 1.16.3.post1.dev4+gbf42df0bb.
diff --git a/python-cartopy.spec b/python-cartopy.spec
index c46ec8f..7cd7572 100644
--- a/python-cartopy.spec
+++ b/python-cartopy.spec
@@ -4,7 +4,7 @@
%bcond_with network
Name: python-%{srcname}
-Version: 0.25.0
+Version: 0.26.0
Release: %autorelease
Summary: Cartographic Python library with Matplotlib visualisations
@@ -14,11 +14,6 @@ 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: 0002-Increase-tolerance-for-new-FreeType.patch
-
# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
diff --git a/sources b/sources
index 5b897b0..9e12fa5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cartopy-0.25.0.tar.gz) = 6e0576f87dbd154d7dec3c2bbec520d1602874e6b416ca6e461745ceb319dc0f38a53267ad0b1f73bcd0d81674151324c07b7a799fb0a3ad590d1a27c98b3ae7
+SHA512 (cartopy-0.26.0.tar.gz) = 378514d3a9a5f909f9ecf9e1e5b2aadf60176b62570aa4ac90c4d143262c497b76deb6f467d674b33d36f99246c51829dd838d26b9db6dd9ec9f135d180b151a
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-17 7:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-17 7:27 [rpms/python-cartopy] f45: Update to 0.26.0 upstream release Packit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox