Changeset 1176

Timestamp:

01/05/09 14:20:01 (15 months ago)

Author:

seang

Message:

Increment version, note branching, remove obsolete linestring factory test.

Location:

Shapely/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• setup.py (modified) (3 diffs)
• shapely/factory.py (modified) (1 diff)
• shapely/geometry/point.py (modified) (1 diff)
• tests/test_linestring.py (modified) (1 diff)

Shapely/trunk/CHANGES.txt

@@ -1 +1 @@
 All tickets are children of http://trac.gispython.org/lab/ticket.
+
+1.1.0 (2009-01-?)
+-----------------
+- Creation of a branch for maintenance of 1.0.
+- New, cleaner GEOS geometry factories, nearly complete test coverage.
 
 1.0.11 (2008-11-20)

Shapely/trunk/setup.py

@@ -4 +4 @@
 # Require ctypes egg only for Python < 2.5
 install_requires = ['setuptools']
-#if version_info[:2] < (2,5):
-#    install_requires.append('ctypes')
 
 # Get text from README.txt
@@ -11 +9 @@
 
 setup(name          = 'Shapely',
-      version       = '1.0.12',
+      version       = '1.1.0',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
@@ -26 +24 @@
       test_suite = 'tests.test_suite',
       classifiers   = [
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'Intended Audience :: Science/Research',

Shapely/trunk/shapely/factory.py

@@ -180 +180 @@
     # update_ndim: number of dimensions of that geometry
     q = point_seq(ob)
-    m, n = shape(q)    
+    m, n = shape(q)
+    if m < 2:
+        raise ValueError, "Insufficient number of coordinate tuples"
     cs = _init_sequence(update_geom, update_ndim, m, n)
     for i, coords in enumerate(q):

Shapely/trunk/shapely/geometry/point.py

@@ -195 +195 @@
       >>> items = sorted(a.__array_interface__.items())
       >>> items # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE
-      [('data', <shapely.geometry.point.c_double_Array_2 object at ...>), 
+      [('data', <...c_double_Array_2 object at 0x...>), 
       ('shape', (2,)), 
       ('typestr', '<f8'), 

Shapely/trunk/tests/test_linestring.py

@@ -114 +114 @@
                           array([0, 0])
                           )
-
-    def test_coords_update(self):
-        p = linestring.LineString(((0.0, 0.0), (1.0, 1.0)))
-        linestring.update_linestring_from_py(p, ((1.0, 1.0), (2.0, 2.0)))
-        self.assertRaises(ValueError,
-                          linestring.update_linestring_from_py,
-                          p, [[1.0, 1.0, 1.0], [2.0, 2.0, 2.0]]
-                          )
-                               
-    def test_coords_update_numpy(self):
-        p = linestring.LineString(((0.0, 0.0), (1.0, 1.0)))
-        linestring.update_linestring_from_py(p, array([[1.0, 1.0], [2.0, 2.0]]))
-        self.assertRaises(ValueError,
-                          linestring.update_linestring_from_py,
-                          p, array([[1.0, 1.0, 1.0], [2.0, 2.0, 2.0]])
-                          )
-        
-