From a6258904f77e7800921d19212b4e6a010f7a3f79 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 17 Nov 2018 02:39:01 -0500 Subject: [PATCH] Remove workaround for unavailable NE map data. --- python-cartopy.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/python-cartopy.spec b/python-cartopy.spec index d297cc9..f125033 100644 --- a/python-cartopy.spec +++ b/python-cartopy.spec @@ -1,9 +1,6 @@ %global srcname cartopy %global Srcname Cartopy -# Natural Earth data may not packaged be yet. -%global test_natural_earth 1 - Name: python-%{srcname} Version: 0.16.0 Release: 6%{?dist} @@ -139,10 +136,8 @@ Recommends: python3-scipy >= 0.10 Summary: Data files for %{srcname} BuildArch: noarch -%if 0%{?test_natural_earth} BuildRequires: natural-earth-map-data-110m BuildRequires: natural-earth-map-data-50m -%endif Recommends: natural-earth-map-data-110m Suggests: natural-earth-map-data-50m @@ -185,9 +180,9 @@ done %check PYTHONPATH="%{buildroot}%{python2_sitearch}" MPLBACKEND=Agg \ - pytest-2 --doctest-modules --pyargs cartopy -m "not network%{!?test_natural_earth: and not natural_earth}" + pytest-2 --doctest-modules --pyargs cartopy -m "not network" PYTHONPATH="%{buildroot}%{python3_sitearch}" MPLBACKEND=Agg \ - pytest-3 --doctest-modules --pyargs cartopy -m "not network%{!?test_natural_earth: and not natural_earth}" + pytest-3 --doctest-modules --pyargs cartopy -m "not network" %files -n python-%{srcname}-common @@ -205,6 +200,9 @@ PYTHONPATH="%{buildroot}%{python3_sitearch}" MPLBACKEND=Agg \ %changelog +* Sat Nov 17 2018 Elliott Sales de Andrade - 0.16.0-7 +- Remove workaround for unpackaged Natural Earth data + * Fri Jul 13 2018 Fedora Release Engineering - 0.16.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild