[fiona] 02/02: Merge tag 'upstream/1.6.0'

[Johan Van de Wauw]

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

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

commit b3ddd15a63eb45e84d77e8e1c66a6f1bac9c070c
Merge: 63c804d 021f300
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Sun Aug 2 01:01:03 2015 +0200

    Merge tag 'upstream/1.6.0'
    
    Upstream version 1.6.0

 CHANGES.txt                   |   9 ++
 CREDITS.txt                   |  44 +++++----
 README.rst                    |  19 ++++
 fiona/__init__.py             |   8 +-
 fiona/_drivers.pyx            |   1 +
 fiona/_geometry.pxd           |  20 ++--
 fiona/collection.py           |  40 +++++++-
 fiona/fio/bounds.py           |   9 +-
 fiona/fio/cat.py              | 138 ++++++++++++++++++++++-----
 fiona/fio/cli.py              |  61 ------------
 fiona/fio/fio.py              | 202 ----------------------------------------
 fiona/fio/helpers.py          |  33 +++++++
 fiona/fio/info.py             |  99 ++++++++++++++++++++
 fiona/fio/main.py             |  36 +++++++
 fiona/fio/options.py          |   8 ++
 fiona/inspector.py            |  15 +--
 fiona/ograpi.pxd              |  10 ++
 fiona/ogrext.pyx              |  20 ++++
 requirements-dev.txt          |   2 +-
 setup.py                      |  80 +++++++++++-----
 tests/fixtures.py             |   7 ++
 tests/test_bytescollection.py | 212 ++++++++++++++++++++++++++++++++++++++++++
 tests/test_cli.py             |  17 ++--
 tests/test_fio_cat.py         |   4 +-
 tests/test_fio_load.py        |  69 ++++++++++++--
 25 files changed, 794 insertions(+), 369 deletions(-)

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