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

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

commit 651016f70967b2dddc97d81f3057beb1b423d4c2
Merge: 350cd22 781d44b
Author: Pietro Battiston <m...@pietrobattiston.it>
Date:   Fri Feb 11 11:25:16 2011 +0100

    Merge commit 'upstream/1.2.8'
    
    Conflicts:
        PKG-INFO
        Shapely.egg-info/PKG-INFO
        docs/_build/html/_sources/manual.txt
        docs/manual.txt
        setup.py
        shapely/impl.py
        shapely/tests/__init__.py
        shapely/tests/test_delegated.py
        shapely/tests/test_dlls.py

 CHANGES.txt                              |   28 +-
 MANIFEST.in                              |    7 -
 PKG-INFO                                 |    2 +-
 Shapely.egg-info/PKG-INFO                |    2 +-
 Shapely.egg-info/SOURCES.txt             |    6 +-
 docs/_build/html/_sources/manual.txt     | 1789 ------------------------------
 docs/manual.txt                          |   14 +-
 setup.py                                 |   15 +-
 shapely/ctypes_declarations.py           |    3 +
 shapely/ftools.py                        |   78 ++
 shapely/geometry/base.py                 |   14 +-
 shapely/geometry/collection.py           |    5 +-
 shapely/geometry/linestring.py           |   33 +-
 shapely/geometry/polygon.py              |   10 +-
 shapely/geos.py                          |   13 +-
 shapely/impl.py                          |    5 +-
 shapely/tests/__init__.py                |    5 +-
 shapely/tests/cascaded_union.txt         |    2 +-
 shapely/tests/linear-referencing.txt     |   58 -
 shapely/tests/test_collection.py         |    1 +
 shapely/tests/test_delegated.py          |    8 +-
 shapely/tests/test_dlls.py               |    5 +-
 shapely/tests/test_linear_referencing.py |   67 ++
 shapely/tests/test_products_z.py         |   14 +
 24 files changed, 290 insertions(+), 1894 deletions(-)

diff --cc CHANGES.txt
index b006bbc,eefb494..3684109
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,31 +1,38 @@@
- All tickets are children of http://trac.gispython.org/lab/ticket.
+ 1.2.8 (2011-12-03)
+ ------------------
+ - New parallel_offset method (#6).
+ - Support for Python 2.4.
+ 
+ 1.2.7 (2010-11-05)
+ ------------------
+ - Support for Windows eggs.
+ 
+ 1.2.6 (2010-10-21)
+ ------------------
+ - The geoms property of an empty collection yields [] instead of a ValueError
+   (#3).
+ - The coords and geometry type sproperties have the same behavior as above.
+ - Ensure that z values carry through into products of operations (#4).
+ 
+ 1.2.5 (2010-09-19)
+ ------------------
+ - Stop distributing docs/_build.
+ - Include library fallbacks in test_dlls.py for linux platform.
+ 
+ 1.2.4 (2010-09-09)
+ ------------------
+ - Raise AttributeError when there's no backend support for a method.
+ - Raise OSError if libgeos_c.so (or variants) can't be found and loaded.
+ - Add geos_c DLL loading support for linux platforms where find_library 
doesn't
+   work.
  
 +1.2.4 (2010-09-09)
 +------------------
 +- Raise AttributeError when there's no backend support for a method.
 +- Raise OSError if libgeos_c.so (or variants) can't be found and loaded.
 +- Add geos_c DLL loading support for linux platforms where find_library
 +  doesn't work.
 +
  1.2.3 (2010-08-17)
  ------------------
  - Add mapping function.

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to