Update to latest version (#2317031)
This commit is contained in:
Elliott Sales de Andrade
parent
a04112c2b7
commit
f46a01eada
6 changed files with 23 additions and 126 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 <quantum.analyst@gmail.com>
|
||||
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 <quantum.analyst@gmail.com>
|
||||
---
|
||||
|
|
@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 <quantum.analyst@gmail.com>
|
||||
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 <quantum.analyst@gmail.com>
|
||||
---
|
||||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,100 +0,0 @@
|
|||
From 72c5667d218c266332470bddaba83d93dceb963c Mon Sep 17 00:00:00 2001
|
||||
From: Greg Lucas <greg.m.lucas@gmail.com>
|
||||
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 <quantum.analyst@gmail.com>
|
||||
---
|
||||
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
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (Cartopy-0.23.0.tar.gz) = 0614b16b22ff3af752f8fd0c71ebc02ea07d3a3e07b492a80b53aae1382d53571ef6ce5ab1836ed89c4a950a6aa144f8812368d96c2606363bb41c6e37503c2c
|
||||
SHA512 (cartopy-0.24.0.tar.gz) = a2e346a4ef90ad4e52067e563d7aa1e537b216ef3150f528d513fa3e4319283b7eff0358278889cfe8ffca1954b525edcf89a6f5c28f351574c61760f1671ac3
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue