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

johanvdw-guest pushed a commit to branch master
in repository fiona.

commit e0c5e25f462d53c12462ec4ef15b73c4f4a4cd2e
Author: Johan Van de Wauw <johan.vandew...@gmail.com>
Date:   Wed Jun 10 21:55:29 2015 +0200

    Imported Upstream version 1.5.1
---
 CHANGES.txt          |   4 ++
 MANIFEST.in          |   7 ++-
 README.rst           | 118 ++++++++++++++++++++++++++++++++-------------------
 fiona/__init__.py    |   2 +-
 requirements-dev.txt |   2 +-
 5 files changed, 83 insertions(+), 50 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6099533..23f4b97 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,10 @@
 Changes
 =======
 
+1.5.1 (2015-03-19)
+------------------
+- Restore test data to sdists by fixing MANIFEST.in (#216).
+
 1.5.0 (2015-02-02)
 ------------------
 - Finalize GeoJSON feature sequence options (#174).
diff --git a/MANIFEST.in b/MANIFEST.in
index 689e3e5..19e2824 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,9 +1,8 @@
 exclude *.txt *.py
 include CHANGES.txt CREDITS.txt LICENSE.txt VERSION.txt README.rst 
benchmark.py setup.py
 recursive-include docs *.rst *.txt
-recursive-include docs/data test_uk.dbf test_uk.prj test_uk.shp test_uk.shx
-recursive-exclude docs/data *.zip *.tar *.json
-recursive-exclude docs/data/testing *
+recursive-exclude docs/data *
 recursive-exclude docs/_build *
-recursive-include tests *.py *.txt
+recursive-include tests *.py
+recursive-include tests/data *
 exclude MANIFEST.in
diff --git a/README.rst b/README.rst
index bfebc1b..546a4b5 100644
--- a/README.rst
+++ b/README.rst
@@ -46,7 +46,7 @@ file, change their geometry attributes, and write them to a 
new data file.
 
         # Open a file for reading. We'll call this the "source."
         
-        with fiona.open('docs/data/test_uk.shp') as source:
+        with fiona.open('tests/data/coutwildrnp.shp') as source:
 
             # The file we'll write to, the "sink", must be initialized
             # with a coordinate system, a format driver name, and
@@ -64,7 +64,7 @@ file, change their geometry attributes, and write them to a 
new data file.
             with fiona.open('test_write.shp', 'w', **meta) as sink:
 
                 # Process only the records intersecting a box.
-                for f in source.filter(bbox=(-5.0, 55.0, 0.0, 60.0)):
+                for f in source.filter(bbox=(-107.0, 37.0, -105.0, 39.0)):
           
                     # Get a point on the boundary of the record's
                     # geometry.
@@ -102,12 +102,12 @@ provides an index ordered list of layer names.
 
     with fiona.drivers():
 
-        for layername in fiona.listlayers('docs/data'):
-            with fiona.open('docs/data', layer=layername) as c:
-                print(layername, len(c))
+        for layername in fiona.listlayers('tests/data'):
+            with fiona.open('tests/data', layer=layername) as src:
+                print(layername, len(src))
     
     # Output:
-    # test_uk 48
+    # (u'coutwildrnp', 67)
 
 Layer can also be specified by index. In this case, ``layer=0`` and
 ``layer='test_uk'`` specify the same layer in the data file or directory.
@@ -116,12 +116,12 @@ Layer can also be specified by index. In this case, 
``layer=0`` and
 
     with fiona.drivers():
 
-        for i, layername in enumerate(fiona.listlayers('docs/data')):
-            with fiona.open('docs/data', layer=i) as c:
-                print(i, layername, len(c))
+        for i, layername in enumerate(fiona.listlayers('tests/data')):
+            with fiona.open('tests/data', layer=i) as src:
+                print(i, layername, len(src))
     
     # Output:
-    # 0 test_uk 48
+    # (0, u'coutwildrnp', 67)
 
 Writing Multilayer data
 -----------------------
@@ -133,27 +133,26 @@ writing.
     
     with fiona.drivers():
 
-        with open('docs/data/test_uk.shp') as c:
-            meta = c.meta
-            f = next(c)
+        with open('tests/data/cowildrnp.shp') as src:
+            meta = src.meta
+            f = next(src)
     
-        with fiona.open('/tmp/foo', 'w', layer='bar', **meta) as c:
-            c.write(f)
+        with fiona.open('/tmp/foo', 'w', layer='bar', **meta) as dst:
+            dst.write(f)
     
         print(fiona.listlayers('/tmp/foo'))
-        # Output: ['bar']
-    
-        with fiona.open('/tmp/foo', layer='bar') as c:
-            print(len(c))
-            f = next(c)
+
+        with fiona.open('/tmp/foo', layer='bar') as src:
+            print(len(src))
+            f = next(src)
             print(f['geometry']['type'])
             print(f['properties'])
     
         # Output:
+        # [u'bar']
         # 1
         # Polygon
-        # {'FIPS_CNTRY': 'UK', 'POP_CNTRY': 60270708.0, 'CAT': 232.0, 
-        #  'AREA': 244820.0, 'CNTRY_NAME': 'United Kingdom'}
+        # OrderedDict([(u'PERIMETER', 1.22107), (u'FEATURE2', None), (u'NAME', 
u'Mount Naomi Wilderness'), (u'FEATURE1', u'Wilderness'), (u'URL', 
u'http://www.wilderness.net/index.cfm?fuse=NWPS&sec=wildView&wname=Mount%20Naomi'),
 (u'AGBUR', u'FS'), (u'AREA', 0.0179264), (u'STATE_FIPS', u'49'), 
(u'WILDRNP020', 332), (u'STATE', u'UT')])
 
 A view of the /tmp/foo directory will confirm the creation of the new files.
 
@@ -176,15 +175,15 @@ and write zipped Shapefiles.
         for i, layername in enumerate(
                 fiona.listlayers(
                     '/', 
-                    vfs='zip://docs/data/test_uk.zip')):
+                    vfs='zip://tests/data/coutwildrnp.zip')):
             with fiona.open(
                     '/', 
-                    vfs='zip://docs/data/test_uk.zip', 
-                    layer=i) as c:
-                print(i, layername, len(c))
+                    vfs='zip://tests/data/coutwildrnp.zip', 
+                    layer=i) as src:
+                print(i, layername, len(src))
     
     # Output:
-    # 0 test_uk 48
+    # (0, u'coutwildrnp', 67)
 
 Fiona CLI
 =========
@@ -195,13 +194,33 @@ info`` pretty prints information about a data file.
 
 .. code-block:: console
 
-    $ fio info docs/data/test_uk.shp
-    { 'bbox': (-8.621389, 49.911659, 1.749444, 60.844444),
-      'count': 48,
-      'crs': { u'datum': u'WGS84', u'no_defs': True, u'proj': u'longlat'},
-      'driver': u'ESRI Shapefile',
-      'schema': { 'geometry': 'Polygon',
-                  'properties': OrderedDict([(u'CAT', 'float:16'), 
(u'FIPS_CNTRY', 'str:80'), (u'CNTRY_NAME', 'str:80'), (u'AREA', 'float:15.2'), 
(u'POP_CNTRY', 'float:15.2')])}}
+    $ fio info --indent 2 tests/data/coutwildrnp.shp
+    {
+      "count": 67,
+      "crs": "EPSG:4326",
+      "driver": "ESRI Shapefile",
+      "bounds": [
+        -113.56424713134766,
+        37.0689811706543,
+        -104.97087097167969,
+        41.99627685546875
+      ],
+      "schema": {
+        "geometry": "Polygon",
+        "properties": {
+          "PERIMETER": "float:24.15",
+          "FEATURE2": "str:80",
+          "NAME": "str:80",
+          "FEATURE1": "str:80",
+          "URL": "str:101",
+          "AGBUR": "str:80",
+          "AREA": "float:24.15",
+          "STATE_FIPS": "str:80",
+          "WILDRNP020": "int:10",
+          "STATE": "str:80"
+        }
+      }
+    }
 
 Installation
 ============
