.gitignore

@@ -42,7 +42,7 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *,cover
-rasterio/_*.html
+rasterio/*.html
 
 # Translations
 *.mo
@@ -53,6 +53,10 @@ rasterio/_*.html
 
 # Sphinx documentation
 docs/_build/
+docs/rasterio.*.rst
+docs/rasterio.rst
+docs/_static
+docs/_templates
 
 # PyBuilder
 target/
@@ -63,19 +67,33 @@ venv/
 venv2/
 
 # rasterio
-test.tif
 gdal-config.txt
 VERSION.txt
 rasterio/_fill.cpp
 rasterio/_warp.cpp
 rasterio/_base.c
-rasterio/_copy.c
-rasterio/_drivers.c
 rasterio/_err.c
 rasterio/_example.c
 rasterio/_features.c
 rasterio/_io.c
 rasterio/_crs.c
+rasterio/_env.c
+rasterio/_shim.c
+rasterio/_shim.pyx
+rasterio/shutil.c
+tests/data/white-gemini-iv.zip
+.hypothesis/
 
 # vim
 .*.swp
+
+# Random local dev files
+ignore/
+.env
+.DS_Store
+*.pybkup
+*.c
+MANIFEST
+.ipynb_checkpoints
+.pytest_cache
+*.ipynb

.travis.yml

@@ -10,51 +10,53 @@ env:
     - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels
     - GDALINST=$HOME/gdalinstall
     - GDALBUILD=$HOME/gdalbuild
-    - secure: "hvRtEFBJ7qoRNxM+xCcSp4RAXMIRhllFtXZbEAs8xdz6ov3DHBB16QKXLIQ713R9gQHsoyZkEShLSU22pqD/37EqdFtGQ7V6iICfVZMzUp4YLxbw2JClT4MHmjTzbtrkh4LvxpUS2e+sZUukFisfYiNgklDyaNPTl15f0YFTr18="
-    - secure: "xYB0j68QKkKTHa2fdVTr8SAmge8FITZCLyIcdIVdc0PcowEHXEgYcGScXYgWUarQrpfshBlf7xV8jRMzLSWj8ut5k52ozRunm1tjSYhHrROQhZIntfuFgEkF7N05o144XslrrESh6L0q6scFMPvOOepHRMbiApYLhTHRAhHFp7Q="
   matrix:
-    - GDALVERSION="1.9.2"
-    - GDALVERSION="1.10.0"  # doesn't exist but path/lib will fall back to system
-    - GDALVERSION="1.11.4"
-    - GDALVERSION="2.0.2"
-    - GDALVERSION="2.1.0"
+    - GDALVERSION="1.11.5"
+    - GDALVERSION="2.0.3"
+    - GDALVERSION="2.1.4"
+    - GDALVERSION="2.2.1"
+    - GDALVERSION="2.2.2"
+    - GDALVERSION="2.2.3"
+    - GDALVERSION="master"
+
+matrix:
+  allow_failures:
+    - env: GDALVERSION="master"
+
 addons:
   apt:
     packages:
-    - libgdal1h
     - gdal-bin
     - libproj-dev
     - libhdf5-serial-dev
-    - libpng-dev
     - libgdal-dev
     - libatlas-dev
     - libatlas-base-dev
     - gfortran
 python:
   - "2.7"
-  - "3.4"
-  - "3.5"
+  - "3.6"
 before_script: # configure a headless display to test matplotlib
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
   - "sleep 3"
 before_install:
-  - pip install -U pip
-  - pip install wheel
-  - . ./scripts/travis_gdal_install.sh
+  - python -m pip install -U pip
+  - python -m pip install wheel
+  - travis_wait . ./scripts/travis_gdal_install.sh
   - export PATH=$GDALINST/gdal-$GDALVERSION/bin:$PATH
   - export LD_LIBRARY_PATH=$GDALINST/gdal-$GDALVERSION/lib:$LD_LIBRARY_PATH
 install:
-  - "if [ $(gdal-config --version) == \"$GDALVERSION\" ]; then echo \"Using gdal $GDALVERSION\"; else echo \"NOT using gdal $GDALVERSION as expected; aborting\"; exit 1; fi"
-  - "pip wheel -r requirements-dev.txt"
-  - "pip install -r requirements-dev.txt"
-  - "pip install --upgrade --force-reinstall --global-option=build_ext --global-option='-I$GDALINST/gdal-$GDALVERSION/include' --global-option='-L$GDALINST/gdal-$GDALVERSION/lib' --global-option='-R$GDALINST/gdal-$GDALVERSION/lib' -e ."
-  - "pip install coveralls>=1.1"
-  - "pip install -e .[test]"
-  - "pip install -e .[plot]"
+  - "if [ \"$GDALVERSION\" == \"master\" -o $(gdal-config --version) == \"$GDALVERSION\" ]; then echo \"Using gdal $GDALVERSION\"; else echo \"NOT using gdal $GDALVERSION as expected; aborting\"; exit 1; fi"
+  - "python -m pip wheel -r requirements-dev.txt"
+  - "python -m pip install -r requirements-dev.txt"
+  - "GDAL_CONFIG=$GDALINST/gdal-$GDALVERSION/bin/gdal-config python -m pip install --upgrade --force-reinstall -e .[test,plot]"
+  - "python -m pip install coveralls>=1.1"
   - "rio --version"
   - "rio --gdal-version"
+  - "python -m pip list"
 script:
-  - py.test --cov rasterio --cov-report term-missing
+  - "if [[ $TRAVIS_PYTHON_VERSION == 3.5 && $GDALVERSION == 2.1.0 ]]; then python -m pytest --doctest-ignore-import-errors --doctest-glob='*.rst' docs/*.rst -k 'not index and not quickstart and not switch' ; fi"
+  - python -m pytest -rxXs --cov rasterio --cov-report term-missing
 after_success:
   - coveralls || echo "!! intermittent coveralls failure"

AUTHORS.txt

 Authors
 -------
 
-* Sean Gillies <sean@mapbox.com>
-* Matthew Perry <perrygeo@gmail.com>
-* Brendan Ward <bcward@consbio.org>
-* Colin Talbert <talbertc@usgs.gov>
-* Erik Seglem <erik.seglem@gmail.com>
-* James McBride <jmcbride@berkeley.edu>
-* Kevin Wurster <wursterk@gmail.com>
-* James Hiebert <hiebert@uvic.ca>
-* Amit Kapadia <amit@planet.com>
-* Kelsey Jordahl <kjordahl@alum.mit.edu>
-* dnomadb <damon@mapbox.com>
-* Even Rouault <even.rouault@spatialys.com>
-* Ryan Grout <rgrout@continuum.io>
-* Maxim Dubinin <sim@gis-lab.info>
-* Joshua Arnott <josh@snorfalorpagus.net>
-* Mike Toews <mwtoews@gmail.com>
-* Johan Van de Wauw <johan.vandewauw@gmail.com>
-* Alessandro Amici <alexamici@gmail.com>
-* mwtoews <mwtoews@gmail.com>
-* Robin Wilson <robin@rtwilson.com>
-* Jacques Tardie <hi@jacquestardie.org>
-* Jeffrey Gerard <jgerard@climate.com>
-* Nat Wilson <njwilson23@gmail.com>
-* Martijn Visser <mgvisser@gmail.com>
-* grovduck <matt.gregory@oregonstate.edu>
-* Patrick Young <patrick.young@digitalglobe.com>
-* Aldo Culquicondor <alculquicondor@gmail.com>
-* Etienne B. Racine <etiennebr@gmail.com>
-* Charlie Loyd <charlie@mapbox.com>
-* Talbert <talbertc@usgs.gov>
-* Trevor R.H. Clarke <tclarke@ball.com>
-* Alexander <spatial.hast@gmail.com>
-* cgohlke <cgohlke@uci.edu>
-* Bas Couwenberg <sebastic@xs4all.nl>
-* Matt Savoie <github@flamingbear.com>
-* James Seppi <james.seppi@gmail.com>
-
-See also https://github.com/mapbox/rasterio/graphs/contributors.
+* Sean Gillies
+* Matthew Perry
+* Kevin Wurster
+* Brendan Ward
+* Jonas Sølvsteen
+* Colin Talbert
+* James McBride
+* Erik Seglem
+* Vincent Sarago
+* Seth Fitzsimmons
+* James Hiebert
+* Amit Kapadia
+* Damon Burgett
+* Even Rouault
+* Kelsey Jordahl
+* Maxim Dubinin
+* Ryan Grout
+* Joshua Arnott
+* AsgerPetersen
+* Mike Toews
+* Nick Grue
+* Alessandro Amici
+* Bas Couwenberg
+* Frédéric Bonifas
+* Ben Lewis
+* Johan Van
+* Chris Holdgraf
+* morrme
+* Chris Holden
+* cgohlke
+* Andrew Catellier
+* mwtoews
+* Martin Kaesberger
+* ngrue
+* Nat Wilson
+* Juan Luis
+* Gregory Raevski
+* Tyler Erickson
+* Jeffrey Gerard
+* Jacques Tardie
+* Robin Wilson
+* Jonas
+* asmith26
+* Aldo Culquicondor
+* Alexander Ivanov
+* Ariel Zerahia
+* Charlie Loyd
+* Damien Ayers
+* Dan Baston
+* Etienne B.
+* Filipe
+* Guy Doulberg
+* James Seppi
+* Jeremy Hooke
+* Jesse Crocker
+* Joris Van
+* Kirill Kouzoubov
+* Martijn Visser
+* Matt Savoie
+* Patrick Young
+* Pratik Yadav
+* Sam Murphy
+* Talbert
+* Trevor R.H.
+* Vincent Schut
+* Alan D.
+* grovduck

CONTRIBUTING.rst

 Welcome to the Rasterio project. Here's how we work.
 
 Code of Conduct
-===============
+---------------
 
 First of all: the Rasterio project has a code of conduct. Please read the
 CODE_OF_CONDUCT.txt file, it's important to all of us.
 
 Rights
-======
+------
 
 The BSD license (see LICENSE.txt) applies to all contributions.
 
 Issue Conventions
-=================
+-----------------
+
+The Rasterio issue tracker is for actionable issues.
+
+Questions about installation, distribution, and usage should be taken to 
+the project's `general discussion group
+<https://rasterio.groups.io/g/main>`__. Opened issues which fall into one
+of these three categories may be perfunctorily closed.
+
+Questions about development of Rasterio, brainstorming, requests for comment,
+and not-yet-actionable proposals are welcome in the project's 
+`developers discussion group <https://rasterio.groups.io/g/dev>`__. Issues
+opened in Rasterio's GitHub repo which haven't been socialized there may be
+perfunctorily closed.
 
 Rasterio is a relatively new project and highly active. We have bugs, both
 known and unknown.
@@ -31,10 +44,8 @@ using the ``$ rio`` CLI logging can be enabled with ``$ rio -v`` and verbosity
 can be increased with ``-vvv``.  Short scripts and datasets demonstrating the
 issue are especially helpful!
 
-Rasterio is not at 1.0 yet and issues proposing new features are welcome.
-
 Design Principles
-=================
+-----------------
 
 Rasterio's API is different from GDAL's API and this is intentional.
 
@@ -50,8 +61,19 @@ Rasterio's API is different from GDAL's API and this is intentional.
   inputs. This is challenging in practice because GDAL embraces global
   variables.
 
+Dataset Objects
+---------------
+
+Our term for the kind of object that allows read and write access to raster data
+is *dataset object*. A dataset object might be an instance of `DatasetReader`
+or `DatasetWriter`. The canonical way to create a dataset object is by using the
+`rasterio.open()` function.
+
+This is analogous to Python's use of 
+`file object <https://docs.python.org/3/glossary.html#term-file-object>`__.
+
 Git Conventions
-===============
+---------------
 
 We use a variant of centralized workflow described in the `Git Book
 <https://git-scm.com/book/en/v2/Distributed-Git-Distributed-Workflows>`__.  We
@@ -66,7 +88,7 @@ to give other developers a heads up and to provide an opportunity for valuable
 early feedback.
 
 Code Conventions
-================
+----------------
 
 The ``rasterio`` namespace contains both Python and C extension modules. All
 C extension modules are written using `Cython <http://cython.org/>`__. The
@@ -83,11 +105,11 @@ We strongly prefer code adhering to `PEP8
 
 Tests are mandatory for new features. We use `pytest <https://pytest.org>`__.
 
-We aspire to 100% coverage for Python modules but overage of the Cython code is
+We aspire to 100% coverage for Python modules but coverage of the Cython code is
 a future aspiration (`#515 <https://github.com/mapbox/rasterio/issues/515>`__).
 
 Development Environment
-=======================
+-----------------------
 
 Developing Rasterio requires Python 2.7 or any final release after and
 including 3.4.  We prefer developing with the most recent version of Python
@@ -98,7 +120,7 @@ with C or C++.  See the Windows install instructions in the `readme
 <README.rst>`__ for more information about building on Windows.
 
 Initial Setup
--------------
+^^^^^^^^^^^^^
 
 First, clone Rasterio's ``git`` repo:
 
@@ -116,7 +138,7 @@ for the executable.  If this occurs try deactivating and reactivating the
 environment.
 
 Installing GDAL
----------------
+^^^^^^^^^^^^^^^
 
 The GDAL library and its headers are required to build Rasterio. We do not
 have currently have guidance for any platforms other than Linux and OS X.
@@ -128,7 +150,7 @@ package manager. For Ubuntu the commands are:
 
     $ sudo add-apt-repository ppa:ubuntugis/ppa
     $ sudo apt-get update
-    $ sudo apt-get install libgdal1h gdal-bin libgdal-dev
+    $ sudo apt-get install gdal-bin libgdal-dev
 
 On OS X, Homebrew is a reliable way to get GDAL.
 
@@ -137,7 +159,7 @@ On OS X, Homebrew is a reliable way to get GDAL.
     $ brew install gdal
 
 Python build requirements
--------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Provision a virtualenv with Rasterio's build requirements.  Rasterio's
 ``setup.py`` script will not run unless Cython and Numpy are installed, so do
@@ -157,11 +179,11 @@ then:
     $ pip install -r requirements-dev.txt
 
 Installing Rasterio
--------------------
+^^^^^^^^^^^^^^^^^^^
 
 Rasterio, its Cython extensions, normal dependencies, and dev dependencies can
 be installed with ``$ pip``.  Installing Rasterio in editable mode while
-developing is very but only affects the Python files.  Specifying the
+developing is very convenient but only affects the Python files.  Specifying the
 ``[test]`` extra in the command below tells ``$ pip`` to also install
 Rasterio's dev dependencies.
 
@@ -188,7 +210,7 @@ The dependencies required to build the docs can be installed with:
     $ pip install -e .[docs]
 
 Running the tests
------------------
+^^^^^^^^^^^^^^^^^
 
 Rasterio's tests live in ``tests <tests/>`` and generally match the main
 package layout.

ISSUE_TEMPLATE.md

+<!--
+
+WELCOME ABOARD!
+
+Hi and welcome to the Rasterio project. We appreciate bug reports, questions
+about documentation, and suggestions for new features. This issue template
+isn't intended to ward you off; only to intercept and redirect some particular
+categories of reports, and to collect a few important facts that issue reporters
+often omit.
+
+The primary forum for questions about installation and usage of Rasterio is 
+https://rasterio.groups.io/g/main. The authors and other users will answer 
+questions when they have expertise to share and time to explain. Please take the
+time to craft a clear question and be patient about responses.
+
+Please do not bring these questions to Rasterio's issue tracker, which we want
+to reserve for bug reports and other actionable issues.
+
+Please note: Rasterio contains extension modules and is thus susceptible to
+C library compatibility issues. If you are reporting an installation or module
+import issue, please note that this project only accepts reports about problems
+with packages downloaded from the Python Package Index. Conda users should take
+issues to one of the following trackers:
+
+- https://github.com/ContinuumIO/anaconda-issues/issues
+- https://github.com/conda-forge/rasterio-feedstock
+
+Also please note: we are currently working on 1.0 and pre-releases. Bugs found
+in version 0.36 will not be fixed except in a 1.0 alpha or beta release. In 
+some cases, 0.36 bugs have already been fixed in recent pre-releases.
+
+You think you've found a bug? We believe you!
+-->
+
+## Expected behavior and actual behavior.
+
+For example: I expected to read a band from a file and an exception occurred.
+
+## Steps to reproduce the problem.
+
+For example: a brief script with required inputs.
+
+## Operating system
+
+For example: Mac OS X 10.12.3.
+
+## Rasterio version and provenance
+
+For example: the 1.0a11 manylinux1 wheel installed from PyPI using pip 9.0.1.

MANIFEST.in

 exclude *.rst *.txt *.py
 include CHANGES.txt AUTHORS.txt LICENSE.txt VERSION.txt README.rst setup.py
-include rasterio/rasterfill.cpp
+include rasterio/*.c rasterio/*.cpp
+exclude rasterio/_shim.c
 recursive-include examples *.py
 recursive-include tests *.py *.rst
 recursive-exclude tests/data *.tif

Makefile

+all: deps clean install test
+
+.PHONY: docs
+
+install:
+	python setup.py build_ext
+	pip install -e .[all]
+
+deps:
+	pip install -r requirements-dev.txt
+
+clean:
+	pip uninstall -y rasterio || echo "no need to uninstall"
+	python setup.py clean --all
+	find . -name '__pycache__' -delete -print -o -name '*.pyc' -delete -print
+	touch rasterio/*.pyx
+
+test:
+	py.test --maxfail 1 -v --cov rasterio --cov-report html --pdb tests
+
+docs:
+	cd docs && make apidocs && make html
+
+doctest:
+	py.test --doctest-modules rasterio --doctest-glob='*.rst' docs/*.rst
\ No newline at end of file

README.rst

@@ -2,7 +2,7 @@
 Rasterio
 ========
 
-Rasterio reads and writes geospatial raster data files.
+Rasterio reads and writes geospatial raster data.
 
 .. image:: https://travis-ci.org/mapbox/rasterio.png?branch=master
    :target: https://travis-ci.org/mapbox/rasterio
@@ -10,11 +10,13 @@ Rasterio reads and writes geospatial raster data files.
 .. image:: https://coveralls.io/repos/github/mapbox/rasterio/badge.svg?branch=master
    :target: https://coveralls.io/github/mapbox/rasterio?branch=master
 
-Rasterio employs GDAL to read and writes files using GeoTIFF and many other
-formats. Its API uses familiar Python and SciPy interfaces and idioms like
-context managers, iterators, and ndarrays.
+Geographic information systems use GeoTIFF and other formats to organize and
+store gridded, or raster, datasets. Rasterio reads and writes these formats and
+provides a Python API based on N-D arrays.
 
-Documentation is published at https://mapbox.github.io/rasterio/.
+Rasterio supports Python 2.7 and 3.3-3.6 on Linux and Mac OS X.
+
+Read the documentation for more details: https://rasterio.readthedocs.io/en/latest/.
 
 Example
 =======
@@ -69,7 +71,7 @@ Rasterio gives access to properties of a geospatial raster file.
     with rasterio.open('tests/data/RGB.byte.tif') as src:
         print(src.width, src.height)
         print(src.crs)
-        print(src.affine)
+        print(src.transform)
         print(src.count)
         print(src.indexes)
 
@@ -82,7 +84,7 @@ Rasterio gives access to properties of a geospatial raster file.
     # [1, 2, 3]
 
 A rasterio dataset also provides methods for getting extended array slices given
-georeferenced coordinates and vice versa.
+georeferenced coordinates.
 
 
 .. code-block:: python
@@ -134,8 +136,8 @@ using Python.
      [ True  True  True ...,  True  True  True]],
            fill_value = 0)
 
-    >>> b.min(), b.max(), b.mean()
-    (1, 255, 44.434478650699106)
+    >>> np.nanmin(b), np.nanmax(b), np.nanmean(b)
+    (0, 255, 29.94772668847656)
 
 Rio Plugins
 -----------
@@ -156,12 +158,25 @@ Please install Rasterio in a `virtual environment
 <https://www.python.org/dev/peps/pep-0405/>`__ so that its requirements don't
 tamper with your system's Python.
 
+SSL certs
+---------
+
+The Linux wheels on PyPI are built on CentOS and libcurl expects certs to be in
+/etc/pki/tls/certs/ca-bundle.crt. Ubuntu's certs, for example, are in
+a different location. You may need to use the CURL_CA_BUNDLE environment
+variable to specify the location of SSL certs on your computer. On an Ubuntu
+system set the variable as shown below.
+
+.. code-block:: console
+
+    $ export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
+
+
 Dependencies
 ------------
 
-Rasterio has a C library dependency: GDAL >=1.9. GDAL itself depends on a
-number of other libraries provided by most major operating systems and also
-depends on the non standard GEOS and PROJ4 libraries. How to meet this
+Rasterio has a C library dependency: GDAL >=1.11. GDAL itself depends on some other libraries provided by most major operating systems and also
+depends on the non standard GEOS and PROJ4 libraries. How to meet these
 requirement will be explained below.
 
 Rasterio's Python dependencies are listed in its requirements.txt file.
@@ -192,7 +207,7 @@ run ``pip install rasterio``. These binary wheels are preferred by newer
 versions of pip.
 
 If you don't want these wheels and want to install from a source distribution,
-run ``pip install rasterio --no-use-wheel`` instead.
+run ``pip install rasterio --no-binary rasterio`` instead.
 
 The included GDAL library is fairly minimal, providing only the format drivers
 that ship with GDAL and are enabled by default. To get access to more formats,
@@ -235,7 +250,7 @@ The following commands are adapted from Rasterio's Travis-CI configuration.
 
     $ sudo add-apt-repository ppa:ubuntugis/ppa
     $ sudo apt-get update
-    $ sudo apt-get install libgdal1h gdal-bin libgdal-dev
+    $ sudo apt-get install gdal-bin libgdal-dev
     $ pip install -U pip
     $ pip install rasterio
 
@@ -248,7 +263,7 @@ For a Homebrew based Python environment, do the following.
 
 .. code-block:: console
 
-    $ brew upgrade
+    $ brew update
     $ brew install gdal
     $ pip install -U pip
     $ pip install --no-use-wheel rasterio
@@ -285,27 +300,50 @@ versions used `here
 Note: The GDAL dll (gdal111.dll) and gdal-data directory need to be in your
 Windows PATH otherwise rasterio will fail to work.
 
+
+Support
+=======
+
+The primary forum for questions about installation and usage of Rasterio is
+https://rasterio.groups.io/g/main. The authors and other users will answer
+questions when they have expertise to share and time to explain. Please take
+the time to craft a clear question and be patient about responses.
+
+Please do not bring these questions to Rasterio's issue tracker, which we want
+to reserve for bug reports and other actionable issues.
+
+While Rasterio's repo is in the Mapbox GitHub organization, Mapbox's Support
+team is focused on customer support for its commercial platform and Rasterio
+support requests may be perfunctorily closed with or without a link to
+https://rasterio.groups.io/g/main. It's better to bring questions directly to
+the main Rasterio group at groups.io.
+
 Development and Testing
------------------------
+=======================
 
 See `CONTRIBUTING.rst <CONTRIBUTING.rst/>`__.
 
 Documentation
--------------
+=============
 
 See `docs/ <docs/>`__.
 
 License
--------
+=======
 
 See `LICENSE.txt <LICENSE.txt>`__.
 
 Authors
--------
+=======
 
 See `AUTHORS.txt <AUTHORS.txt>`__.
 
 Changes
--------
+=======
 
 See `CHANGES.txt <CHANGES.txt>`__.
+
+Who is Using Rasterio?
+======================
+
+See `here <https://libraries.io/pypi/rasterio/usage>`__.

benchmarks/ndarray.py

@@ -49,7 +49,7 @@ print("%f usec\n" % (1000*t/n))
 # Rasterio
 s = """
 with rasterio.open('tests/data/RGB.byte.tif') as src:
-    transform = src.affine
+    transform = src.transform
     proj = src.crs
     wkt = src.crs_wkt
     arr = src.read(1, masked=False)

debian/changelog

+rasterio (1.0.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Update required build dependencies.
+  * Drop error-typo.patch, applied upstream. Refresh remaining patch.
+  * Remove hypotheses examples from dist-packages.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 13 Jul 2018 07:37:46 +0200
+
 rasterio (0.36.0-3) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -9,27 +9,33 @@ Build-Depends: debhelper (>= 9),
                gdal-bin,
                cython,
                cython3,
-               python-all,
-               python-dev,
-               python-setuptools,
-               python-numpy,
-               python-snuggs,
                python-affine (>= 1.3.0),
+               python-all,
+               python-all-dev,
+               python-attr (>= 16.0.0),
                python-boto3,
+               python-click-plugins,
+               python-cligj (>= 0.2),
                python-enum34,
+               python-hypothesis,
+               python-numpy (>= 1.10),
+               python-packaging,
                python-pytest,
-               python-cligj (>= 0.2),
-               python-click-plugins,
+               python-setuptools,
+               python-snuggs (>= 1.4.1),
+               python3-affine (>= 1.3.0),
                python3-all,
                python3-all-dev,
-               python3-setuptools,
-               python3-numpy,
-               python3-snuggs,
-               python3-affine (>= 1.3.0),
+               python3-attr (>= 16.0.0),
                python3-boto3,
-               python3-pytest,
-               python3-cligj (>= 0.2),
                python3-click-plugins,
+               python3-cligj (>= 0.2),
+               python3-hypothesis,
+               python3-numpy (>= 1.10),
+               python3-packaging,
+               python3-pytest,
+               python3-setuptools,
+               python3-snuggs (>= 1.4.1)
 Standards-Version: 4.1.5
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/rasterio
 Vcs-Git: https://salsa.debian.org/debian-gis-team/rasterio.git

debian/patches/0001-Rename-rio-to-rasterio-Closes-788463.patch

@@ -9,12 +9,12 @@ There is already another package providing a binary "rio".
 
 --- a/setup.py
 +++ b/setup.py
-@@ -267,7 +267,7 @@ setup_args = dict(
-     packages=['rasterio', 'rasterio.rio', 'rasterio.tools'],
+@@ -385,7 +385,7 @@ setup_args = dict(
+     packages=['rasterio', 'rasterio.rio'],
      entry_points='''
          [console_scripts]
 -        rio=rasterio.rio.main:main_group
 +        rasterio=rasterio.rio.main:main_group
  
          [rasterio.rio_commands]
-         bounds=rasterio.rio.bounds:bounds
+         blocks=rasterio.rio.blocks:blocks

debian/patches/error-typo.patch

-Description: Fix 'errror' typo, replace with 'error'.
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://github.com/mapbox/rasterio/pull/821
-Applied-Upstream: https://github.com/mapbox/rasterio/commit/37a9c642733ae12eb131d69e7df21731fd8939e8
-
---- a/rasterio/_err.pyx
-+++ b/rasterio/_err.pyx
-@@ -167,7 +167,7 @@ cdef class CPLErrors:
-     """A manager for GDAL error handling contexts."""
- 
-     def check(self):
--        """Check the errror stack and raise or exit as appropriate."""
-+        """Check the error stack and raise or exit as appropriate."""
-         cdef const char *msg_c = NULL
- 
-         err_type = CPLGetLastErrorType()

debian/patches/series

 0001-Rename-rio-to-rasterio-Closes-788463.patch
-error-typo.patch

debian/rules

@@ -14,20 +14,24 @@ export PYBUILD_TEST_PYTEST=1
 
 override_dh_clean:
 	dh_clean
-	rm -f rasterio/*.c
-	rm -f rasterio/_*.cpp
-	rm -f VERSION.txt
-	rm -f gdal-config.txt
-	rm -f .coverage
 
-override_dh_install:
-	dh_install
-	rm -rf debian/python3-rasterio/usr/bin
-	rm -rf debian/python-rasterio/usr/bin
+	$(RM) rasterio/*.c
+	$(RM) rasterio/_*.cpp
+	$(RM) VERSION.txt
+	$(RM) gdal-config.txt
+	$(RM) .coverage
 
 override_dh_auto_test:
 	dh_auto_test || echo "Ignoring test failures"
 
+override_dh_install:
+	dh_install
+
+	$(RM) -r debian/python3-rasterio/usr/bin
+	$(RM) -r debian/python-rasterio/usr/bin
+
+	$(RM) -r debian/*/usr/lib/python*/dist-packages/.hypothesis/
+
 override_dh_python2:
 	dh_python2 -ppython-rasterio
 	dh_numpy -ppython-rasterio

docs/Makefile

@@ -56,6 +56,7 @@ clean:
 .PHONY: html
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	touch $(BUILDDIR)/html/.nojekyll
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
@@ -217,9 +218,4 @@ pseudoxml:
 
 .PHONY: apidocs
 apidocs:
-	sphinx-apidoc -f -e -T -M -o . ../rasterio ../rasterio/rio ../rasterio/compat.py ../rasterio/tools ../rasterio/tool.py
-
-.PHONY: publish
-publish: html
-	ghp-import _build/html -m "update docs at $(GITREF)"
-	git push origin gh-pages
+	sphinx-apidoc -f -e -T -o . ../rasterio ../rasterio/rio

docs/_build/html/.nojekyll

-# Not a Jekyll site

docs/modules.rst → docs/api/index.rst

-rasterio
-========
+Python API Reference
+====================
 
 .. toctree::
-   :maxdepth: 4
 
    rasterio