[python-imageio] 02/07: Merge tag 'upstream/2.2.0'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository python-imageio.

commit f3735f95030cee238bd71d613321e14e8323a7ee
Merge: ff19fee 4c2ff53
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu May 25 16:02:40 2017 +0100

    Merge tag 'upstream/2.2.0'
    
    Upstream version 2.2.0
    
    # gpg: Signature made Thu 25 May 2017 16:02:36 BST
    # gpg:                using RSA key F3DB8E7525060E1BDB84C20D6A990FB3DDEB910A
    # gpg:                issuer "ghisvail at gmail.com"
    # gpg: Good signature from "Ghislain Antony Vaillant <ghisvail at gmail.com>" [ultimate]

 CONTRIBUTORS.txt                  |   18 +-
 PKG-INFO                          |    2 +-
 docs/.requirements                |    1 +
 docs/conf.py                      |    4 +-
 docs/examples.rst                 |   13 +
 docs/{ext => }/imageio_ext.py     |    2 +-
 docs/make.bat                     |    0
 docs/releasenotes.rst             |   20 +-
 imageio/__init__.py               |    2 +-
 imageio/core/functions.py         |   88 ++--
 imageio/core/request.py           |    4 +-
 imageio/plugins/__init__.py       |    1 +
 imageio/plugins/_freeimage.py     |    2 +-
 imageio/plugins/_tifffile.py      | 1022 +++++++++++++++++++++++++------------
 imageio/plugins/ffmpeg.py         |   88 +++-
 imageio/plugins/freeimagemulti.py |   11 +-
 imageio/plugins/grab.py           |  123 +++++
 imageio/plugins/pillow.py         |   53 +-
 imageio/plugins/pillow_info.py    |   91 ++--
 imageio/plugins/pillowmulti.py    |    9 +-
 imageio/plugins/tifffile.py       |   36 +-
 tests/test_gdal.py                |    5 +-
 tests/test_grab.py                |   98 ++++
 tests/test_pillow.py              |   13 +
 tests/test_tifffile.py            |   46 +-
 25 files changed, 1261 insertions(+), 491 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-imageio.git