[rasterio] 01/07: Merge tag 'upstream/0.25.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 rasterio.

commit af7b5318c6906bab07d6d2c15f31c7cb36d292c2
Merge: cf24dd1 3424e4f
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Wed Jul 22 21:25:25 2015 +0200

    Merge tag 'upstream/0.25.0'
    
    Upstream version 0.25.0

 AUTHORS.txt                |  13 +-
 CHANGES.txt                |  29 ++-
 README.rst                 | 121 +++++++------
 docs/cli.rst               | 131 +++++++++++++-
 rasterio/__init__.py       |   8 +-
 rasterio/_base.pxd         |   1 +
 rasterio/_base.pyx         |  40 +++-
 rasterio/_features.pxd     |  20 +-
 rasterio/_gdal.pxd         |   9 +
 rasterio/_io.pyx           |  70 +++++--
 rasterio/_warp.pyx         |  13 +-
 rasterio/crs.py            |  40 +++-
 rasterio/enums.py          |  15 +-
 rasterio/errors.py         |   9 +
 rasterio/rio/__init__.py   |   4 +-
 rasterio/rio/bands.py      |  16 +-
 rasterio/rio/calc.py       |  28 +--
 rasterio/rio/cli.py        | 255 --------------------------
 rasterio/rio/convert.py    | 105 +++++++++++
 rasterio/rio/features.py   | 175 +++++++++++++++---
 rasterio/rio/helpers.py    |  79 ++++++++
 rasterio/rio/info.py       | 305 ++++++++++++++++++++++++-------
 rasterio/rio/main.py       |  62 ++++---
 rasterio/rio/merge.py      |  27 ++-
 rasterio/rio/options.py    | 156 ++++++++++++++++
 rasterio/rio/overview.py   | 101 +++++++++++
 rasterio/rio/rio.py        | 203 ---------------------
 rasterio/rio/sample.py     |   4 +-
 rasterio/rio/warp.py       | 208 +++++++++++++++++++++
 rasterio/sample.py         |  10 +
 rasterio/tool.py           |  17 +-
 rasterio/warp.py           |  24 ++-
 requirements-dev.txt       |   2 +-
 setup.py                   |  24 ++-
 tests/data/RGB.byte.tif    | Bin 1713704 -> 1743350 bytes
 tests/test_cli_main.py     |  21 +++
 tests/test_colormap.py     |  26 ++-
 tests/test_crs.py          |  39 +++-
 tests/test_indexing.py     |  11 +-
 tests/test_meta.py         |  27 ++-
 tests/test_options.py      |  20 ++
 tests/test_overviews.py    |  40 ++++
 tests/test_profile.py      |  10 +
 tests/test_rio_cli.py      |  18 --
 tests/test_rio_convert.py  | 120 ++++++++++++
 tests/test_rio_helpers.py  |  23 +++
 tests/test_rio_info.py     | 443 ++++++++++++++++++++++++++++++++++++++++++++-
 tests/test_rio_merge.py    |  20 ++
 tests/test_rio_overview.py |  67 +++++++
 tests/test_rio_rio.py      | 182 -------------------
 tests/test_rio_warp.py     | 238 ++++++++++++++++++++++++
 tests/test_sampling.py     |   9 +
 tests/test_warp.py         |  24 ++-
 tests/test_write.py        |  20 ++
 54 files changed, 2694 insertions(+), 988 deletions(-)

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