[Python-modules-commits] [nose2] 04/05: merge patched into master

[Brian May]

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

bam pushed a commit to branch master
in repository nose2.

commit 17a13e1d6450950e07f8c57117fee78c868f9870
Merge: 2be2127 33f3776
Author: Brian May <bam at debian.org>
Date:   Wed Mar 2 08:56:23 2016 +1100

    merge patched into master

 PKG-INFO                                        |  3 ++-
 debian/.git-dpm                                 |  6 +++---
 debian/patches/requirements.patch               |  6 +++---
 docs/changelog.rst                              |  6 ++++++
 nose2.egg-info/PKG-INFO                         |  3 ++-
 nose2/plugins/doctests.py                       |  4 ++--
 nose2/tests/_common.py                          | 26 +++++++++++++++++++++++++
 nose2/tests/functional/test_loadtests_plugin.py |  4 +++-
 nose2/tests/unit/test_doctest_plugin.py         |  6 +++++-
 nose2/tests/unit/test_layers_plugin.py          |  9 ++++++++-
 nose2/tests/unit/test_params_plugin.py          |  8 ++++----
 nose2/util.py                                   | 18 +++++++++++------
 setup.py                                        |  3 ++-
 13 files changed, 78 insertions(+), 24 deletions(-)

diff --cc debian/.git-dpm
index 69b6897,0000000..5e9446d
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
- a99bc1b08f2b5013c209753886bc90c4c948d54d
- a99bc1b08f2b5013c209753886bc90c4c948d54d
- 8594ef0cf864e60e6c8c75f2d659aa1de7b5a65c
++33f37766244b097cccb4e9d53ee4868cb64cd522
++33f37766244b097cccb4e9d53ee4868cb64cd522
++1e5a7fc4fcc231229cb0d0d78368ef3ee72b3b50
 +1e5a7fc4fcc231229cb0d0d78368ef3ee72b3b50
 +nose2_0.6.3.orig.tar.gz
 +fb80230a32978fbfbbd37398e2e38040d8457c4e
 +130927
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/requirements.patch
index 113485e,0000000..8129886
mode 100644,000000..100644
--- a/debian/patches/requirements.patch
+++ b/debian/patches/requirements.patch
@@@ -1,30 -1,0 +1,30 @@@
- From a99bc1b08f2b5013c209753886bc90c4c948d54d Mon Sep 17 00:00:00 2001
++From 33f37766244b097cccb4e9d53ee4868cb64cd522 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 ef348b3..2fc5763 100644
++index b183531..4cd1f6d 100644
 +--- a/setup.py
 ++++ b/setup.py
- @@ -74,7 +74,9 @@ else:
++@@ -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