[Python-modules-commits] [nose2] 04/05: 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 nose2.

commit 74d88ffb682b1bebadc0535c1933a1e79a3f6784
Merge: a2900ba 9ae8032
Author: Barry Warsaw <barry at python.org>
Date:   Wed Mar 16 16:23:36 2016 -0400

    merge patched into master

 PKG-INFO                                 |  2 +-
 debian/.git-dpm                          |  6 +++---
 debian/patches/requirements.patch        |  4 ++--
 docs/changelog.rst                       |  6 ++++++
 nose2.egg-info/PKG-INFO                  |  2 +-
 nose2/plugins/mp.py                      | 10 ++++++---
 nose2/tests/_common.py                   |  8 ++++----
 nose2/tests/functional/test_mp_plugin.py | 35 ++++++++++++++++++++++++++++++++
 setup.py                                 |  2 +-
 9 files changed, 60 insertions(+), 15 deletions(-)

diff --cc debian/.git-dpm
index 8e0c353,0000000..ffd081c
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
- 33f37766244b097cccb4e9d53ee4868cb64cd522
- 33f37766244b097cccb4e9d53ee4868cb64cd522
- 1e5a7fc4fcc231229cb0d0d78368ef3ee72b3b50
++9ae8032315c3c93e5d1787d064c87fe2154fbe1c
++9ae8032315c3c93e5d1787d064c87fe2154fbe1c
++61895997adabb16061be85c7fbf178961bf7d474
 +61895997adabb16061be85c7fbf178961bf7d474
 +nose2_0.6.4.orig.tar.gz
 +51f24dd7ed12d932dbc12b3451fc40b117dae2c9
 +131474
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/requirements.patch
index 8129886,0000000..dc29e5e
mode 100644,000000..100644
--- a/debian/patches/requirements.patch
+++ b/debian/patches/requirements.patch
@@@ -1,30 -1,0 +1,30 @@@
- From 33f37766244b097cccb4e9d53ee4868cb64cd522 Mon Sep 17 00:00:00 2001
++From 9ae8032315c3c93e5d1787d064c87fe2154fbe1c Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at debian.org>
 +Date: Thu, 8 Oct 2015 10:02:15 -0700
 +Subject: Disable some broken settings in setup.py.
 +
 + - Don't try to install requirements from PyPI.
 + - A bug in nose2 prevents the use of `python setup.py test`
 +Forwarded: not-needed
 +
 +Patch-Name: requirements.patch
 +---
 + setup.py | 6 ++++--
 + 1 file changed, 4 insertions(+), 2 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index b183531..4cd1f6d 100644
++index d556a05..3125410 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -75,7 +75,9 @@ else:
 +             '%s = nose2:discover' % SCRIPT2,
 +         ],
 +     }
 +-    params['install_requires'] = REQS
 +-    params['test_suite'] = 'nose2.compat.unittest.collector'
 ++    # DEBIAN: don't try to install requirements from PyPI.
 ++    #params['install_requires'] = REQS
 ++    # DEBIAN: https://github.com/nose-devs/nose2/issues/118
 ++    #params['test_suite'] = 'nose2.compat.unittest.collector'
 + 
 + setup(**params)

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