rpms/python-cartopy
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix failing builds

Browse source
This commit is contained in:
Jos de Kloe 2021-01-30 17:06:42 +01:00
commit b9d2b3ca78
3 changed files with 90 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
0001-Increase-tolerance-for-new-FreeType.patch
View file

@ -32,8 +32,8 @@ index 80c40c6c..5724e939 100644
+# Force higher tolerance due to new FreeType on Fedora.
+grid_label_tol = 15
+grid_label_inline_tol = 10.2
+grid_label_inline_usa_tol = 11.5
+grid_label_inline_tol = 12
+grid_label_inline_usa_tol = 14
+
@pytest.mark.natural_earth

71
0002-fix-np-float-deprecation.patch Normal file
View file

@ -0,0 +1,71 @@
--- Cartopy-0.18.0.unmodified/lib/cartopy/crs.py 2020-05-04 04:58:12.000000000 +0200
+++ Cartopy-0.18.0/lib/cartopy/crs.py 2021-01-28 09:07:42.713170954 +0100
@@ -1296,7 +1296,7 @@ class LambertAzimuthalEqualArea(Projecti
super(LambertAzimuthalEqualArea, self).__init__(proj4_params,
globe=globe)
- a = np.float(self.globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS)
+ a = float(self.globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS)
# Find the antipode, and shift it a small amount in latitude to
# approximate the extent of the projection:
@@ -1339,7 +1339,7 @@ class Miller(_RectangularProjection):
globe = Globe(semimajor_axis=math.degrees(1), ellipse=None)
# TODO: Let the globe return the semimajor axis always.
- a = np.float(globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS)
+ a = float(globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS)
proj4_params = [('proj', 'mill'), ('lon_0', central_longitude)]
# See Snyder, 1987. Eqs (11-1) and (11-2) substituting maximums of
@@ -1473,8 +1473,8 @@ class Stereographic(Projection):
super(Stereographic, self).__init__(proj4_params, globe=globe)
# TODO: Let the globe return the semimajor axis always.
- a = np.float(self.globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS)
- b = np.float(self.globe.semiminor_axis or WGS84_SEMIMINOR_AXIS)
+ a = float(self.globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS)
+ b = float(self.globe.semiminor_axis or WGS84_SEMIMINOR_AXIS)
# Note: The magic number has been picked to maintain consistent
# behaviour with a wgs84 globe. There is no guarantee that the scaling
@@ -1550,7 +1550,7 @@ class Orthographic(Projection):
super(Orthographic, self).__init__(proj4_params, globe=globe)
# TODO: Let the globe return the semimajor axis always.
- a = np.float(self.globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS)
+ a = float(self.globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS)
# To stabilise the projection of geometries, we reduce the boundary by
# a tiny fraction at the cost of the extreme edges.
@@ -2107,8 +2107,8 @@ class Geostationary(_Satellite):
sweep_axis=sweep_axis)
# TODO: Let the globe return the semimajor axis always.
- a = np.float(self.globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS)
- h = np.float(satellite_height)
+ a = float(self.globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS)
+ h = float(satellite_height)
# These are only exact for a spherical Earth, owing to assuming a is
# constant. Handling elliptical would be much harder for this.
@@ -2174,7 +2174,7 @@ class NearsidePerspective(_Satellite):
# TODO: Let the globe return the semimajor axis always.
a = self.globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS
- h = np.float(satellite_height)
+ h = float(satellite_height)
max_x = a * np.sqrt(h / (2 * a + h))
coords = _ellipse_boundary(max_x, max_x,
false_easting, false_northing, 61)
@@ -2317,8 +2317,8 @@ class AzimuthalEquidistant(Projection):
super(AzimuthalEquidistant, self).__init__(proj4_params, globe=globe)
# TODO: Let the globe return the semimajor axis always.
- a = np.float(self.globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS)
- b = np.float(self.globe.semiminor_axis or a)
+ a = float(self.globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS)
+ b = float(self.globe.semiminor_axis or a)
coords = _ellipse_boundary(a * np.pi, b * np.pi,
false_easting, false_northing, 61)

19
python-cartopy.spec
View file

@ -16,6 +16,7 @@ Source0: %pypi_source %{Srcname}
Source1: siteconfig.py
# Might not go upstream in current form.
Patch0004: 0001-Increase-tolerance-for-new-FreeType.patch
Patch0005: 0002-fix-np-float-deprecation.patch
BuildRequires: gcc-c++
BuildRequires: geos-devel >= 3.3.3
@ -119,12 +120,20 @@ done
%check
# skip test_grid_labels because some x-axis labels are not drawn while they should be
# this seems related to this upstream issue:
# https://github.com/SciTools/cartopy/issues/1692
# for which a fix is still being discussed:
# See PR#1537: https://github.com/SciTools/cartopy/pull/1537
%global SKIPPEDTEST "--deselect=tests/mpl/test_gridliner.py::test_grid_labels"
%if %{with network}
PYTHONPATH="%{buildroot}%{python3_sitearch}" PYTHONDONTWRITEBYTECODE=1 MPLBACKEND=Agg \
pytest-3 --doctest-modules --pyargs cartopy
pytest-3 --doctest-modules --pyargs cartopy %{SKIPPEDTEST}
%else
PYTHONPATH="%{buildroot}%{python3_sitearch}" PYTHONDONTWRITEBYTECODE=1 MPLBACKEND=Agg \
pytest-3 --doctest-modules --pyargs cartopy -m "not network"
pytest-3 --doctest-modules --pyargs cartopy -m "not network" %{SKIPPEDTEST}
%endif
@ -139,6 +148,12 @@ PYTHONPATH="%{buildroot}%{python3_sitearch}" PYTHONDONTWRITEBYTECODE=1 MPLBACKEN
%changelog
* Sat Jan 30 2021 Jos de Kloe <josdekloe@gmail.com> 0.18.0-5
- Add a patch to fix build failures caused by np.float deprecation
- Modify patch to add more tolorance to image comparisons
- skip test_grid_labels, since it seems to suffer from a bug that is
not yet solved upstream
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.18.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild