From 666a22dfa57c409f52d943157c9fceb412138a613b0ad467d19c3dd23896f031 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 26 Jan 2024 21:27:22 +0000 Subject: [PATCH] - update to 1.1.0: * Move project metadata to pyproject.toml, modify build scripts * pyproject.toml: include the full README.md as the readme contents * Remove dependency on `six` * Fix geojson to esrijson conversion with custom SRID * Add explicit support for Python3.11 * docs: Simplify release process, make patch versioning more clear * Add explicit support for Python3.12 * Release 1.1.0 - drop python-geomet-no-six.patch (upstream) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-geomet?expand=0&rev=10 --- 1.0.0.tar.gz | 3 -- 1.1.0.tar.gz | 3 ++ python-geomet-no-six.patch | 61 -------------------------------------- python-geomet.changes | 16 ++++++++++ python-geomet.spec | 16 +++++----- 5 files changed, 27 insertions(+), 72 deletions(-) delete mode 100644 1.0.0.tar.gz create mode 100644 1.1.0.tar.gz delete mode 100644 python-geomet-no-six.patch diff --git a/1.0.0.tar.gz b/1.0.0.tar.gz deleted file mode 100644 index 18377b2..0000000 --- a/1.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54650c1956f8b3eacac42933a0e27d1a6087db02db9a8e9ca1d0b9e57b731d27 -size 48705 diff --git a/1.1.0.tar.gz b/1.1.0.tar.gz new file mode 100644 index 0000000..1a3e0cd --- /dev/null +++ b/1.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be5c7b8268071bdb146ce16576402b6f436cb793ab210336fe01e2ab39978cac +size 48966 diff --git a/python-geomet-no-six.patch b/python-geomet-no-six.patch deleted file mode 100644 index 7eaa939..0000000 --- a/python-geomet-no-six.patch +++ /dev/null @@ -1,61 +0,0 @@ -Index: geomet-1.0.0/geomet/util.py -=================================================================== ---- geomet-1.0.0.orig/geomet/util.py -+++ geomet-1.0.0/geomet/util.py -@@ -12,7 +12,6 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - import itertools --import six - import collections.abc as collections - - -@@ -115,7 +114,7 @@ def flatten_multi_dim(sequence): - """ - for x in sequence: - if (isinstance(x, collections.Iterable) -- and not isinstance(x, six.string_types)): -+ and not isinstance(x, str)): - for y in flatten_multi_dim(x): - yield y - else: -Index: geomet-1.0.0/geomet/wkt.py -=================================================================== ---- geomet-1.0.0.orig/geomet/wkt.py -+++ geomet-1.0.0/geomet/wkt.py -@@ -13,7 +13,6 @@ - # limitations under the License. - import geomet - import itertools --import six - import tokenize - - try: -@@ -134,7 +133,7 @@ def loads(string): - if importer is None: - _unsupported_geom_type(geom_type) - -- peek = six.advance_iterator(tokens) -+ peek = next(tokens) - if peek == 'EMPTY': - if geom_type == 'GEOMETRYCOLLECTION': - return dict(type='GeometryCollection', geometries=[]) -Index: geomet-1.0.0/requirements.txt -=================================================================== ---- geomet-1.0.0.orig/requirements.txt -+++ geomet-1.0.0/requirements.txt -@@ -1,2 +1 @@ - click --six -Index: geomet-1.0.0/setup.py -=================================================================== ---- geomet-1.0.0.orig/setup.py -+++ geomet-1.0.0/setup.py -@@ -65,6 +65,6 @@ setup( - 'Topic :: Scientific/Engineering :: GIS', - ], - zip_safe=False, -- install_requires=['click', 'six'], -+ install_requires=['click'], - python_requires=">=3.7, <4", - ) diff --git a/python-geomet.changes b/python-geomet.changes index 33d52e8..1b0e2cc 100644 --- a/python-geomet.changes +++ b/python-geomet.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Jan 26 21:25:53 UTC 2024 - Dirk Müller + +- update to 1.1.0: + * Move project metadata to pyproject.toml, modify build scripts + * pyproject.toml: include the full README.md as the readme + contents + * Remove dependency on `six` + * Fix geojson to esrijson conversion with custom SRID + * Add explicit support for Python3.11 + * docs: Simplify release process, make patch versioning more + clear + * Add explicit support for Python3.12 + * Release 1.1.0 +- drop python-geomet-no-six.patch (upstream) + ------------------------------------------------------------------- Thu May 11 10:38:08 UTC 2023 - pgajdos@suse.com diff --git a/python-geomet.spec b/python-geomet.spec index 6b1cb9a..b65ed31 100644 --- a/python-geomet.spec +++ b/python-geomet.spec @@ -1,7 +1,7 @@ # # spec file for package python-geomet # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,21 @@ Name: python-geomet -Version: 1.0.0 +Version: 1.1.0 Release: 0 Summary: GeoJSON <-> WKT/WKB conversion utilities License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/geomet/geomet Source: https://github.com/geomet/geomet/archive/%{version}.tar.gz -# https://github.com/geomet/geomet/issues/90 -Patch0: python-geomet-no-six.patch +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-click Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module click} @@ -47,10 +47,10 @@ GeoJSON <-> WKT/WKB conversion utilities %build sed -i '1{/^#!/ d}' geomet/*.py -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/geomet %python_expand %fdupes %{buildroot}%{$python_sitelib} @@ -68,6 +68,6 @@ sed -i '1{/^#!/ d}' geomet/*.py %license LICENSE %python_alternative %{_bindir}/geomet %{python_sitelib}/geomet -%{python_sitelib}/geomet-%{version}-py*.egg-info +%{python_sitelib}/geomet-%{version}.dist-info %changelog