[rasterio] branch upstream updated (35a7b2a -> 6bf9f19)

[Johan Van de Wauw]

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

johanvdw-guest pushed a change to branch upstream
in repository rasterio.

      from  35a7b2a   Imported Upstream version 0.28.0
       new  6bf9f19   Imported Upstream version 0.29.0

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml                    |  13 +++++-
 CHANGES.txt                    |   9 ++++
 CODE_OF_CONDUCT.md             |  22 ++++++++++
 rasterio/__init__.py           |   2 +-
 rasterio/_base.pyx             |  15 +++++--
 rasterio/rio/calc.py           |   5 ++-
 rasterio/rio/merge.py          |   1 +
 rasterio/rio/options.py        |   2 +
 requirements-dev.txt           |   2 +-
 requirements.txt               |   2 +-
 scripts/travis_gdal_install.sh |  91 +++++++++++++++++++++++++++++++++++++++++
 setup.py                       |   7 +---
 tests/data/shade.tif           | Bin 1050093 -> 1050234 bytes
 tests/test_options.py          |   2 +-
 tests/test_profile.py          |  21 ++++++++--
 15 files changed, 174 insertions(+), 20 deletions(-)
 create mode 100644 CODE_OF_CONDUCT.md
 create mode 100644 scripts/travis_gdal_install.sh

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