diff --git a/Cartopy-test_shapereader.patch b/Cartopy-test_shapereader.patch new file mode 100644 index 0000000..f96341f --- /dev/null +++ b/Cartopy-test_shapereader.patch @@ -0,0 +1,21 @@ +diff -rupN Cartopy-0.20.1/lib/cartopy/tests/test_shapereader.py Cartopy-0.20.1-new/lib/cartopy/tests/test_shapereader.py +--- Cartopy-0.20.1/lib/cartopy/tests/test_shapereader.py 2021-10-09 01:42:27.000000000 +0200 ++++ Cartopy-0.20.1-new/lib/cartopy/tests/test_shapereader.py 2022-03-09 21:38:17.720192508 +0100 +@@ -34,12 +34,12 @@ class TestLakes: + polygon = lake_geometry + + expected = np.array([(-84.85548682324658, 11.147898667846633), +- (-85.29013729525353, 11.176165676310276), +- (-85.79132117383625, 11.509737046754324), +- (-85.8851655748783, 11.900100816287136), +- (-85.5653401354239, 11.940330918826362), +- (-85.03684526237491, 11.5216484643976), + (-84.85548682324658, 11.147898667846633), ++ (-85.03684526237491, 11.5216484643976), ++ (-85.5653401354239, 11.940330918826362), ++ (-85.8851655748783, 11.900100816287136), ++ (-85.79132117383625, 11.509737046754324), ++ (-85.29013729525353, 11.176165676310276), + (-84.85548682324658, 11.147898667846633)]) + + assert_array_almost_equal(expected, polygon.exterior.coords) diff --git a/python-cartopy.spec b/python-cartopy.spec index 8e86a0d..ad1acd5 100644 --- a/python-cartopy.spec +++ b/python-cartopy.spec @@ -14,6 +14,9 @@ URL: http://scitools.org.uk/cartopy/docs/latest/ Source0: %pypi_source %{Srcname} # Set location of Fedora-provided pre-existing data. Source1: siteconfig.py +# Fix shapereader test +# https://github.com/SciTools/cartopy/issues/2012 +Patch0: Cartopy-test_shapereader.patch # Might not go upstream in current form. Patch0001: 0001-Increase-tolerance-for-new-FreeType.patch