shapely 1.6b3__tar.gz → 1.6b4__tar.gz

{Shapely-1.6b3 → Shapely-1.6b4}/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)
 ------------------
 

{Shapely-1.6b3/Shapely.egg-info → Shapely-1.6b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.6b3
+Version: 1.6b4
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -239,6 +239,14 @@ Description: =======
         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)
         ------------------
         

{Shapely-1.6b3 → Shapely-1.6b4/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.6b3
+Version: 1.6b4
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -239,6 +239,14 @@ Description: =======
         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)
         ------------------
         

{Shapely-1.6b3 → Shapely-1.6b4}/Shapely.egg-info/SOURCES.txt

@@ -10,26 +10,20 @@ Shapely.egg-info/SOURCES.txt
 Shapely.egg-info/dependency_links.txt
 Shapely.egg-info/requires.txt
 Shapely.egg-info/top_level.txt
+_vendor/__init__.py
+_vendor/packaging/__about__.py
+_vendor/packaging/__init__.py
+_vendor/packaging/_compat.py
+_vendor/packaging/_structures.py
+_vendor/packaging/markers.py
+_vendor/packaging/requirements.py
+_vendor/packaging/specifiers.py
+_vendor/packaging/utils.py
+_vendor/packaging/version.py
 docs/design.rst
 docs/index.rst
 docs/manual.rst
 docs/project.rst
-packaging/__about__.py
-packaging/__init__.py
-packaging/_compat.py
-packaging/_structures.py
-packaging/markers.py
-packaging/requirements.py
-packaging/specifiers.py
-packaging/utils.py
-packaging/version.py
-packaging-15.3.dist-info/DESCRIPTION.rst
-packaging-15.3.dist-info/METADATA
-packaging-15.3.dist-info/RECORD
-packaging-15.3.dist-info/WHEEL
-packaging-15.3.dist-info/metadata.json
-packaging-15.3.dist-info/pbr.json
-packaging-15.3.dist-info/top_level.txt
 shapely/__init__.py
 shapely/_buildcfg.py
 shapely/_geos.pxi

{Shapely-1.6b3 → Shapely-1.6b4}/Shapely.egg-info/requires.txt

@@ -1,14 +1,12 @@
 
 [all]
-numpy
 pytest
 pytest-cov
-packaging
+numpy
 
 [test]
 pytest
 pytest-cov
-packaging
 
 [vectorized]
 numpy

Shapely-1.6b4/VERSION.txt

@@ -0,0 +1 @@
+1.6b4

{Shapely-1.6b3 → Shapely-1.6b4}/setup.cfg

@@ -1,8 +1,11 @@
 [tool:pytest]
 testpaths = tests
+addopts = --ignore _vendor
+
+[bdist_wheel]
+universal = 1
 
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 

{Shapely-1.6b3 → Shapely-1.6b4}/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()))

Shapely-1.6b4/shapely/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.6b4"

{Shapely-1.6b3 → Shapely-1.6b4}/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

{Shapely-1.6b3 → Shapely-1.6b4}/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"):

Shapely-1.6b3/VERSION.txt

@@ -1 +0,0 @@
-1.6b3

Shapely-1.6b3/packaging-15.3.dist-info/DESCRIPTION.rst

@@ -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.
-
-

Shapely-1.6b3/packaging-15.3.dist-info/METADATA

@@ -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: donald@stufft.io
-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.
-
-

Shapely-1.6b3/packaging-15.3.dist-info/RECORD

@@ -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

Shapely-1.6b3/packaging-15.3.dist-info/WHEEL

@@ -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
-

Shapely-1.6b3/packaging-15.3.dist-info/metadata.json

@@ -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": "donald@stufft.io"}], "document_names": {"description": "DESCRIPTION.rst"}}}, "generator": "bdist_wheel (0.24.0)", "version": "15.3", "metadata_version": "2.0", "name": "packaging", "classifiers": ["Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4"]}

Shapely-1.6b3/packaging-15.3.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "099fe4e", "is_release": true}

Shapely-1.6b3/packaging-15.3.dist-info/top_level.txt

@@ -1 +0,0 @@
-packaging

Shapely-1.6b3/shapely/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.6b3"