[Python-modules-commits] [pilkit] 04/08: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository pilkit.

commit 846eddc1856ee17dae0cc3bfea4c5c57893387cc
Merge: 531d80e 6bd22ca
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Mar 10 09:14:15 2017 +0100

    merge patched into master

 AUTHORS                                            |   2 ++
 MANIFEST.in                                        |   2 +-
 PKG-INFO                                           |  10 +++++---
 README.rst                                         |   1 +
 debian/.git-dpm                                    |   6 ++---
 ...versions-of-mock-and-nose-to-be-used-by-.patch} |  14 +++++------
 ...-versions-of-mock-and-nose-to-be-used-by-.patch |  24 ------------------
 ...ce.png-from-libav-sources-as-a-replacemen.patch |  27 ---------------------
 debian/patches/series                              |   4 +--
 pilkit.egg-info/PKG-INFO                           |  10 +++++---
 pilkit.egg-info/SOURCES.txt                        |  17 ++-----------
 pilkit/pkgmeta.py                                  |   2 +-
 pilkit/processors/__init__.py                      |   1 +
 pilkit/processors/overlay.py                       |  23 ++++++++++++++++++
 pilkit/utils.py                                    |   9 ++++++-
 setup.py                                           |   9 ++++---
 tests/assets/reference.png                         | Bin 0 -> 119422 bytes
 tests/test_processors.py                           |  14 +++++++++--
 18 files changed, 79 insertions(+), 96 deletions(-)

diff --cc debian/.git-dpm
index 19bfd07,0000000..fe776a3
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 91ce656008f2fd8016816bec91f0305a758526e9
- 91ce656008f2fd8016816bec91f0305a758526e9
- e09c670faa25675c75a80b8d20985f3908d7a45d
++6bd22cad1d343744fa88eaf8ee60ba5bf1887cb2
++6bd22cad1d343744fa88eaf8ee60ba5bf1887cb2
++db79d70dad5ceb3761c747d35d9c3a0fc869d060
 +db79d70dad5ceb3761c747d35d9c3a0fc869d060
 +pilkit_2.0.orig.tar.gz
 +f61212385b6004428edbea39d869368995bed217
 +161137
diff --cc debian/patches/0001-Allow-newer-versions-of-mock-and-nose-to-be-used-by-.patch
index e32efb4,0000000..60cc2a5
mode 100644,000000..100644
--- a/debian/patches/0001-Allow-newer-versions-of-mock-and-nose-to-be-used-by-.patch
+++ b/debian/patches/0001-Allow-newer-versions-of-mock-and-nose-to-be-used-by-.patch
@@@ -1,21 -1,0 +1,21 @@@
- From ef35c933d78d13af16817b39a72eea3d645bbb52 Mon Sep 17 00:00:00 2001
++From 6bd22cad1d343744fa88eaf8ee60ba5bf1887cb2 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <FladischerMichael at fladi.at>
- Date: Mon, 7 Dec 2015 14:59:45 +0100
- Subject: Remove dependency nose-progressive as it is only cosmetic.
++Date: Mon, 7 Dec 2015 15:01:04 +0100
++Subject: Allow newer versions of mock and nose to be used by tests.
 +
 +---
 + setup.py | 1 -
 + 1 file changed, 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
- index 5eaa2f7..9d768e6 100644
++index 6f23695..5bc7917 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -34,7 +34,6 @@ setup(
 +     tests_require=[
-          'mock==1.0.1',
-          'nose==1.2.1',
- -        'nose-progressive==1.3',
++         'mock>=1.0.1',
++         'nose>=1.3.6',
++-        'nose-progressive>=1.5.1',
 +         'Pillow',
 +     ],
 +     test_suite='nose.collector',
diff --cc debian/patches/series
index 8a6187b,0000000..ad35d25
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,1 @@@
- 0001-Remove-dependency-nose-progressive-as-it-is-only-cos.patch
- 0002-Allow-newer-versions-of-mock-and-nose-to-be-used-by-.patch
- 0003-Add-reference.png-from-libav-sources-as-a-replacemen.patch
++0001-Allow-newer-versions-of-mock-and-nose-to-be-used-by-.patch

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