From 72c18f76314bb339d3a1655334ddd5c1cbc6c8093f2eefcbf558ed7cef4dc809 Mon Sep 17 00:00:00 2001 From: Libor Pechacek Date: Sun, 24 Nov 2024 16:54:09 +0000 Subject: [PATCH] Accepting request 1225959 from home:bnavigator:branches:Application:Geo - Update to 3.7.0 ## Dependencies: * DEP: Minimum PROJ version 9.2 by @snowman2 in #1394 ## Enhancements: * PERF: drop GIL during long-running proj database calls by @tpwrules in #1354 * PERF: thread local context by @snowman2 in #1419 * ENH: Add is_deprecated and get_non_deprecated() to CRS by @jjimenezshaw in #1383 * ENH: Add runtime & compiled PROJ versions by @snowman2 in #1427 ## Bug fixes: * BUG: Handle changes to HotineObliqueMercatorBConversion by @snowman2 in #1430 * BUG: Support azimuthal_equidistant coordinate operation to CF by @snowman2 in #1380 - Drop v3.6.1-BUG-Support-azimuthal_equidistant-coordinate-operati.patch - Drop v3.6.1-test-datum-ensemble-allowing-new-members.patch OBS-URL: https://build.opensuse.org/request/show/1225959 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/python-pyproj?expand=0&rev=72 --- pyproj-3.6.1.tar.gz | 3 -- pyproj-3.7.0.tar.gz | 3 ++ python-pyproj.changes | 21 ++++++++++ python-pyproj.spec | 11 +++-- ...uthal_equidistant-coordinate-operati.patch | 25 ----------- ...-datum-ensemble-allowing-new-members.patch | 41 ------------------- 6 files changed, 29 insertions(+), 75 deletions(-) delete mode 100644 pyproj-3.6.1.tar.gz create mode 100644 pyproj-3.7.0.tar.gz delete mode 100644 v3.6.1-BUG-Support-azimuthal_equidistant-coordinate-operati.patch delete mode 100644 v3.6.1-test-datum-ensemble-allowing-new-members.patch diff --git a/pyproj-3.6.1.tar.gz b/pyproj-3.6.1.tar.gz deleted file mode 100644 index 77470bd..0000000 --- a/pyproj-3.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44aa7c704c2b7d8fb3d483bbf75af6cb2350d30a63b144279a09b75fead501bf -size 225131 diff --git a/pyproj-3.7.0.tar.gz b/pyproj-3.7.0.tar.gz new file mode 100644 index 0000000..5e07d7a --- /dev/null +++ b/pyproj-3.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf658f4aaf815d9d03c8121650b6f0b8067265c36e31bc6660b98ef144d81813 +size 225577 diff --git a/python-pyproj.changes b/python-pyproj.changes index 18cf75c..9b71800 100644 --- a/python-pyproj.changes +++ b/python-pyproj.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Sat Nov 23 09:18:51 UTC 2024 - Ben Greiner + +- Update to 3.7.0 + ## Dependencies: + * DEP: Minimum PROJ version 9.2 by @snowman2 in #1394 + ## Enhancements: + * PERF: drop GIL during long-running proj database calls by + @tpwrules in #1354 + * PERF: thread local context by @snowman2 in #1419 + * ENH: Add is_deprecated and get_non_deprecated() to CRS by + @jjimenezshaw in #1383 + * ENH: Add runtime & compiled PROJ versions by @snowman2 in #1427 + ## Bug fixes: + * BUG: Handle changes to HotineObliqueMercatorBConversion by + @snowman2 in #1430 + * BUG: Support azimuthal_equidistant coordinate operation to CF + by @snowman2 in #1380 +- Drop v3.6.1-BUG-Support-azimuthal_equidistant-coordinate-operati.patch +- Drop v3.6.1-test-datum-ensemble-allowing-new-members.patch + ------------------------------------------------------------------- Sat Jul 20 12:36:38 UTC 2024 - Libor Pechacek diff --git a/python-pyproj.spec b/python-pyproj.spec index 36cd0a9..9110a08 100644 --- a/python-pyproj.spec +++ b/python-pyproj.spec @@ -18,15 +18,13 @@ %{?sle15_python_module_pythons} Name: python-pyproj -Version: 3.6.1 +Version: 3.7.0 Release: 0 Summary: Python interface to PROJ library License: SUSE-Public-Domain AND X11 Group: Development/Languages/Python URL: https://github.com/pyproj4/pyproj Source: https://files.pythonhosted.org/packages/source/p/pyproj/pyproj-%{version}.tar.gz -Patch0: v3.6.1-BUG-Support-azimuthal_equidistant-coordinate-operati.patch -Patch1: v3.6.1-test-datum-ensemble-allowing-new-members.patch BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel >= 3.8} BuildRequires: %{python_module pip} @@ -34,7 +32,7 @@ BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: proj -BuildRequires: proj-devel >= 8 +BuildRequires: proj-devel >= 9.2 BuildRequires: python-rpm-macros Requires: python-certifi Requires(post): update-alternatives @@ -43,9 +41,10 @@ Requires(postun): update-alternatives BuildRequires: %{python_module Shapely} BuildRequires: %{python_module certifi} BuildRequires: %{python_module numpy} +BuildRequires: %{python_module packaging} BuildRequires: %{python_module pandas} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module xarray if %python-base >= 3.10} +BuildRequires: %{python_module xarray} # /SECTION %python_subpackages @@ -91,7 +90,7 @@ $python -c "import pyproj; pyproj.Proj(init='epsg:4269')" } # Reset to remove wrong flavor path from loop above export PYTHONPATH="" -%pytest_arch -rs -k "not (network or test_transformer_group__get_transform_crs)" +%pytest_arch -rs -k "not (network)" mv pyproj_temp pyproj %post diff --git a/v3.6.1-BUG-Support-azimuthal_equidistant-coordinate-operati.patch b/v3.6.1-BUG-Support-azimuthal_equidistant-coordinate-operati.patch deleted file mode 100644 index cb767d4..0000000 --- a/v3.6.1-BUG-Support-azimuthal_equidistant-coordinate-operati.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1e8f5dd57b6022fb2a3600a8a6efc94d34c70f43 Mon Sep 17 00:00:00 2001 -From: "Alan D. Snow" -Date: Thu, 15 Feb 2024 22:51:24 -0600 -Subject: [PATCH] BUG: Support azimuthal_equidistant coordinate operation to CF - (#1380) - ---- - pyproj/crs/_cf1x8.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pyproj/crs/_cf1x8.py b/pyproj/crs/_cf1x8.py -index 207a7b2e9b91..51929c601fb6 100644 ---- a/pyproj/crs/_cf1x8.py -+++ b/pyproj/crs/_cf1x8.py -@@ -659,6 +659,7 @@ def _pole_rotation_netcdf__to_cf(conversion): - _INVERSE_GRID_MAPPING_NAME_MAP = { - "albers_equal_area": _albers_conical_equal_area__to_cf, - "modified_azimuthal_equidistant": _azimuthal_equidistant__to_cf, -+ "azimuthal_equidistant": _azimuthal_equidistant__to_cf, - "geostationary_satellite_(sweep_x)": _geostationary__to_cf, - "geostationary_satellite_(sweep_y)": _geostationary__to_cf, - "lambert_azimuthal_equal_area": _lambert_azimuthal_equal_area__to_cf, --- -2.44.0 - diff --git a/v3.6.1-test-datum-ensemble-allowing-new-members.patch b/v3.6.1-test-datum-ensemble-allowing-new-members.patch deleted file mode 100644 index a7a564f..0000000 --- a/v3.6.1-test-datum-ensemble-allowing-new-members.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ec9509f0561dbc243ad6df01613f38bd83a0e7cc Mon Sep 17 00:00:00 2001 -From: Javier Jimenez Shaw -Date: Sun, 2 Jun 2024 03:38:30 +0200 -Subject: [PATCH] test datum ensemble allowing new members. fixes #1403 (#1407) - ---- - test/crs/test_crs.py | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/test/crs/test_crs.py b/test/crs/test_crs.py -index 794e1c3f0834..d3f4fcb57bc9 100644 ---- a/test/crs/test_crs.py -+++ b/test/crs/test_crs.py -@@ -728,7 +728,7 @@ def test_coordinate_operation__from_authority__empty(): - - - def test_datum__from_epsg(): -- 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]],' -@@ -737,10 +737,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(): --- -2.45.2 -