[Python-modules-commits] [nose2] 04/06: 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 9ecc3b016e1eb621184b362a0b494df7715319d7
Merge: 77868e9 a99bc1b
Author: Brian May <bam at debian.org>
Date:   Thu Feb 25 20:38:09 2016 +1100

    merge patched into master

 MANIFEST.in                                        |   2 +-
 PKG-INFO                                           |   8 +++---
 README.rst                                         |   2 --
 debian/.git-dpm                                    |   6 ++---
 debian/patches/requirements.patch                  |   4 +--
 docs/changelog.rst                                 |  29 +++++++++++++++++++++
 nose2.egg-info/PKG-INFO                            |   8 +++---
 nose2.egg-info/SOURCES.txt                         |   7 +++++
 nose2.egg-info/entry_points.txt                    |   2 +-
 nose2.egg-info/requires.txt                        |   2 ++
 .../functional/support/scenario/doctests/docs.rst  |   2 ++
 .../scenario/doctests/doctests_pkg1/docs1.rst      |   2 ++
 .../junitxml/empty_properties/properties.json      |   0
 .../support/scenario/tests_in_package/docs.rst     |   2 ++
 .../scenario/tests_in_unzipped_eggs/docs.rst       |   2 ++
 .../support/scenario/tests_in_zipped_eggs/docs.rst |   2 ++
 .../tests_in_zipped_eggs/pkgegg-0.0.0-py2.7.egg    | Bin 0 -> 5290 bytes
 nose2/tests/functional/test_coverage.py            |  10 ++++---
 setup.py                                           |   2 +-
 19 files changed, 68 insertions(+), 24 deletions(-)

diff --cc debian/.git-dpm
index 26b4d68,0000000..35efb94
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
- 59407e85d2b5af15d19bacfea4317e081d4bf6f8
- 59407e85d2b5af15d19bacfea4317e081d4bf6f8
- 5d7fc2e9f3985c66a168e439ccf75fdc47cf2ff2
++a99bc1b08f2b5013c209753886bc90c4c948d54d
++a99bc1b08f2b5013c209753886bc90c4c948d54d
++8594ef0cf864e60e6c8c75f2d659aa1de7b5a65c
 +8594ef0cf864e60e6c8c75f2d659aa1de7b5a65c
 +nose2_0.6.2.orig.tar.gz
 +2478db33e7bd66e7a5e1cd540ad60ecef02dda66
 +130415
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/requirements.patch
index 3fea4ea,0000000..113485e
mode 100644,000000..100644
--- a/debian/patches/requirements.patch
+++ b/debian/patches/requirements.patch
@@@ -1,30 -1,0 +1,30 @@@
- From 59407e85d2b5af15d19bacfea4317e081d4bf6f8 Mon Sep 17 00:00:00 2001
++From a99bc1b08f2b5013c209753886bc90c4c948d54d 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 79f9ecb..5444bb0 100644
++index ef348b3..2fc5763 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -74,7 +74,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