[Python-modules-commits] [willow] 03/07: record new upstream branch created by importing willow_1.0.orig.tar.gz and merge it

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository willow.

commit 4da0db202f06bc6106545ba3fbd86a069df90930
Merge: 4f304ae 6940b39
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Fri Sep 22 20:17:33 2017 +0100

    record new upstream branch created by importing willow_1.0.orig.tar.gz and merge it

 .travis.yml                |   1 +
 Dockerfile                 |   8 ---
 Dockerfile.py2             |   7 +++
 Dockerfile.py3             |  15 ++++++
 readme.rst => README.rst   |   6 +--
 debian/.git-dpm            |  14 +++---
 docker-test.sh             |   7 ++-
 docs/changelog.rst         |  11 +++-
 docs/conf.py               |   2 +-
 docs/reference.rst         |   2 +-
 setup.py                   |   4 +-
 tests/images/cameraman.tif | Bin 0 -> 65240 bytes
 tests/images/sails.bmp     | Bin 0 -> 394294 bytes
 tests/test_image.py        |  29 ++++++++++-
 tests/test_opencv.py       |  11 ++++
 tests/test_wand.py         |   2 +-
 willow/__init__.py         |   4 +-
 willow/image.py            |   7 ++-
 willow/plugins/opencv.py   | 123 ++++++++++++++++++++++++++-------------------
 willow/plugins/pillow.py   |   2 +
 willow/plugins/wand.py     |   2 +
 21 files changed, 175 insertions(+), 82 deletions(-)

diff --cc debian/.git-dpm
index 7eb1d87,0000000..01fc68c
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 8f9e2b644071e4cbbce8bf4cf64e94e05bde9270
- 8f9e2b644071e4cbbce8bf4cf64e94e05bde9270
- 8f9e2b644071e4cbbce8bf4cf64e94e05bde9270
- 8f9e2b644071e4cbbce8bf4cf64e94e05bde9270
- willow_0.4+dfsg.orig.tar.gz
- 40c4908e4d50956efe43b5fb24bd27e19180a5d2
- 1606278
++6940b39a35556bc17badf81131664862649e952d
++6940b39a35556bc17badf81131664862649e952d
++6940b39a35556bc17badf81131664862649e952d
++6940b39a35556bc17badf81131664862649e952d
++willow_1.0.orig.tar.gz
++dd117f344ffd5cad944ef80c2a5afc1c6d0cacf6
++1911161
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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