diff --git a/0001-Increase-tolerance-for-new-FreeType.patch b/0001-Increase-tolerance-for-new-FreeType.patch deleted file mode 100644 index b829e8af6eb40cb98a1ca34d360a78c2899c26d1..0000000000000000000000000000000000000000 --- a/0001-Increase-tolerance-for-new-FreeType.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 4ab0a52d265e7ecab419125ca80a742dedae960e Mon Sep 17 00:00:00 2001 -From: zhangchao13 -Date: Fri, 18 Aug 2023 11:12:38 +0800 -Subject: [PATCH] Increase-tolerance-for-new-FreeType - ---- - lib/cartopy/tests/mpl/test_examples.py | 2 +- - lib/cartopy/tests/mpl/test_gridliner.py | 12 ++++++++---- - lib/cartopy/tests/mpl/test_mpl_integration.py | 2 +- - lib/cartopy/tests/mpl/test_ticks.py | 10 +++++----- - 4 files changed, 15 insertions(+), 11 deletions(-) - -diff --git a/lib/cartopy/tests/mpl/test_examples.py b/lib/cartopy/tests/mpl/test_examples.py -index 76f76d2..5eaeef0 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(): - @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=10.4) - 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 120295c..5df9c78 100644 ---- a/lib/cartopy/tests/mpl/test_gridliner.py -+++ b/lib/cartopy/tests/mpl/test_gridliner.py -@@ -126,6 +126,10 @@ def test_gridliner_specified_lines(): - # of text objects. A new testing strategy is needed for this kind of test. - grid_label_tol = 3.9 - -+# Force higher tolerance due to new FreeType on Fedora. -+grid_label_tol = 15.2 -+ -+ - - @pytest.mark.skipif(geos_version == (3, 9, 0), reason="GEOS intersection bug") - @pytest.mark.natural_earth -@@ -207,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=47.1) - def test_grid_labels_tight(): - # Ensure tight layout accounts for gridlines - fig = plt.figure(figsize=(7, 5)) -@@ -251,7 +255,7 @@ def test_grid_labels_tight(): - @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): -@@ -267,7 +271,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 -@@ -291,7 +295,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', -- tolerance=grid_label_tol) -+ tolerance=41.5) - def test_gridliner_labels_bbox_style(): - top = 49.3457868 # north lat - left = -124.7844079 # west long -diff --git a/lib/cartopy/tests/mpl/test_mpl_integration.py b/lib/cartopy/tests/mpl/test_mpl_integration.py -index 8a60b6d..ab84bae 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(): - - - @pytest.mark.natural_earth --@pytest.mark.mpl_image_compare() -+@pytest.mark.mpl_image_compare(tolerance=3.96) - 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 bb54b63..0a80f0c 100644 ---- a/lib/cartopy/tests/mpl/test_ticks.py -+++ b/lib/cartopy/tests/mpl/test_ticks.py -@@ -11,7 +11,7 @@ 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') -@@ -22,7 +22,7 @@ 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') -@@ -41,7 +41,7 @@ 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') -@@ -52,7 +52,7 @@ 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') -@@ -73,7 +73,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.33.0 - diff --git a/Cartopy-0.22.0.tar.gz b/cartopy-0.24.1.tar.gz similarity index 57% rename from Cartopy-0.22.0.tar.gz rename to cartopy-0.24.1.tar.gz index e2ce4120025cc1e67c838db2255baf2a70a21c0b..e848f93da3976a15d2a87e9e8c548e914da3ec88 100644 Binary files a/Cartopy-0.22.0.tar.gz and b/cartopy-0.24.1.tar.gz differ diff --git a/python-Cartopy.spec b/python-Cartopy.spec index b15afd19c43291a3b65fc4b173dfa39165435873..b320619fea5f293c9b1bdfe0a838551e23d72316 100644 --- a/python-Cartopy.spec +++ b/python-Cartopy.spec @@ -1,18 +1,15 @@ -%global srcname cartopy -%global Srcname Cartopy +%global pypi_name cartopy -Name: python-%{srcname} -Version: 0.22.0 +Name: python-%{pypi_name} +Version: 0.24.1 Release: 1 Summary: Cartographic Python library with Matplotlib visualisations License: LGPL-3.0-only -URL: https://scitools.org.uk/cartopy/docs/latest/ -Source0: %pypi_source %{Srcname} +URL: https://github.com/SciTools/cartopy +Source0: %{url}/archive/v%{version}/cartopy-%{version}.tar.gz Source1: siteconfig.py -Patch: 0001-Increase-tolerance-for-new-FreeType.patch - BuildRequires: gcc-c++ BuildRequires: proj BuildRequires: python3-devel @@ -30,17 +27,17 @@ and visualisation easy. It features: %description %{_description} -%package -n python3-%{srcname} +%package -n python3-%{pypi_name} Summary: %{summary} -Requires: python-%{srcname}-common = %{version}-%{release} +Requires: python-%{pypi_name}-common = %{version}-%{release} Recommends: python3dist(cartopy[ows]) = %{version}-%{release} Recommends: python3dist(cartopy[plotting]) = %{version}-%{release} -%description -n python3-%{srcname} %{_description} +%description -n python3-%{pypi_name} %{_description} -%package -n python-%{srcname}-common -Summary: Data files for %{srcname} +%package -n python-%{pypi_name}-common +Summary: Data files for %{pypi_name} BuildRequires: python3-pip BuildRequires: python3-wheel @@ -48,20 +45,18 @@ BuildRequires: python3-hatchling BuildRequires: python3-numpy BuildRequires: python3-Cython -%description -n python-%{srcname}-common -Data files for %{srcname}. +%description -n python-%{pypi_name}-common +Data files for %{pypi_name}. %pyproject_extras_subpkg -n python3-cartopy ows plotting %prep -%autosetup -n %{Srcname}-%{version} -p1 +%autosetup -n cartopy-%{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 -rm lib/cartopy/trace.cpp - %build export FORCE_CYTHON=1 SETUPTOOLS_SCM_PRETEND_VERSION=%{version} %pyproject_build @@ -75,20 +70,27 @@ for theme in physical cultural; do %{buildroot}%{_datadir}/cartopy/shapefiles/natural_earth/${theme} done -mv %{buildroot}%{_bindir}/feature_download %{buildroot}%{_bindir}/cartopy_feature_download - -%files -n python-%{srcname}-common +%files -n python-%{pypi_name}-common %doc README.md -%license COPYING COPYING.LESSER lib/cartopy/data/LICENSE %{_datadir}/cartopy/ -%files -n python3-%{srcname} +%files -n python3-%{pypi_name} %defattr(-,root,root) %doc README.md -%license COPYING COPYING.LESSER lib/cartopy/data/LICENSE -%{python3_sitearch}/* +%license LICENSE %{_bindir}/cartopy_feature_download +%{python3_sitearch}/Cartopy-*.dist-info/ +%{python3_sitearch}/cartopy %changelog +* Tue Nov 12 2024 Dongxing Wang - 0.24.1-1 +- Update version to 0.24.1 + Adds Python 3.13 wheels on PyPI + Add missing 'needs network' markers + Drop py39 support and bump min package versions + Fix failing gouraud shading mask creation + Add documentation, kwargs for Reader + Add xfails to current owslib failures + * Fri Aug 18 2023 chaozhangm - 0.22.0-1 - Initial package.