diff --git a/python-cartopy.spec b/python-cartopy.spec index e807ef2..8034639 100644 --- a/python-cartopy.spec +++ b/python-cartopy.spec @@ -31,52 +31,6 @@ and visualisation easy. It features: \ %description %{_description} -%package -n python2-%{srcname} -Summary: %{summary} -%{?python_provide:%python_provide python2-%{srcname}} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools >= 0.7.2 -BuildRequires: python2-Cython >= 0.15.1 -BuildRequires: python2-six >= 1.3.0 -BuildRequires: python2-numpy >= 1.10 -BuildRequires: python2-shapely >= 1.5.6 -BuildRequires: python2-pyshp >= 1.1.4 -# OWS requirements -BuildRequires: python2-owslib >= 0.8.11 -BuildRequires: python2-pillow >= 1.7.8 -# Plotting requirements -BuildRequires: python2-matplotlib >= 1.5.1 -BuildRequires: python2-gdal >= 1.10.0 -BuildRequires: python2-pillow >= 1.7.8 -BuildRequires: python2-scipy >= 0.10 -# Testing requirements -BuildRequires: python2-filelock -BuildRequires: python2-mock >= 1.0.1 -BuildRequires: python2-pytest >= 3.1.0 -%if %{fedora} < 28 -# For old matplotlib -BuildRequires: python2-nose -%endif - -Requires: python-%{srcname}-common = %{version}-%{release} -Requires: python2-six >= 1.3.0 -Requires: python2-numpy >= 1.10 -Requires: python2-shapely >= 1.5.6 -Requires: python2-pyshp >= 1.1.4 -Requires: python2-setuptools >= 0.7.2 -# OWS requirements -Recommends: python2-owslib >= 0.8.11 -Recommends: python2-pillow >= 1.7.8 -# Plotting requirements -Recommends: python2-matplotlib >= 1.5.1 -Recommends: python2-gdal >= 1.10.0 -Recommends: python2-pillow >= 1.7.8 -Recommends: python2-scipy >= 0.10 - -%description -n python2-%{srcname} %{_description} - - %package -n python3-%{srcname} Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} @@ -149,19 +103,11 @@ rm -rf %{srcname}.egg-info %build -%py2_build - -# Purge generated Cython files. -rm -f lib/cartopy/trace.cpp lib/cartopy/trace.pyd -rm -f lib/cartopy/_crs.c lib/cartopy/_crs.pyd -rm -f lib/cartopy/geodesic/_geodesic.c lib/cartopy/geodesic/_geodesic.pyd - %py3_build %install %py3_install -%py2_install mkdir -p %{buildroot}%{_datadir}/cartopy/shapefiles/natural_earth/ for theme in physical cultural; do @@ -171,8 +117,6 @@ done %check -PYTHONPATH="%{buildroot}%{python2_sitearch}" MPLBACKEND=Agg \ - pytest-2 --doctest-modules --pyargs cartopy -m "not network" PYTHONPATH="%{buildroot}%{python3_sitearch}" MPLBACKEND=Agg \ pytest-3 --doctest-modules --pyargs cartopy -m "not network" @@ -182,10 +126,6 @@ PYTHONPATH="%{buildroot}%{python3_sitearch}" MPLBACKEND=Agg \ %license COPYING.LESSER lib/cartopy/data/LICENSE %{_datadir}/cartopy/ -%files -n python2-%{srcname} -%{python2_sitearch}/cartopy -%{python2_sitearch}/%{Srcname}-%{version}-py?.?.egg-info - %files -n python3-%{srcname} %{python3_sitearch}/cartopy %{python3_sitearch}/%{Srcname}-%{version}-py?.?.egg-info @@ -195,6 +135,7 @@ PYTHONPATH="%{buildroot}%{python3_sitearch}" MPLBACKEND=Agg \ * Sat Nov 17 2018 Elliott Sales de Andrade - 0.17.0-1 - Update to latest version - Remove workaround for unpackaged Natural Earth data +- Drop Python 2 subpackage * Fri Jul 13 2018 Fedora Release Engineering - 0.16.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild