Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pyproj for openSUSE:Factory
checked in at 2023-03-21 17:40:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pyproj (Old)
and /work/SRC/openSUSE:Factory/.python-pyproj.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pyproj"
Tue Mar 21 17:40:39 2023 rev:24 rq:1073572 version:3.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pyproj/python-pyproj.changes
2022-12-20 20:21:06.986085218 +0100
+++ /work/SRC/openSUSE:Factory/.python-pyproj.new.31432/python-pyproj.changes
2023-03-21 17:40:40.881587289 +0100
@@ -1,0 +2,18 @@
+Tue Mar 21 13:30:23 UTC 2023 - Libor Pechacek <lpecha...@gmx.com>
+
+- Fix failing tests after Proj update to 9.2.0 (upstream #1224, #1241)
+- Add upstream patch:
+ * 0001-TST-Update-test_transform_bounds__ignore_inf-for-PRO.patch
+ * 0002-TST-Update-transformer-test_repr__conditional-1241.patch
+
+-------------------------------------------------------------------
+Tue Mar 21 05:52:45 UTC 2023 - John Vandenberg <jay...@gmail.com>
+
+- Skip two tests to support latest PROJ 9.2
+
+-------------------------------------------------------------------
+Sun Mar 19 10:14:14 UTC 2023 - Bruno Friedmann <br...@ioda-net.ch>
+
+- Disable python38 support due to new xarray version.
+
+-------------------------------------------------------------------
New:
----
0001-TST-Update-test_transform_bounds__ignore_inf-for-PRO.patch
0002-TST-Update-transformer-test_repr__conditional-1241.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pyproj.spec ++++++
--- /var/tmp/diff_new_pack.LrXLgf/_old 2023-03-21 17:40:41.469590101 +0100
+++ /var/tmp/diff_new_pack.LrXLgf/_new 2023-03-21 17:40:41.473590120 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-pyproj
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,6 +18,7 @@
%define skip_python2 1
%define skip_python36 1
+%define skip_python38 1
%{?!python_module:%define python_module() python3-%{**}}
Name: python-pyproj
Version: 3.4.1
@@ -27,6 +28,8 @@
Group: Development/Languages/Python
URL: https://github.com/pyproj4/pyproj
Source:
https://files.pythonhosted.org/packages/source/p/pyproj/pyproj-%{version}.tar.gz
+Patch0: 0001-TST-Update-test_transform_bounds__ignore_inf-for-PRO.patch
+Patch1: 0002-TST-Update-transformer-test_repr__conditional-1241.patch
BuildRequires: %{python_module Cython >= 0.28.4}
BuildRequires: %{python_module devel >= 3.8}
BuildRequires: %{python_module setuptools}
@@ -38,8 +41,8 @@
Requires(post): update-alternatives
Requires(postun):update-alternatives
# SECTION test requirements
-BuildRequires: %{python_module certifi}
BuildRequires: %{python_module Shapely}
+BuildRequires: %{python_module certifi}
BuildRequires: %{python_module numpy}
BuildRequires: %{python_module pandas}
BuildRequires: %{python_module pytest}
@@ -70,6 +73,7 @@
%prep
%setup -q -n pyproj-%{version}
+%autopatch -p1
%build
%python_build
++++++ 0001-TST-Update-test_transform_bounds__ignore_inf-for-PRO.patch ++++++
>From 9283f962e4792da2a7f05ba3735c1ed7f3479502 Mon Sep 17 00:00:00 2001
From: "Alan D. Snow" <alansno...@gmail.com>
Date: Tue, 3 Jan 2023 21:58:12 -0600
Subject: [PATCH] TST: Update test_transform_bounds__ignore_inf for PROJ 9.2+
(#1225)
[plus test for PROJ 9.2 from upstream commit 59d16f57387b]
Acked-by: Libor Pechacek <lpecha...@gmx.com>
---
test/test_transformer.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -14,6 +14,7 @@ PROJ_GTE_9 = PROJ_LOOSE_VERSION >= versi
PROJ_GTE_901 = PROJ_LOOSE_VERSION >= version.parse("9.0.1")
PROJ_GTE_91 = PROJ_LOOSE_VERSION >= version.parse("9.1")
PROJ_GTE_911 = PROJ_LOOSE_VERSION >= version.parse("9.1.1")
+PROJ_GTE_92 = PROJ_LOOSE_VERSION >= version.parse("9.2.0")
def unset_data_dir():
--- a/test/test_transformer.py
+++ b/test/test_transformer.py
@@ -21,6 +21,7 @@ from pyproj.transformer import AreaOfInt
from test.conftest import (
PROJ_GTE_9,
PROJ_GTE_91,
+ PROJ_GTE_92,
grids_available,
proj_env,
proj_network_env,
@@ -1286,17 +1287,21 @@ def test_transform_bounds__beyond_global
@pytest.mark.parametrize(
- "input_crs,expected_bounds",
+ "input_crs,input_bounds,expected_bounds",
[
- ("ESRI:102036", (0, -89178008, 0, 0)),
- ("ESRI:54026", (0, -179545824, 0, 179545824)),
+ (
+ "ESRI:102036",
+ (-180.0, -90.0, 180.0, 1.3 if PROJ_GTE_92 else 0),
+ (0, -116576599 if PROJ_GTE_92 else -89178008, 0, 0),
+ ),
+ ("ESRI:54026", (-180.0, -90.0, 180.0, 90.0), (0, -179545824, 0,
179545824)),
],
)
-def test_transform_bounds__ignore_inf(input_crs, expected_bounds):
+def test_transform_bounds__ignore_inf(input_crs, input_bounds,
expected_bounds):
crs = CRS(input_crs)
transformer = Transformer.from_crs(crs.geodetic_crs, crs, always_xy=True)
assert_almost_equal(
- transformer.transform_bounds(*crs.area_of_use.bounds),
+ transformer.transform_bounds(*input_bounds),
expected_bounds,
decimal=0,
)
++++++ 0002-TST-Update-transformer-test_repr__conditional-1241.patch ++++++
>From 9dfbb2465296cc8f0de2ff1d68a9b65f7cef52e1 Mon Sep 17 00:00:00 2001
From: "Alan D. Snow" <alansno...@gmail.com>
Date: Wed, 22 Feb 2023 21:17:16 -0600
Subject: [PATCH] TST: Update transformer test_repr__conditional (#1241)
---
test/test_transformer.py | 50 +++++++++++++---------------------------
1 file changed, 16 insertions(+), 34 deletions(-)
--- a/test/test_transformer.py
+++ b/test/test_transformer.py
@@ -484,48 +484,30 @@ def test_repr(from_crs, to_crs, expected
@pytest.mark.grid
def test_repr__conditional():
- trans_repr = repr(Transformer.from_crs(4326, 26917))
- if grids_available(
- "ca_nrc_NA83SCRS.tif",
- "us_noaa_FL.tif",
- "us_noaa_MD.tif",
- "us_noaa_TN.tif",
- "us_noaa_gahpgn.tif",
- "us_noaa_kyhpgn.tif",
- "us_noaa_mihpgn.tif",
- "us_noaa_nchpgn.tif",
- "us_noaa_nyhpgn.tif",
- "us_noaa_ohhpgn.tif",
- "us_noaa_pahpgn.tif",
- "us_noaa_schpgn.tif",
- "us_noaa_vahpgn.tif",
- "us_noaa_wvhpgn.tif",
- ):
+ trans_repr = repr(Transformer.from_crs("EPSG:4326+3855", "EPSG:4979"))
+ if grids_available("us_nga_egm08_25.tif"):
assert trans_repr == (
"<Unknown Transformer: unknown>\n"
"Description: unavailable until proj_trans is called\n"
"Area of Use:\n- undefined"
)
+ elif PROJ_GTE_92:
+ assert trans_repr == (
+ "<Unknown Transformer: noop>\n"
+ "Description: Transformation from EGM2008 height to WGS 84 "
+ "(ballpark vertical transformation, without ellipsoid height "
+ "to vertical height correction)\n"
+ "Area of Use:\n- undefined"
+ )
else:
assert trans_repr == (
- "<Concatenated Operation Transformer: pipeline>\n"
- "Description: Inverse of NAD83 to WGS 84 (1) + UTM zone 17N\n"
+ "<Other Coordinate Operation Transformer: noop>\n"
+ "Description: Transformation from EGM2008 height to WGS 84 "
+ "(ballpark vertical transformation, without ellipsoid height "
+ "to vertical height correction)\n"
"Area of Use:\n"
- "- name: North America - onshore and offshore: Canada - Alberta;"
- " British Columbia; Manitoba; New Brunswick; "
- "Newfoundland and Labrador; Northwest Territories; "
- "Nova Scotia; Nunavut; Ontario; Prince Edward Island; Quebec; "
- "Saskatchewan; Yukon. United States (USA) - Alabama; "
- "Alaska (mainland); Arizona; Arkansas; California; Colorado; "
- "Connecticut; Delaware; Florida; Georgia; Idaho; Illinois; "
- "Indiana; Iowa; Kansas; Kentucky; Louisiana; Maine; Maryland; "
- "Massachusetts; Michigan; Minnesota; Mississippi; Missouri; "
- "Montana; Nebraska; Nevada; New Hampshire; New Jersey; "
- "New Mexico; New York; North Carolina; North Dakota; Ohio; "
- "Oklahoma; Oregon; Pennsylvania; Rhode Island; South Carolina; "
- "South Dakota; Tennessee; Texas; Utah; Vermont; Virginia; "
- "Washington; West Virginia; Wisconsin; Wyoming.\n"
- "- bounds: (-172.54, 23.81, -47.74, 86.46)"
+ "- name: World\n"
+ "- bounds: (-180.0, -90.0, 180.0, 90.0)"
)
