[python-shapely] 03/14: Imported Upstream version 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 80673a5c784cb5faf751b8d7b438d2458125539b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 28 14:51:54 2015 +0200

    Imported Upstream version 1.5.12
---
 .gitignore           |  4 ++++
 CHANGES.txt          |  9 +++++++++
 shapely/__init__.py  |  2 +-
 shapely/affinity.py  | 12 ++++++------
 shapely/libgeos.py   |  5 ++---
 tests/test_dlls.py   |  3 ++-
 tests/test_locale.py |  5 ++++-
 7 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 76a880b..e2e2f2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,7 @@ docs/_build/
 docs/shapely.*.txt
 docs/shapely.txt
 docs/modules.txt
+.cache/
+.idea/
+*.pyd
+*.pdb
diff --git a/CHANGES.txt b/CHANGES.txt
index 606bdd1..3257c36 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,15 @@
 Changes
 =======
 
+1.5.12 (2015-08-27)
+-------------------
+- 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).
+
 1.5.11 (2015-08-23)
 -------------------
 - Remove packaging module requirement added in 1.5.10 (#305). Distutils can't 
diff --git a/shapely/__init__.py b/shapely/__init__.py
index 9e78465..da34e60 100644
--- a/shapely/__init__.py
+++ b/shapely/__init__.py
@@ -1 +1 @@
-__version__ = "1.5.11"
+__version__ = "1.5.12"
diff --git a/shapely/affinity.py b/shapely/affinity.py
index a45ca3c..7ab7504 100755
--- a/shapely/affinity.py
+++ b/shapely/affinity.py
@@ -11,33 +11,33 @@ def affine_transform(geom, matrix):
     The coefficient matrix is provided as a list or tuple with 6 or 12 items
     for 2D or 3D transformations, respectively.
 
-    For 2D affine transformations, the 6 parameter matrix is:
+    For 2D affine transformations, the 6 parameter matrix is::
 
         [a, b, d, e, xoff, yoff]
 
-    which represents the augmented matrix:
+    which represents the augmented matrix::
 
                             / a  b xoff \ 
         [x' y' 1] = [x y 1] | d  e yoff |
                             \ 0  0   1  /
 
-    or the equations for the transformed coordinates:
+    or the equations for the transformed coordinates::
 
         x' = a * x + b * y + xoff
         y' = d * x + e * y + yoff
 
-    For 3D affine transformations, the 12 parameter matrix is:
+    For 3D affine transformations, the 12 parameter matrix is::
 
         [a, b, c, d, e, f, g, h, i, xoff, yoff, zoff]
 
-    which represents the augmented matrix:
+    which represents the augmented matrix::
 
                                  / a  b  c xoff \ 
         [x' y' z' 1] = [x y z 1] | d  e  f yoff |
                                  | g  h  i zoff |
                                  \ 0  0  0   1  /
 
-    or the equations for the transformed coordinates:
+    or the equations for the transformed coordinates::
 
         x' = a * x + b * y + c * z + xoff
         y' = d * x + e * y + f * z + yoff
diff --git a/shapely/libgeos.py b/shapely/libgeos.py
index 8bae437..e35a854 100644
--- a/shapely/libgeos.py
+++ b/shapely/libgeos.py
@@ -10,16 +10,15 @@ used. Otherwise GEOS_CONFIG can be set to a path to `geos-config`. If
 be used to help better guess the name for the GEOS C dynamic library.
 """
 
+from ctypes import CDLL, cdll, c_void_p, c_char_p
+from ctypes.util import find_library
 import os
 import logging
 import re
 import subprocess
 import sys
-from ctypes import CDLL, cdll, c_void_p, c_char_p
-from ctypes.util import find_library
 
 
-logging.basicConfig()
 log = logging.getLogger(__name__)
 if 'all' in sys.warnoptions:
     log.level = logging.DEBUG
diff --git a/tests/test_dlls.py b/tests/test_dlls.py
index a887411..55db556 100644
--- a/tests/test_dlls.py
+++ b/tests/test_dlls.py
@@ -1,13 +1,14 @@
 from . import unittest
 
 from shapely.libgeos import load_dll
+import sys
 
 
 class LoadingTestCase(unittest.TestCase):
 
     def test_load(self):
         self.assertRaises(OSError, load_dll, 'geosh_c')
-
+    @unittest.skipIf(sys.platform == "win32", "FIXME: adapt test for win32")
     def test_fallbacks(self):
         load_dll('geos_c', fallbacks=[
             '/opt/local/lib/libgeos_c.dylib',  # MacPorts
diff --git a/tests/test_locale.py b/tests/test_locale.py
index 2041c2c..d9df871 100644
--- a/tests/test_locale.py
+++ b/tests/test_locale.py
@@ -34,7 +34,10 @@ def setUpModule():
 
 
 def tearDownModule():
-    locale.resetlocale()
+    if sys.platform == 'win32':
+        locale.setlocale(locale.LC_ALL, "")
+    else:
+        locale.resetlocale()
 
 
 class LocaleTestCase(unittest.TestCase):

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