This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely.
commit dd5ed63ce1fcf0a4642d270105dd6bc9e46736d9 Author: Bas Couwenberg <[email protected]> Date: Wed Feb 15 18:42:22 2017 +0100 Imported Upstream version 1.6~b4 --- CHANGES.txt | 8 ++ MANIFEST.in | 3 +- _vendor/__init__.py | 0 {packaging => _vendor/packaging}/__about__.py | 0 {packaging => _vendor/packaging}/__init__.py | 0 {packaging => _vendor/packaging}/_compat.py | 0 {packaging => _vendor/packaging}/_structures.py | 0 {packaging => _vendor/packaging}/markers.py | 0 {packaging => _vendor/packaging}/requirements.py | 0 {packaging => _vendor/packaging}/specifiers.py | 0 {packaging => _vendor/packaging}/utils.py | 0 {packaging => _vendor/packaging}/version.py | 0 packaging-15.3.dist-info/DESCRIPTION.rst | 121 ------------------- packaging-15.3.dist-info/METADATA | 141 ----------------------- packaging-15.3.dist-info/RECORD | 13 --- packaging-15.3.dist-info/WHEEL | 6 - packaging-15.3.dist-info/metadata.json | 1 - packaging-15.3.dist-info/pbr.json | 1 - packaging-15.3.dist-info/top_level.txt | 1 - requirements-dev.txt | 1 - setup.cfg | 4 + setup.py | 4 +- shapely/__init__.py | 2 +- shapely/ops.py | 4 +- tests/conftest.py | 4 +- 25 files changed, 20 insertions(+), 294 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 2e51be8..b036941 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,14 @@ Changes ======= +1.6b4 (2017-02-15) +------------------ + +Bug fixes: + +- Isolate vendorized packaging in a _vendor directory, remove obsolete + dist-info, and remove packaging from project requirements (resolves #468). + 1.6b3 (2016-12-31) ------------------ diff --git a/MANIFEST.in b/MANIFEST.in index 2903f9e..d968426 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -6,8 +6,7 @@ prune DLLs_x86 exclude *.txt exclude MANIFEST.in include CHANGES.txt CREDITS.txt LICENSE.txt README.rst VERSION.txt -recursive-include packaging *.py -recursive-include packaging-15.3.dist-info * +recursive-include _vendor *.py recursive-include tests *.py *.txt recursive-include shapely/examples *.py recursive-include shapely/speedups *.pyx diff --git a/_vendor/__init__.py b/_vendor/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/packaging/__about__.py b/_vendor/packaging/__about__.py similarity index 100% rename from packaging/__about__.py rename to _vendor/packaging/__about__.py diff --git a/packaging/__init__.py b/_vendor/packaging/__init__.py similarity index 100% rename from packaging/__init__.py rename to _vendor/packaging/__init__.py diff --git a/packaging/_compat.py b/_vendor/packaging/_compat.py similarity index 100% rename from packaging/_compat.py rename to _vendor/packaging/_compat.py diff --git a/packaging/_structures.py b/_vendor/packaging/_structures.py similarity index 100% rename from packaging/_structures.py rename to _vendor/packaging/_structures.py diff --git a/packaging/markers.py b/_vendor/packaging/markers.py similarity index 100% rename from packaging/markers.py rename to _vendor/packaging/markers.py diff --git a/packaging/requirements.py b/_vendor/packaging/requirements.py similarity index 100% rename from packaging/requirements.py rename to _vendor/packaging/requirements.py diff --git a/packaging/specifiers.py b/_vendor/packaging/specifiers.py similarity index 100% rename from packaging/specifiers.py rename to _vendor/packaging/specifiers.py diff --git a/packaging/utils.py b/_vendor/packaging/utils.py similarity index 100% rename from packaging/utils.py rename to _vendor/packaging/utils.py diff --git a/packaging/version.py b/_vendor/packaging/version.py similarity index 100% rename from packaging/version.py rename to _vendor/packaging/version.py diff --git a/packaging-15.3.dist-info/DESCRIPTION.rst b/packaging-15.3.dist-info/DESCRIPTION.rst deleted file mode 100644 index e373b33..0000000 --- a/packaging-15.3.dist-info/DESCRIPTION.rst +++ /dev/null @@ -1,121 +0,0 @@ -packaging -========= - -Core utilities for Python packages - - -Documentation -------------- - -`documentation`_ - - -Discussion ----------- - -If you run into bugs, you can file them in our `issue tracker`_. - -You can also join ``#pypa`` on Freenode to ask questions or get involved. - - -.. _`documentation`: https://packaging.pypa.io/ -.. _`issue tracker`: https://github.com/pypa/packaging/issues - -Changelog ---------- - -15.3 - 2015-08-01 -~~~~~~~~~~~~~~~~~ - -* Normalize post-release spellings for rev/r prefixes. :issue:`35` - - -15.2 - 2015-05-13 -~~~~~~~~~~~~~~~~~ - -* Fix an error where the arbitary specifier (``===``) was not correctly - allowing pre-releases when it was being used. - -* Expose the specifier and version parts through properties on the - ``Specifier`` classes. - -* Allow iterating over the ``SpecifierSet`` to get access to all of the - ``Specifier`` instances. - -* Allow testing if a version is contained within a specifier via the ``in`` - operator. - - -15.1 - 2015-04-13 -~~~~~~~~~~~~~~~~~ - -* Fix a logic error that was causing inconsistent answers about whether or not - a pre-release was contained within a ``SpecifierSet`` or not. - - -15.0 - 2015-01-02 -~~~~~~~~~~~~~~~~~ - -* Add ``Version().is_postrelease`` and ``LegacyVersion().is_postrelease`` to - make it easy to determine if a release is a post release. - -* Add ``Version().base_version`` and ``LegacyVersion().base_version`` to make - it easy to get the public version without any pre or post release markers. - -* Support the update to PEP 440 which removed the implied ``!=V.*`` when using - either ``>V`` or ``<V`` and which instead special cased the handling of - pre-releases, post-releases, and local versions when using ``>V`` or ``<V``. - - -14.5 - 2014-12-17 -~~~~~~~~~~~~~~~~~ - -* Normalize release candidates as ``rc`` instead of ``c``. - -* Expose the ``VERSION_PATTERN`` constant, a regular expression matching - a valid version. - - -14.4 - 2014-12-15 -~~~~~~~~~~~~~~~~~ - -* Ensure that versions are normalized before comparison when used in a - specifier with a less than (``<``) or greater than (``>``) operator. - - -14.3 - 2014-11-19 -~~~~~~~~~~~~~~~~~ - -* **BACKWARDS INCOMPATIBLE** Refactor specifier support so that it can sanely - handle legacy specifiers as well as PEP 440 specifiers. - -* **BACKWARDS INCOMPATIBLE** Move the specifier support out of - ``packaging.version`` into ``packaging.specifiers``. - - -14.2 - 2014-09-10 -~~~~~~~~~~~~~~~~~ - -* Add prerelease support to ``Specifier``. -* Remove the ability to do ``item in Specifier()`` and replace it with - ``Specifier().contains(item)`` in order to allow flags that signal if a - prerelease should be accepted or not. -* Add a method ``Specifier().filter()`` which will take an iterable and returns - an iterable with items that do not match the specifier filtered out. - - -14.1 - 2014-09-08 -~~~~~~~~~~~~~~~~~ - -* Allow ``LegacyVersion`` and ``Version`` to be sorted together. -* Add ``packaging.version.parse()`` to enable easily parsing a version string - as either a ``Version`` or a ``LegacyVersion`` depending on it's PEP 440 - validity. - - -14.0 - 2014-09-05 -~~~~~~~~~~~~~~~~~ - -* Initial release. - - diff --git a/packaging-15.3.dist-info/METADATA b/packaging-15.3.dist-info/METADATA deleted file mode 100644 index a353e5a..0000000 --- a/packaging-15.3.dist-info/METADATA +++ /dev/null @@ -1,141 +0,0 @@ -Metadata-Version: 2.0 -Name: packaging -Version: 15.3 -Summary: Core utilities for Python packages -Home-page: https://github.com/pypa/packaging -Author: Donald Stufft -Author-email: [email protected] -License: Apache License, Version 2.0 -Platform: UNKNOWN -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: Apache Software License -Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.6 -Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.2 -Classifier: Programming Language :: Python :: 3.3 -Classifier: Programming Language :: Python :: 3.4 - -packaging -========= - -Core utilities for Python packages - - -Documentation -------------- - -`documentation`_ - - -Discussion ----------- - -If you run into bugs, you can file them in our `issue tracker`_. - -You can also join ``#pypa`` on Freenode to ask questions or get involved. - - -.. _`documentation`: https://packaging.pypa.io/ -.. _`issue tracker`: https://github.com/pypa/packaging/issues - -Changelog ---------- - -15.3 - 2015-08-01 -~~~~~~~~~~~~~~~~~ - -* Normalize post-release spellings for rev/r prefixes. :issue:`35` - - -15.2 - 2015-05-13 -~~~~~~~~~~~~~~~~~ - -* Fix an error where the arbitary specifier (``===``) was not correctly - allowing pre-releases when it was being used. - -* Expose the specifier and version parts through properties on the - ``Specifier`` classes. - -* Allow iterating over the ``SpecifierSet`` to get access to all of the - ``Specifier`` instances. - -* Allow testing if a version is contained within a specifier via the ``in`` - operator. - - -15.1 - 2015-04-13 -~~~~~~~~~~~~~~~~~ - -* Fix a logic error that was causing inconsistent answers about whether or not - a pre-release was contained within a ``SpecifierSet`` or not. - - -15.0 - 2015-01-02 -~~~~~~~~~~~~~~~~~ - -* Add ``Version().is_postrelease`` and ``LegacyVersion().is_postrelease`` to - make it easy to determine if a release is a post release. - -* Add ``Version().base_version`` and ``LegacyVersion().base_version`` to make - it easy to get the public version without any pre or post release markers. - -* Support the update to PEP 440 which removed the implied ``!=V.*`` when using - either ``>V`` or ``<V`` and which instead special cased the handling of - pre-releases, post-releases, and local versions when using ``>V`` or ``<V``. - - -14.5 - 2014-12-17 -~~~~~~~~~~~~~~~~~ - -* Normalize release candidates as ``rc`` instead of ``c``. - -* Expose the ``VERSION_PATTERN`` constant, a regular expression matching - a valid version. - - -14.4 - 2014-12-15 -~~~~~~~~~~~~~~~~~ - -* Ensure that versions are normalized before comparison when used in a - specifier with a less than (``<``) or greater than (``>``) operator. - - -14.3 - 2014-11-19 -~~~~~~~~~~~~~~~~~ - -* **BACKWARDS INCOMPATIBLE** Refactor specifier support so that it can sanely - handle legacy specifiers as well as PEP 440 specifiers. - -* **BACKWARDS INCOMPATIBLE** Move the specifier support out of - ``packaging.version`` into ``packaging.specifiers``. - - -14.2 - 2014-09-10 -~~~~~~~~~~~~~~~~~ - -* Add prerelease support to ``Specifier``. -* Remove the ability to do ``item in Specifier()`` and replace it with - ``Specifier().contains(item)`` in order to allow flags that signal if a - prerelease should be accepted or not. -* Add a method ``Specifier().filter()`` which will take an iterable and returns - an iterable with items that do not match the specifier filtered out. - - -14.1 - 2014-09-08 -~~~~~~~~~~~~~~~~~ - -* Allow ``LegacyVersion`` and ``Version`` to be sorted together. -* Add ``packaging.version.parse()`` to enable easily parsing a version string - as either a ``Version`` or a ``LegacyVersion`` depending on it's PEP 440 - validity. - - -14.0 - 2014-09-05 -~~~~~~~~~~~~~~~~~ - -* Initial release. - - diff --git a/packaging-15.3.dist-info/RECORD b/packaging-15.3.dist-info/RECORD deleted file mode 100644 index eed1cde..0000000 --- a/packaging-15.3.dist-info/RECORD +++ /dev/null @@ -1,13 +0,0 @@ -packaging/__about__.py,sha256=YzdrW-1lWmyCBDyrcNkZbJo4tiDWXpoiqPjfyCYMzIE,1073 -packaging/__init__.py,sha256=2V8n-eEpSgBuXlV8hlMmhU7ZklpsrrusWMZNp2gC4Hs,906 -packaging/_compat.py,sha256=wofog8iYo_zudt_10i6JiXKHDs5GhCuXC09hCuSJiv4,1253 -packaging/_structures.py,sha256=93YvgrEE2HgFp8AdXy0pwCRVnZeutRHO_-puJ7T0cPw,1809 -packaging/specifiers.py,sha256=UV9T01_kKloA8PSeMI3HTYBSJ_4KLs00yLvrlciZ3yU,28079 -packaging/version.py,sha256=dEGrWZJZ6sef1xMxSfDCego2hS3Q86by0hUIFVk-AGc,11949 -packaging-15.3.dist-info/DESCRIPTION.rst,sha256=Gd817S15Dv8sdxUJ9pM4t5Gq_ZYflsJYB64gItd9vM8,3108 -packaging-15.3.dist-info/METADATA,sha256=VV19NM69tso91JP9TM8Pdq3CDomcP6bdn-0q3YUeNvE,3854 -packaging-15.3.dist-info/metadata.json,sha256=RpvEfDwiZ5KQreMlvUvsqF-u5MCqXRNIVml3neejEj0,859 -packaging-15.3.dist-info/pbr.json,sha256=8NuqguCaMTQfH_1HqSV4DBKcPE0Uy_lxkONIfDvWT7Y,46 -packaging-15.3.dist-info/RECORD,, -packaging-15.3.dist-info/top_level.txt,sha256=zFdHrhWnPslzsiP455HutQsqPB6v0KCtNUMtUtrefDw,10 -packaging-15.3.dist-info/WHEEL,sha256=AvR0WeTpDaxT645bl5FQxUK6NPsTls2ttpcGJg3j1Xg,110 diff --git a/packaging-15.3.dist-info/WHEEL b/packaging-15.3.dist-info/WHEEL deleted file mode 100644 index 9dff69d..0000000 --- a/packaging-15.3.dist-info/WHEEL +++ /dev/null @@ -1,6 +0,0 @@ -Wheel-Version: 1.0 -Generator: bdist_wheel (0.24.0) -Root-Is-Purelib: true -Tag: py2-none-any -Tag: py3-none-any - diff --git a/packaging-15.3.dist-info/metadata.json b/packaging-15.3.dist-info/metadata.json deleted file mode 100644 index e4b5041..0000000 --- a/packaging-15.3.dist-info/metadata.json +++ /dev/null @@ -1 +0,0 @@ -{"license": "Apache License, Version 2.0", "summary": "Core utilities for Python packages", "extensions": {"python.details": {"project_urls": {"Home": "https://github.com/pypa/packaging"}, "contacts": [{"role": "author", "name": "Donald Stufft", "email": "[email protected]"}], "document_names": {"description": "DESCRIPTION.rst"}}}, "generator": "bdist_wheel (0.24.0)", "version": "15.3", "metadata_version": "2.0", "name": "packaging", "classifiers": ["Intended Audience :: Developers", "Lic [...] \ No newline at end of file diff --git a/packaging-15.3.dist-info/pbr.json b/packaging-15.3.dist-info/pbr.json deleted file mode 100644 index 693661c..0000000 --- a/packaging-15.3.dist-info/pbr.json +++ /dev/null @@ -1 +0,0 @@ -{"git_version": "099fe4e", "is_release": true} \ No newline at end of file diff --git a/packaging-15.3.dist-info/top_level.txt b/packaging-15.3.dist-info/top_level.txt deleted file mode 100644 index 748809f..0000000 --- a/packaging-15.3.dist-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -packaging diff --git a/requirements-dev.txt b/requirements-dev.txt index 8180010..eaa7f4c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,5 +2,4 @@ setuptools Numpy>=1.4.1 Cython>=0.19 descartes==1.0.1 -packaging pytest diff --git a/setup.cfg b/setup.cfg index 25c6497..9eba825 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,6 @@ [tool:pytest] testpaths = tests +addopts = --ignore _vendor + +[bdist_wheel] +universal=1 diff --git a/setup.py b/setup.py index 7418d5a..21e20ab 100755 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ except ImportError: from distutils.errors import CCompilerError, DistutilsExecError, \ DistutilsPlatformError -from packaging.version import Version +from _vendor.packaging.version import Version # Get geos_version from GEOS dynamic library, which depends on # GEOS_LIBRARY_PATH and/or GEOS_CONFIG environment variables @@ -178,7 +178,7 @@ with open('CHANGES.txt', 'r', **open_kwds) as fp: long_description = readme + '\n\n' + credits + '\n\n' + changes extra_reqs = { - 'test': ['pytest', 'pytest-cov', 'packaging'], + 'test': ['pytest', 'pytest-cov'], 'vectorized': ['numpy']} extra_reqs['all'] = list(it.chain.from_iterable(extra_reqs.values())) diff --git a/shapely/__init__.py b/shapely/__init__.py index 2060dbb..e3fe1e7 100644 --- a/shapely/__init__.py +++ b/shapely/__init__.py @@ -1 +1 @@ -__version__ = "1.6b3" +__version__ = "1.6b4" diff --git a/shapely/ops.py b/shapely/ops.py index ebefeb2..68fcbcd 100644 --- a/shapely/ops.py +++ b/shapely/ops.py @@ -406,11 +406,11 @@ class SplitOp(object): assert(isinstance(line, LineString)) assert(isinstance(splitter, MultiPoint)) - + chunks = [line] for pt in splitter.geoms: new_chunks = [] - for chunk in chunks: + for chunk in filter(lambda x: not x.is_empty, chunks): # add the newly split 2 lines or the same line if not split new_chunks.extend(SplitOp._split_line_with_point(chunk, pt)) chunks = new_chunks diff --git a/tests/conftest.py b/tests/conftest.py index 133c2fd..c8ec787 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -4,9 +4,9 @@ import pytest def pytest_addoption(parser): parser.addoption("--with-speedups", action="store_true", default=False, - help="Run tests with speedups.") + help="Run tests with speedups.") parser.addoption("--without-speedups", action="store_true", default=False, - help="Run tests without speedups.") + help="Run tests without speedups.") def pytest_runtest_setup(item): if item.config.getoption("--with-speedups"): -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
