[Git][debian-gis-team/python-pyproj][master] Replace proj-9.4.1.patch with upstream changes.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / python-pyproj


Commits:
dfe4fd95 by Bas Couwenberg at 2024-06-02T05:28:21+02:00
Replace proj-9.4.1.patch with upstream changes.

- - - - -


1 changed file:

- debian/patches/proj-9.4.1.patch


Changes:

=====================================
debian/patches/proj-9.4.1.patch
=====================================
@@ -1,14 +1,32 @@
-Description: Fix FTBFS with PROJ 9.4.1.
-Author: Bas Couwenberg <sebastic at debian.org>
+Description: test datum ensemble allowing new members.
+Author: Javier Jimenez Shaw <j1 at jimenezshaw.com>
+Origin: https://github.com/pyproj4/pyproj/pull/1407
 Bug: https://github.com/pyproj4/pyproj/issues/1403
 
 --- a/test/crs/test_crs.py
 +++ b/test/crs/test_crs.py
-@@ -714,6 +714,7 @@ def test_coordinate_operation__from_auth
-         CoordinateOperation.from_authority("BOB", 4326)
+@@ -715,7 +715,7 @@ def test_coordinate_operation__from_auth
  
  
-+ at pytest.mark.xfail(strict=False, reason="Fails with PROJ 9.4.1")
  def test_datum__from_epsg():
-     datum_wkt = (
+-    datum_wkt = (
++    datum_wkt_prefix = (
          'ENSEMBLE["World Geodetic System 1984 ensemble",'
+         'MEMBER["World Geodetic System 1984 (Transit)",ID["EPSG",1166]],'
+         'MEMBER["World Geodetic System 1984 (G730)",ID["EPSG",1152]],'
+@@ -724,10 +724,14 @@ def test_datum__from_epsg():
+         'MEMBER["World Geodetic System 1984 (G1674)",ID["EPSG",1155]],'
+         'MEMBER["World Geodetic System 1984 (G1762)",ID["EPSG",1156]],'
+         'MEMBER["World Geodetic System 1984 (G2139)",ID["EPSG",1309]],'
++    )
++    datum_wkt_suffix = (
+         'ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1],'
+         'ID["EPSG",7030]],ENSEMBLEACCURACY[2.0],ID["EPSG",6326]]'
+     )
+-    assert Datum.from_epsg("6326").to_wkt() == datum_wkt
++    # Testing this way avoids problems when new members are added to the datum ensemble
++    assert Datum.from_epsg("6326").to_wkt().startswith(datum_wkt_prefix)
++    assert Datum.from_epsg("6326").to_wkt().endswith(datum_wkt_suffix)
+ 
+ 
+ def test_datum__from_authority():



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-pyproj/-/commit/dfe4fd9532b376d11625985df95e996fccbf6413

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-pyproj/-/commit/dfe4fd9532b376d11625985df95e996fccbf6413
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/20240602/ab8d0d7a/attachment-0001.htm>