From 4673fa15936945e58339ca0ff9761fbe33cc3c4d92faebcf20eb7a9179a543f8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 17 Jul 2017 07:08:51 +0000 Subject: [PATCH] Accepting request 509796 from devel:languages:python 1 OBS-URL: https://build.opensuse.org/request/show/509796 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-Shapely?expand=0&rev=11 --- Shapely-1.5.17.tar.gz | 3 ++ Shapely-1.5.9.tar.gz | 3 -- python-Shapely.changes | 64 +++++++++++++++++++++++++++++++++++++++++ python-Shapely.spec | 65 ++++++++++++++++++++++++++---------------- 4 files changed, 107 insertions(+), 28 deletions(-) create mode 100644 Shapely-1.5.17.tar.gz delete mode 100644 Shapely-1.5.9.tar.gz diff --git a/Shapely-1.5.17.tar.gz b/Shapely-1.5.17.tar.gz new file mode 100644 index 0000000..f3d9813 --- /dev/null +++ b/Shapely-1.5.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31fee47d9208078a19f40a451c0c99c085d16343e66cbd0dd5af0af6f48cfc3a +size 180663 diff --git a/Shapely-1.5.9.tar.gz b/Shapely-1.5.9.tar.gz deleted file mode 100644 index a1cd075..0000000 --- a/Shapely-1.5.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51b0eb6434b63226fed742c2fe9730102f7a34a5206b6581853f991768b5cc2e -size 165048 diff --git a/python-Shapely.changes b/python-Shapely.changes index 00b017e..054e5b3 100644 --- a/python-Shapely.changes +++ b/python-Shapely.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Wed Jul 12 14:22:43 UTC 2017 - toddrme2178@gmail.com + +- Don't require ctypes, it is built-in. +- Fix backwards-compatibility provides. + +------------------------------------------------------------------- +Wed Jul 12 10:58:17 UTC 2017 - jengelh@inai.de + +- Remove redundant wording from description. + +------------------------------------------------------------------- +Tue Jul 11 19:43:32 UTC 2017 - toddrme2178@gmail.com + +- Implement single-spec version. +- Fix source URL. +- Update to 1.5.17 + * Bug fix: eliminate memory leak in geom_factory() (#408). + * Bug fix: remove mention of negative distances in parallel_offset and note + that vertices of right hand offset lines are reversed (#284). +- Update to 1.5.16 + * Bug fix: eliminate memory leak when unpickling geometry objects (#384, #385). + * Bug fix: prevent crashes when attempting to pickle a prepared geometry, + raising ``PicklingError`` instead (#386). + * Packaging: extension modules in the OS X wheels uploaded to PyPI link only + libgeos_c.dylib now (you can verify and compare to previous releases with + ``otool -L shapely/vectorized/_vectorized.so``). +- Update to 1.5.15 + * Bug fix: use uintptr_t to store pointers instead of long in _geos.pxi, + preventing an overflow error (#372, #373). Note that this bug fix was + erroneously reported to have been made in 1.5.14, but was not. +- Update to 1.5.14 + * Bug fix: use ``type()`` instead of ``isinstance()`` when evaluating geometry + equality, preventing instances of base and derived classes from + being mistaken for equals (#317). + * Bug fix: ensure that empty geometries are created when constructors have no + args (#332, #333). + * Bug fix: support app "freezing" better on Windows by not relying on the + ``__file__`` attribute (#342, #377). + * Bug fix: ensure that empty polygons evaluate to be ``==`` (#355). + * Bug fix: filter out empty geometries that can cause segfaults when creating + and loading STRtrees (#345, #348). + * Bug fix: no longer attempt to reuse GEOS DLLs already loaded by Rasterio + or Fiona on OS X (#374, #375). +- Update to 1.5.13 + * Restore setup and runtime discovery and loading of GEOS shared library to + state at version 1.5.9 (#326). + * On OS X we try to reuse any GEOS shared library that may have been loaded + via import of Fiona or Rasterio in order to avoid a bug involving the + GEOS AbstractSTRtree (#324, #327). +- Update to 1.5.12 + * Remove configuration of root logger from libgeos.py (#312). + * Skip test_fallbacks on Windows (#308). + * Call setlocale(locale.LC_ALL, "") instead of resetlocale() on Windows when + tearing down the locale test (#308). + * Fix for Sphinx warnings (#309). + * Addition of .cache, .idea, .pyd, .pdb to .gitignore (#310). +- Update to 1.5.11 + * Remove packaging module requirement added in 1.5.10 (#305). Distutils can't + parse versions using 'rc', but if we stick to 'a' and 'b' we will be fine. +- Update to 1.5.10 + * Monkey patch affinity module by absolute reference (#299). + * Raise TopologicalError in relate() instead of crashing (#294, #295, #303). + ------------------------------------------------------------------- Mon Jun 15 17:38:21 UTC 2015 - bruno@ioda-net.ch diff --git a/python-Shapely.spec b/python-Shapely.spec index 27723aa..f51424f 100644 --- a/python-Shapely.spec +++ b/python-Shapely.spec @@ -1,7 +1,7 @@ # # spec file for package python-Shapely # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,36 +16,48 @@ # +%bcond_without test + +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python Name: python-Shapely -Version: 1.5.9 +Version: 1.5.17 Release: 0 Summary: Geospatial geometries, predicates, and operations License: BSD-3-Clause Group: Development/Libraries/Python Url: http://pypi.python.org/pypi/Shapely -Source: http://pypi.python.org/packages/source/S/Shapely/Shapely-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/S/Shapely/Shapely-%{version}.tar.gz +BuildRequires: %{python_module Cython >= 0.19} +BuildRequires: %{python_module devel} +BuildRequires: %{python_module numpy-devel} +BuildRequires: %{python_module setuptools} +BuildRequires: fdupes BuildRequires: geos-devel >= 3.3 -BuildRequires: python-Cython -BuildRequires: python-devel -BuildRequires: python-numpy-devel -BuildRequires: python-pytest -BuildRequires: python-pytest-cov -BuildRequires: python-setuptools -#BuildRequires: python-setuptools_cython -Requires: geos >= 3.3 -Requires: python-ctypes -Provides: python-shapely = %{version} -Obsoletes: python-shapely < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: python-rpm-macros +%if %{with test} +BuildRequires: %{python_module pytest-cov} +BuildRequires: %{python_module pytest} +%if 0%{?suse_version} > 1320 +BuildRequires: %{python_module matplotlib} %endif +%endif +Requires: geos >= 3.3 +%ifpython2 +Obsoletes: %{oldpython}-shapely < %{version} +Provides: %{oldpython}-shapely = %{version} +%endif +%ifpython3 +Obsoletes: python3-shapely < %{version} +Provides: python3-shapely = %{version} +%endif +%python_subpackages %description -Shapely is a BSD-licensed Python package for manipulation and analysis of -planar geometric objects. It is based on the widely deployed GEOS (the -engine of PostGIS) and JTS (from which GEOS is ported) libraries. -Shapely is not concerned with data formats or coordinate systems, +Shapely is a Python package for manipulation and analysis of +planar geometric objects. It is based on the GEOS (the +engine of PostGIS) and JTS (from which GEOS is ported) libraries. +Shapely is not concerned with data formats or coordinate systems, but can be readily integrated with packages that are like WorldMill and pyproj. @@ -54,20 +66,23 @@ and pyproj. %build CFLAGS="%{optflags} `geos-config --cflags` LDFLAGS=`geos-config --clibs`" -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitearch} # Those are just needed to build cython extension # Not for distribute rm -fv %{buildroot}%{_prefix}/shapely/_geos.pxi rm -frv %{buildroot}%{_prefix}/shapely +%if %{with test} %check -python setup.py test +%python_exec setup.py test +%endif -%files +%files %{python_files} %defattr(-,root,root,-) %doc CREDITS.txt LICENSE.txt README.rst docs/* %{python_sitearch}/*