[Python-modules-commits] [manuel] 02/03: merge patched into master

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository manuel.

commit 7e15afc4c9a7aa8291ad3289ee78c8c93d0160b5
Merge: 782672a 4d48e90
Author: Barry Warsaw <barry at python.org>
Date:   Mon Nov 2 18:14:14 2015 -0600

    merge patched into master

 debian/.git-dpm                             |  4 ++--
 debian/patches/disable-tests-requires.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 setup.py                                    |  3 ++-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 54e3047,0000000..cb63af2
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
- 8fc49825d0aa3b53a60d3abab75125ff0c758b00
- 8fc49825d0aa3b53a60d3abab75125ff0c758b00
++4d48e905f42b283375f488a00315884258422eae
++4d48e905f42b283375f488a00315884258422eae
 +2158902342fccc8898d0f43ef13034641a3176ec
 +2158902342fccc8898d0f43ef13034641a3176ec
 +manuel_1.8.0.orig.tar.gz
 +7ffeb7f0f2121098b58aa25a1428641c98c3dd72
 +35068
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/disable-tests-requires.patch
index 0000000,0000000..1571e12
new file mode 100644
--- /dev/null
+++ b/debian/patches/disable-tests-requires.patch
@@@ -1,0 -1,0 +1,28 @@@
++From 4d48e905f42b283375f488a00315884258422eae Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Mon, 2 Nov 2015 18:03:58 -0600
++Subject: =?UTF-8?q?Even=20though=20tests=5Frequires=20are=20satisfied=20by?=
++ =?UTF-8?q?=20Build-Depends,=20Python=203.5=20will=0Astill=20try=20to=20do?=
++ =?UTF-8?q?wnload=20tests=5Frequires=20packages=20from=20PyPI.=20=20Preven?=
++ =?UTF-8?q?t=20this=20from=0Ahappening,=20which=20will=20break=20things=20?=
++ =?UTF-8?q?like=20autopkgtests.?=
++
++Patch-Name: disable-tests-requires.patch
++---
++ setup.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 4561779..1cb75e6 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -20,7 +20,8 @@ with open('README.rst') as readme:
++     with open('CHANGES.rst') as changes:
++         long_description = readme.read() + '\n\n' + changes.read()
++ 
++-tests_require = ['zope.testing']
+++#tests_require = ['zope.testing']
+++tests_require = []
++ 
++ setup(
++     name='manuel',
diff --cc debian/patches/series
index 8cdd912,0000000..98558e9
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-docs-no-updated-timstamp.patch
++disable-tests-requires.patch

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