From e0e34ddd59dd4c6d2407d758836eb099b8fa11ad3a287cd4213331ffd9f6ccc2 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 13 Jan 2022 09:39:09 +0000 Subject: [PATCH] Accepting request 945434 from home:bnavigator:branches:Application:Geo - Update to 1.8.0 * Shapely 1.8.0 is a transitional version. There are a few bug fixes and new features, but it largely exists to warn about the upcoming changes in 2.0.0. See the new migration guide for more details on how to update your code from Shapely 1.8 to 2.0. * Shapely 1.8.0 supports only Python versions >= 3.6. The release is compatible with GEOS versions 3.6-3.10. * Deprecations: The following functions and geometry attributes and methods will be removed in version 2.0.0. - ops.cascaded_union - BaseGeometry.empty - BaseGeometry.ctypes and __array_interface__ - multi-part geometry __len__ - setting custom attributes on geometry objects - BaseGeometry.almost_exact - Deprecation warnings will be emitted in 1.8.0 when any of these features are used. * The deprecated to_wkb and to_wkt methods of BaseGeometry have been removed. * The STRtree nearest* methods now take an optional argument that specifies exclusion of the input geometry from results (#1115). * A GeometryTypeError has been added to shapely.errors and is consistently raised instead of TypeError or ValueError as in version 1.7. For backwards compatibility, the new exception will derive from TypeError and Value error until version 2.0 (#1099). * The STRtree class constructor now takes an optional second argument, a sequence of objects to be stored in the tree. If not provided, the sequence indices of the geometries will be stored, as before (#1112). * The STRtree class has new query_geoms, query_items, nearest_geom, and nearest_item methods (#1112). The query and nearest methods remain as aliases for query_geoms and nearest_geom. * A normalize method has been added to geometry classes, exposing the GEOSNormalize algorithm (#1090). * STRtree instances have a new default capacity of 10 items per node (#1070). * The new shapely.ops.voronoi_diagram computes the Voronoi Diagram of a geometry or geometry collection (#833, #851). * shapely.validation.make_valid fixes invalid geometries (#883). - Drop Shapely-fix-svg-collection-pr1042.patch OBS-URL: https://build.opensuse.org/request/show/945434 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/python-Shapely?expand=0&rev=25 --- Shapely-1.7.1.tar.gz | 3 -- Shapely-1.8.0.tar.gz | 3 ++ Shapely-fix-svg-collection-pr1042.patch | 27 --------------- python-Shapely.changes | 46 +++++++++++++++++++++++++ python-Shapely.spec | 17 +++------ 5 files changed, 53 insertions(+), 43 deletions(-) delete mode 100644 Shapely-1.7.1.tar.gz create mode 100644 Shapely-1.8.0.tar.gz delete mode 100644 Shapely-fix-svg-collection-pr1042.patch diff --git a/Shapely-1.7.1.tar.gz b/Shapely-1.7.1.tar.gz deleted file mode 100644 index de7ed26..0000000 --- a/Shapely-1.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1641724c1055459a7e2b8bbe47ba25bdc89554582e62aec23cb3f3ca25f9b129 -size 383194 diff --git a/Shapely-1.8.0.tar.gz b/Shapely-1.8.0.tar.gz new file mode 100644 index 0000000..e07bdfa --- /dev/null +++ b/Shapely-1.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5307ee14ba4199f8bbcf6532ca33064661c1433960c432c84f0daa73b47ef9c +size 278344 diff --git a/Shapely-fix-svg-collection-pr1042.patch b/Shapely-fix-svg-collection-pr1042.patch deleted file mode 100644 index de7068c..0000000 --- a/Shapely-fix-svg-collection-pr1042.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 77879a954d24d1596f986d16ba3eff5e13861164 Mon Sep 17 00:00:00 2001 -From: Mike Taves -Date: Thu, 3 Dec 2020 17:14:34 +1300 -Subject: [PATCH] Expand CI and tests to support GEOS 3.9.0beta2 - ---- - .travis.yml | 6 ++--- - appveyor.yml | 2 +- - ...test_create_inconsistent_dimensionality.py | 10 +++++++- - tests/test_svg.py | 3 ++- - tests/test_wkb.py | 25 ++++++++++++++++++- - 5 files changed, 39 insertions(+), 7 deletions(-) - -diff --git a/tests/test_svg.py b/tests/test_svg.py -index fcc2679d..dac3e71f 100644 ---- a/tests/test_svg.py -+++ b/tests/test_svg.py -@@ -174,7 +174,8 @@ def test_collection(self): - self.assertSVG(GeometryCollection(), '') - # Valid - self.assertSVG( -- Point(7, 3).union(LineString([(4, 2), (8, 4)])), -+ GeometryCollection( -+ [Point(7, 3), LineString([(4, 2), (8, 4)])]), - '' - ' + +- Update to 1.8.0 + * Shapely 1.8.0 is a transitional version. There are a few bug + fixes and new features, but it largely exists to warn about the + upcoming changes in 2.0.0. See the new migration guide for more + details on how to update your code from Shapely 1.8 to 2.0. + * Shapely 1.8.0 supports only Python versions >= 3.6. The release + is compatible with GEOS versions 3.6-3.10. + * Deprecations: The following functions and geometry attributes + and methods will be removed in version 2.0.0. + - ops.cascaded_union + - BaseGeometry.empty + - BaseGeometry.ctypes and __array_interface__ + - multi-part geometry __len__ + - setting custom attributes on geometry objects + - BaseGeometry.almost_exact + - Deprecation warnings will be emitted in 1.8.0 when any of + these features are used. + * The deprecated to_wkb and to_wkt methods of BaseGeometry have + been removed. + * The STRtree nearest* methods now take an optional argument that + specifies exclusion of the input geometry from results (#1115). + * A GeometryTypeError has been added to shapely.errors and is + consistently raised instead of TypeError or ValueError as in + version 1.7. For backwards compatibility, the new exception + will derive from TypeError and Value error until version 2.0 + (#1099). + * The STRtree class constructor now takes an optional second + argument, a sequence of objects to be stored in the tree. If + not provided, the sequence indices of the geometries will be + stored, as before (#1112). + * The STRtree class has new query_geoms, query_items, + nearest_geom, and nearest_item methods (#1112). The query and + nearest methods remain as aliases for query_geoms and + nearest_geom. + * A normalize method has been added to geometry classes, exposing + the GEOSNormalize algorithm (#1090). + * STRtree instances have a new default capacity of 10 items per + node (#1070). + * The new shapely.ops.voronoi_diagram computes the Voronoi + Diagram of a geometry or geometry collection (#833, #851). + * shapely.validation.make_valid fixes invalid geometries (#883). +- Drop Shapely-fix-svg-collection-pr1042.patch + ------------------------------------------------------------------- Sat Apr 17 10:55:16 UTC 2021 - Ben Greiner diff --git a/python-Shapely.spec b/python-Shapely.spec index a41ebf2..7a1ee25 100644 --- a/python-Shapely.spec +++ b/python-Shapely.spec @@ -1,7 +1,7 @@ # # spec file for package python-Shapely # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,32 +21,23 @@ %bcond_without test %define skip_python2 1 Name: python-Shapely -Version: 1.7.1 +Version: 1.8.0 Release: 0 Summary: Geospatial geometries, predicates, and operations License: BSD-3-Clause URL: https://github.com/Toblerity/Shapely Source: https://files.pythonhosted.org/packages/source/S/Shapely/Shapely-%{version}.tar.gz -# PATCH-FIX-UPSTREAM Shapely-fix-svg-collection-pr1042.patch -- from gh#Toblerity/Shapely#1042 fix svg test -Patch0: Shapely-fix-svg-collection-pr1042.patch BuildRequires: %{python_module Cython >= 0.19} -BuildRequires: %{python_module devel} +BuildRequires: %{python_module devel >= 3.6} +BuildRequires: %{python_module numpy-devel} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: geos-devel >= 3.3 BuildRequires: python-rpm-macros -%if 0%{suse_version} >= 1550 -BuildRequires: %{python_module matplotlib if (%python-base without python36-base)} -BuildRequires: %{python_module numpy-devel if (%python-base without python36-base)} -%else -# Application:Geo does not have the support for boolean build requirements within the -# python_module macro for the SLE/Leap repos -BuildRequires: %{python_module numpy-devel} %if 0%{?suse_version} > 1320 BuildRequires: %{python_module matplotlib} %endif -%endif Requires: geos >= 3.3 Recommends: python-numpy Provides: python-shapely = %{version}