[imageio] 03/05: Merge tag 'upstream/1.1'

[Ghislain Vaillant]

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

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

commit ceaeb785e6b4aeb5fab4c18b9218a388b87df2b5
Merge: 94b20d5 1167d76
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Feb 4 23:14:47 2015 +0000

    Merge tag 'upstream/1.1'
    
    Upstream version 1.1

 CONTRIBUTORS.txt                            |  11 +
 LICENSE                                     |  24 +
 PKG-INFO                                    |  12 +-
 README.md                                   | 101 ++++
 docs/.requirements                          |   1 +
 docs/Makefile                               | 153 +++++
 docs/conf.py                                | 252 +++++++++
 docs/devapi.rst                             |  17 +
 docs/examples.rst                           | 117 ++++
 docs/ext/docscrape.py                       | 515 +++++++++++++++++
 docs/ext/docscrape_sphinx.py                | 238 ++++++++
 docs/ext/imageio_ext.py                     | 221 ++++++++
 docs/ext/numpydoc.py                        | 178 ++++++
 docs/index.rst                              |  14 +
 docs/installation.rst                       |  25 +
 docs/make.bat                               | 190 +++++++
 docs/releasenotes.rst                       | 172 ++++++
 docs/sec_developer.rst                      |   9 +
 docs/sec_gettingstarted.rst                 |  10 +
 docs/sec_reference.rst                      |  10 +
 docs/userapi.rst                            |  49 ++
 imageio/__init__.py                         |  13 +-
 imageio/core/__init__.py                    |   6 +-
 imageio/core/fetching.py                    | 118 ++--
 imageio/core/findlib.py                     |   2 +-
 imageio/core/format.py                      |  65 +--
 imageio/core/functions.py                   | 119 ++--
 imageio/core/request.py                     |   8 +-
 imageio/core/util.py                        |  72 ++-
 imageio/plugins/__init__.py                 |  10 +-
 imageio/plugins/_freeimage.py               |  76 ++-
 imageio/plugins/_swf.py                     |   4 +-
 imageio/plugins/avbin.py                    |  29 +-
 imageio/plugins/dicom.py                    |  10 +-
 imageio/plugins/example.py                  |  39 +-
 imageio/plugins/ffmpeg.py                   |  55 +-
 imageio/plugins/freeimage.py                |  20 +-
 imageio/plugins/freeimagemulti.py           |  23 +-
 imageio/plugins/npz.py                      |  10 +-
 imageio/plugins/swf.py                      |  11 +-
 imageio/resources/shipped_resources_go_here |   0
 imageio/testing.py                          |   8 +-
 make/README.md                              |  12 +
 make/__init__.py                            |   6 +
 make/__main__.py                            |  15 +
 make/maker.py                               | 257 +++++++++
 setup.py                                    | 212 ++++++-
 tests/README.md                             |  16 +
 tests/test_avbin.py                         | 184 ++++++
 tests/test_core.py                          | 849 ++++++++++++++++++++++++++++
 tests/test_dicom.py                         | 191 +++++++
 tests/test_ffmpeg.py                        | 269 +++++++++
 tests/test_freeimage.py                     | 466 +++++++++++++++
 tests/test_freeimage_suite.py               |  95 ++++
 tests/test_meta.py                          | 147 +++++
 tests/test_npz.py                           |  85 +++
 tests/test_swf.py                           | 181 ++++++
 57 files changed, 5722 insertions(+), 280 deletions(-)

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