[python-shapely] 07/14: Merge tag 'upstream/1.5.12'

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository python-shapely.

commit 9d9a853cf028f074d5c3710ce9c6f2acc3c72cc2
Merge: 131ecbb 80673a5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 28 15:23:37 2015 +0200

    Merge tag 'upstream/1.5.12'
    
    Upstream version 1.5.12
    
    Conflicts:
    	CHANGES.txt
    	README.rst
    	docs/manual.rst
    	setup.py
    	shapely/__init__.py
    	shapely/geos.py
    	shapely/speedups/__init__.py
    	tests/test_predicates.py

 .gitignore                     |   5 +
 CHANGES.txt                    |  19 ++++
 README.rst                     |   7 +-
 docs/manual.rst                |  42 +++++++-
 requirements-dev.txt           |   1 +
 setup.py                       | 193 +++++++++++++++++++++++----------
 shapely/__init__.py            |   2 +-
 shapely/affinity.py            |  12 +--
 shapely/ctypes_declarations.py |  22 +++-
 shapely/geometry/base.py       |  29 +++--
 shapely/geometry/linestring.py |  15 +--
 shapely/geometry/multipoint.py |   2 +-
 shapely/geometry/polygon.py    |   4 +-
 shapely/geos.py                | 150 ++++++--------------------
 shapely/impl.py                |  31 +++++-
 shapely/libgeos.py             | 235 +++++++++++++++++++++++++++++++++++++++++
 shapely/linref.py              |   4 +-
 shapely/speedups/__init__.py   |   2 +-
 tests/__init__.py              |   7 +-
 tests/test_default_impl.py     |  24 +++++
 tests/test_dlls.py             |   5 +-
 tests/test_locale.py           |   5 +-
 tests/test_multi.py            |   8 ++
 tests/test_multilinestring.py  |  10 +-
 tests/test_multipoint.py       |   9 +-
 tests/test_multipolygon.py     |  10 +-
 tests/test_operations.py       |  11 +-
 tests/test_parallel_offset.py  |  33 ++++++
 tests/test_predicates.py       |  23 +++-
 29 files changed, 693 insertions(+), 227 deletions(-)

diff --cc setup.py
index 9748470,34d7969..4ef9de9
--- a/setup.py
+++ b/setup.py
@@@ -209,24 -288,27 +288,30 @@@ except ImportError
  
  try:
      # try building with speedups
-     existing_build_ext = setup_args['cmdclass'].get('build_ext', distutils_build_ext)
-     setup_args['cmdclass']['build_ext'] = construct_build_ext(existing_build_ext)
-     setup(
-         ext_modules=ext_modules,
-         **setup_args
-     )
+     existing_build_ext = setup_args['cmdclass'].\
+         get('build_ext', distutils_build_ext)
+     setup_args['cmdclass']['build_ext'] = \
+         construct_build_ext(existing_build_ext)
+     setup(ext_modules=ext_modules, **setup_args)
  except BuildFailed as ex:
-     BUILD_EXT_WARNING = "Warning: The C extension could not be compiled, " \
+     BUILD_EXT_WARNING = "The C extension could not be compiled, " \
                          "speedups are not enabled."
-     print(ex)
-     print(BUILD_EXT_WARNING)
-     print("Failure information, if any, is above.")
-     print("I'm retrying the build without the C extension now.")
+     log.warn(ex)
+     log.warn(BUILD_EXT_WARNING)
+     log.warn("Failure information, if any, is above.")
+     log.warn("I'm retrying the build without the C extension now.")
+ 
+     # Remove any previously defined build_ext command class.
+     if 'build_ext' in setup_args['cmdclass']:
+         del setup_args['cmdclass']['build_ext']
+ 
+     if 'build_ext' in cmd_classes:
+         del cmd_classes['build_ext']
  
 +    if 'build_ext' in cmd_classes:
 +        del cmd_classes['build_ext']
 +
      setup(**setup_args)
  
-     print(BUILD_EXT_WARNING)
-     print("Plain-Python installation succeeded.")
+     log.warn(BUILD_EXT_WARNING)
+     log.info("Plain-Python installation succeeded.")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git