Bas Couwenberg pushed to branch master at Debian GIS Project / python-pyproj
Commits: 487763cb by Bas Couwenberg at 2020-06-27T15:22:34+02:00 Add upstream patch to fix FTBFS with PROJ 7.1.0. - - - - - 7a258c51 by Bas Couwenberg at 2020-06-29T13:08:45+02:00 Require at least PROJ 7.1.0. - - - - - 163af40c by Bas Couwenberg at 2020-07-01T15:22:34+02:00 Set distribution to unstable. - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/0001-TST-Update-tests-with-scope-remarks-649.patch - + debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +python-pyproj (2.6.1+ds-2) unstable; urgency=medium + + * Add upstream patch to fix FTBFS with PROJ 7.1.0. + * Require at least PROJ 7.1.0. + + -- Bas Couwenberg <[email protected]> Wed, 01 Jul 2020 15:22:23 +0200 + python-pyproj (2.6.1+ds-1) unstable; urgency=medium * New upstream release. ===================================== debian/control ===================================== @@ -7,8 +7,8 @@ Priority: optional Build-Depends: debhelper (>= 10~), dh-python, cython3, - libproj-dev (>= 6.0.0), - proj-bin (>= 6.0.0), + libproj-dev (>= 7.1.0), + proj-bin (>= 7.1.0), python3-all-dev, python3-setuptools, python3-mock, ===================================== debian/patches/0001-TST-Update-tests-with-scope-remarks-649.patch ===================================== @@ -0,0 +1,58 @@ +From 5856cdacef62746594e17f69cb802a202d3fdfaa Mon Sep 17 00:00:00 2001 +From: "Alan D. Snow" <[email protected]> +Date: Fri, 29 May 2020 07:41:44 -0500 +Subject: TST: Update tests with scope & remarks (#649) + +--- + test/crs/test_crs.py | 16 +++++----------- + test/test_transformer.py | 10 +++++----- + 2 files changed, 10 insertions(+), 16 deletions(-) + +--- a/test/crs/test_crs.py ++++ b/test/crs/test_crs.py +@@ -1261,17 +1261,11 @@ def test_operations(): + + + def test_operations__scope_remarks(): +- +- transformer = TransformerGroup(28356, 7856).transformers[0] +- coord_op = CoordinateOperation.from_string(transformer.to_wkt()) +- assert coord_op.operations == transformer.operations +- # scope does not transfer for some reason +- # assert [op.scope for op in transformer.operations] == [ +- # op.scope for op in coord_op.operations +- # ] +- assert [op.remarks for op in transformer.operations] == [ +- op.remarks for op in coord_op.operations +- ] ++ operation = TransformerGroup(28356, 7856).transformers[0].operations[1] ++ coord_op = CoordinateOperation.from_string(operation.to_wkt()) ++ assert coord_op == operation ++ assert coord_op.remarks == operation.remarks ++ assert coord_op.scope == operation.scope + + + def test_crs_equals(): +--- a/test/test_transformer.py ++++ b/test/test_transformer.py +@@ -536,15 +536,15 @@ def test_transformer__operations__scope_ + transformer = TransformerGroup(28356, 7856).transformers[0] + assert transformer.scope is None + assert [op.scope for op in transformer.operations] == [ +- None, ++ "Large and medium scale topographic mapping and engineering survey.", + "Conformal transformation of GDA94 coordinates that have been derived through " + "GNSS CORS.", +- None, ++ "Large and medium scale topographic mapping and engineering survey.", + ] +- assert [str(op.remarks)[:5] for op in transformer.operations] == [ +- "None", ++ assert [str(op.remarks)[:5].strip() for op in transformer.operations] == [ ++ "Grid", + "Scale", +- "None", ++ "Grid", + ] + + ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +0001-TST-Update-tests-with-scope-remarks-649.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/python-pyproj/-/compare/ed976e1954ef6caf3dff041c4d91ba4e4ad270c2...163af40cd121bb0edf028d109254633d95b81588 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/python-pyproj/-/compare/ed976e1954ef6caf3dff041c4d91ba4e4ad270c2...163af40cd121bb0edf028d109254633d95b81588 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
