Update to latest version (#2125749)

python-cartopy.spec

@@ -5,7 +5,7 @@
 %bcond_with network
 
 Name:           python-%{srcname}
-Version:        0.20.3
+Version:        0.21.0
 Release:        %autorelease
 Summary:        Cartographic Python library with Matplotlib visualisations
 
@@ -20,16 +20,11 @@ Patch0001:      0001-Increase-tolerance-for-new-FreeType.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2088864
 Patch0002:      0002-Use-pkg-config-to-find-GEOS-instead-of-geos-config.patch
 Patch0003:      0003-Remove-extraneous-insertion-of-default-compiler-path.patch
-# Fix compatibility with Matplotlib 3.6
-# https://github.com/SciTools/cartopy/pull/2054
-Patch0004:      0004-Replace-_autoscaleX_on-with-get_autoscalex_on.patch
-# https://github.com/SciTools/cartopy/pull/2071
-Patch0005:      0005-Fix-Axes-clearing-with-Matplotlib-3.6.patch
+# We don't need to worry about the bugs with setuptools-scm < 7.
+Patch0004:      0004-Allow-older-setuptools-scm.patch
 
-BuildRequires:  git-core
 BuildRequires:  gcc-c++
 BuildRequires:  geos-devel >= 3.7.2
-BuildRequires:  proj-devel >= 8.0.0
 BuildRequires:  proj-data-uk
 BuildRequires:  python3-devel
 BuildRequires:  python3dist(pytest-xdist)
@@ -39,7 +34,7 @@ Cartopy is a Python package designed to make drawing maps for data analysis
 and visualisation easy. It features:
 * object oriented projection definitions
 * point, line, polygon and image transformations between projections
-* integration to expose advanced mapping in matplotlib with a simple and
+* integration to expose advanced mapping in Matplotlib with a simple and
   intuitive interface
 * powerful vector data handling by integrating shapefile reading with Shapely
   capabilities
@@ -52,13 +47,9 @@ and visualisation easy. It features:
 Summary:        %{summary}
 
 Requires:       python-%{srcname}-common = %{version}-%{release}
-# OWS requirements
-Recommends:     python3dist(owslib) >= 0.18
-# Plotting requirements
-Recommends:     python3dist(gdal) >= 2.3.2
-Recommends:     python3dist(pillow) >= 6.1
+Recommends:     python3dist(cartopy[ows]) = %{version}-%{release}
+Recommends:     python3dist(cartopy[plotting]) = %{version}-%{release}
 Recommends:     python3dist(pykdtree) >= 1.2.2
-Recommends:     python3dist(scipy) >= 1.3.1
 
 %description -n python3-%{srcname} %{_description}
 
@@ -78,8 +69,11 @@ Suggests:       natural-earth-map-data-10m
 Data files for %{srcname}.
 
 
+%pyproject_extras_subpkg -n python3-cartopy ows plotting
+
+
 %prep
-%autosetup -n %{Srcname}-%{version} -p1 -S git
+%autosetup -n %{Srcname}-%{version} -p1
 cp -a %SOURCE1 lib/cartopy/
 
 sed -i -e 's/oldest-supported-numpy/numpy/g' pyproject.toml
@@ -110,7 +104,7 @@ done
 
 %check
 MPLBACKEND=Agg \
-    %{pytest} -n auto --doctest-modules --pyargs cartopy \
+    %{pytest} -n auto --doctest-modules --mpl --pyargs cartopy \
 %if %{with network}
     %{nil}
 %else