@@ -215,17 +234,18 @@ To build from a repository copy, you will also need 
Cython to build C sources
 from the project's .pyx files. See the project's requirements-dev.txt file for
 guidance.
 
-The popular `Kyngchaos GDAL frameworks
+The `Kyngchaos GDAL frameworks
 <http://www.kyngchaos.com/software/frameworks#gdal_complete>`__ will satisfy
-the GDAL/OGR dependency for OS X. Fiona's author uses Homebrew (``brew install
-gdal``) on OS X.
+the GDAL/OGR dependency for OS X, as will Homebrew's GDAL Formula (``brew 
install
+gdal``).
 
 Python Requirements
 -------------------
 
-Fiona depends on the modules ``six`` and ``argparse``. The latter is standard
-in Python 2.7+. Easy_install and pip will fetch these requirements for you, but
-users installing Fiona from a Windows installer must get them separately.
+Fiona depends on the modules ``six``, ``cligj``, ``argparse``, and
+``ordereddict`` (the two latter modules are standard in Python 2.7+). Pip will
+fetch these requirements for you, but users installing Fiona from a Windows
+installer must get them separately.
 
 Unix-like systems
 -----------------
@@ -233,7 +253,9 @@ Unix-like systems
 Assuming you're using a virtualenv (if not, skip to the 4th command) and
 GDAL/OGR libraries, headers, and `gdal-config`_ program are installed to well
 known locations on your system via your system's package manager (``brew
-install gdal`` using Homebrew on OS X), installation is this simple::
+install gdal`` using Homebrew on OS X), installation is this simple.
+
+.. code-block:: console
 
   $ mkdir fiona_env
   $ virtualenv fiona_env
@@ -243,12 +265,21 @@ install gdal`` using Homebrew on OS X), installation is 
this simple::
 If gdal-config is not available or if GDAL/OGR headers and libs aren't
 installed to a well known location, you must set include dirs, library dirs,
 and libraries options via the setup.cfg file or setup command line as shown
-below (using ``git``)::
+below (using ``git``).
+
+.. code-block:: console
 
   (fiona_env)$ git clone git://github.com/Toblerity/Fiona.git
   (fiona_env)$ cd Fiona
   (fiona_env)$ python setup.py build_ext -I/path/to/gdal/include 
-L/path/to/gdal/lib -lgdal install
 
+Or specify that build options should be provided by a particular
+gdal-config program.
+
+.. code-block:: console
+
+  (fiona_env)$ GDAL_CONFIG=/path/to/gdal-config pip install .
+
 Windows
 -------
 
@@ -264,7 +295,7 @@ locations on your system (via your system's package 
manager), you can do this::
 
   (fiona_env)$ git clone git://github.com/Toblerity/Fiona.git
   (fiona_env)$ cd Fiona
-  (fiona_env)$ python setup.py develop
+  (fiona_env)$ pip install -e .
   (fiona_env)$ nosetests
 
 If you have a non-standard environment, you'll need to specify the include and
@@ -278,4 +309,3 @@ lib dirs and GDAL library on the command line::
 .. _Rtree: http://pypi.python.org/pypi/Rtree/
 .. _Shapely: http://pypi.python.org/pypi/Shapely/
 .. _gdal-config: http://www.gdal.org/gdal-config.html
-
diff --git a/fiona/__init__.py b/fiona/__init__.py
index 7e2f17a..70ba9ef 100644
--- a/fiona/__init__.py
+++ b/fiona/__init__.py
@@ -63,7 +63,7 @@ writing modes) flush contents to disk when their ``with`` 
blocks end.
 """
 
 __all__ = ['bounds', 'listlayers', 'open', 'prop_type', 'prop_width']
-__version__ = "1.5.0"
+__version__ = "1.5.1"
 
 import logging
 import os
diff --git a/requirements-dev.txt b/requirements-dev.txt
index a660828..2a82b05 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,4 @@
-Cython>=0.21
+cython==0.21.2
 nose
 pytest
 setuptools

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/fiona.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