Remove workaround for unavailable NE map data.

This commit is contained in:
Elliott Sales de Andrade 2018-11-17 02:39:01 -05:00
commit a6258904f7

View file

@ -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 <quantum.analyst@gmail.com> - 0.16.0-7
- Remove workaround for unpackaged Natural Earth data
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild