[Python-modules-commits] [pilkit] 05/06: 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 6097d67326cd4e312cc7802443c8472f2e75aaff
Merge: 9d83c5f bc9e631
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Dec 7 15:01:31 2015 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ndency-nose-progressive-as-it-is-only-cos.patch | 21 +++++++++++++++++++
 ...-versions-of-mock-and-nose-to-be-used-by-.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 setup.py                                           |  5 ++---
 5 files changed, 51 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 0111745,0000000..6d41abe
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
- f86d431765f09978174a579d3b34f672ffa97b12
- f86d431765f09978174a579d3b34f672ffa97b12
++bc9e631c9206353b3baa11c905231185ad290ae9
++bc9e631c9206353b3baa11c905231185ad290ae9
 +f86d431765f09978174a579d3b34f672ffa97b12
 +f86d431765f09978174a579d3b34f672ffa97b12
 +pilkit_1.1.13.orig.tar.gz
 +d4783b9bafa7e6f2620793a0545983785bc23075
 +897688
diff --cc debian/patches/0001-Remove-dependency-nose-progressive-as-it-is-only-cos.patch
index 0000000,0000000..2a840de
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-dependency-nose-progressive-as-it-is-only-cos.patch
@@@ -1,0 -1,0 +1,21 @@@
++From a3c5a4721c762e85a307e36efd62060c9c2ab69b 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.
++
++---
++ setup.py | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 5eaa2f7..9d768e6 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',
++         'Pillow',
++     ],
++     test_suite='nose.collector',
diff --cc debian/patches/0002-Allow-newer-versions-of-mock-and-nose-to-be-used-by-.patch
index 0000000,0000000..06728f0
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Allow-newer-versions-of-mock-and-nose-to-be-used-by-.patch
@@@ -1,0 -1,0 +1,24 @@@
++From bc9e631c9206353b3baa11c905231185ad290ae9 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Mon, 7 Dec 2015 15:01:04 +0100
++Subject: Allow newer versions of mock and nose to be used by tests.
++
++---
++ setup.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 9d768e6..d957166 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -32,8 +32,8 @@ setup(
++     zip_safe=False,
++     include_package_data=True,
++     tests_require=[
++-        'mock==1.0.1',
++-        'nose==1.2.1',
+++        'mock>=1.0.1',
+++        'nose>=1.2.1',
++         'Pillow',
++     ],
++     test_suite='nose.collector',
diff --cc debian/patches/series
index 0000000,0000000..bd52487
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++0001-Remove-dependency-nose-progressive-as-it-is-only-cos.patch
++0002-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