[Git][debian-gis-team/fiona][master] Add upstream patch to fix FTBFS with GDAL 3.1. (closes: #960369)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / fiona


Commits:
ee107a13 by Bas Couwenberg at 2020-05-15T07:35:38+02:00
Add upstream patch to fix FTBFS with GDAL 3.1. (closes: #960369)

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/gdal-3.1.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -5,6 +5,8 @@ fiona (1.8.13-2) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.5.0, no changes.
   * Update watch file to not match post releases.
   * Bump debhelper compat to 10.
+  * Add upstream patch to fix FTBFS with GDAL 3.1.
+    (closes: #960369)
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 09 Dec 2019 09:05:44 +0100
 


=====================================
debian/patches/gdal-3.1.patch
=====================================
@@ -0,0 +1,32 @@
+Description: Fix test failures with GDAL 3.1.
+Author: René Buffat <rbuffat at users.noreply.github.com>
+Origin: https://github.com/Toblerity/Fiona/commit/02a1f39165abef2e138cdb0f39cb289a11cf79b2
+Bug-Debian: https://bugs.debian.org/960369
+ 
+--- a/tests/test__env.py
++++ b/tests/test__env.py
+@@ -33,13 +33,8 @@ def mock_fhs(tmpdir):
+ @pytest.fixture
+ def mock_debian(tmpdir):
+     """A fake Debian multi-install system"""
+-    tmpdir.ensure("share/gdal/1.11/header.dxf")
+-    tmpdir.ensure("share/gdal/2.0/header.dxf")
+-    tmpdir.ensure("share/gdal/2.1/header.dxf")
+-    tmpdir.ensure("share/gdal/2.2/header.dxf")
+-    tmpdir.ensure("share/gdal/2.3/header.dxf")
+-    tmpdir.ensure("share/gdal/2.4/header.dxf")
+-    tmpdir.ensure("share/gdal/3.0/header.dxf")
++    tmpdir.ensure("share/gdal/{}.{}/header.dxf".format(gdal_version.major,
++                                                       gdal_version.minor))
+     tmpdir.ensure("share/proj/epsg")
+     return tmpdir
+ 
+--- a/tests/test_compound_crs.py
++++ b/tests/test_compound_crs.py
+@@ -8,4 +8,5 @@ def test_compound_crs(data):
+     prj = data.join("coutwildrnp.prj")
+     prj.write("""COMPD_CS["unknown",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4326"]],VERT_CS["unknown",VERT_DATUM["unknown",2005],UNIT["metre",1.0,AUTHORITY["EPSG","9001"]],AXIS["Up",UP]]]""")
+     with fiona.open(str(data.join("coutwildrnp.shp"))) as collection:
+-        assert collection.crs == {}
++        assert isinstance(collection.crs, dict)
++


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 0002-Remove-outside-reference-possible-privacy-breach.patch
 0006-Remove-unknown-distribution-options.patch
 clean-target.patch
+gdal-3.1.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/fiona/-/commit/ee107a138bebf68e2dcee3d011cae2ee5b47b651

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/fiona/-/commit/ee107a138bebf68e2dcee3d011cae2ee5b47b651
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200515/bcf9bf7d/attachment-0001.html>