[Python-modules-commits] [nose2] 04/06: merge patched into master
Brian May
bam at moszumanska.debian.org
Tue Feb 23 06:00:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository nose2.
commit dfe39e23a8e14c11bb1c7b6ea67d5558c4689718
Merge: 95434b3 59407e8
Author: Brian May <bam at debian.org>
Date: Tue Feb 23 16:21:14 2016 +1100
merge patched into master
MANIFEST.in | 2 +-
PKG-INFO | 10 +-
README.rst | 4 +-
debian/.git-dpm | 6 +-
debian/patches/requirements.patch | 4 +-
docs/Makefile | 130 +++++++++++++++++++++
docs/configuration.rst | 2 +-
docs/dev/documenting_plugins.rst | 6 +-
docs/dev/hook_reference.rst | 66 +++++------
docs/dev/plugin_class_reference.rst | 2 +-
docs/dev/writing_plugins.rst | 4 +-
docs/differences.rst | 10 +-
docs/plugins/attrib.rst | 8 +-
docs/plugins/eggdiscovery.rst | 6 +-
docs/plugins/layers.rst | 18 +--
docs/plugins/mp.rst | 18 +--
docs/such_dsl.rst | 10 +-
docs/usage.rst | 6 +-
nose2.egg-info/PKG-INFO | 10 +-
nose2.egg-info/SOURCES.txt | 14 +++
nose2.egg-info/entry_points.txt | 2 +-
nose2.egg-info/requires.txt | 4 +-
nose2/collector.py | 7 +-
nose2/compat.py | 6 +-
nose2/config.py | 4 +-
nose2/events.py | 68 +++++++----
nose2/exceptions.py | 2 +-
nose2/loader.py | 10 +-
nose2/main.py | 32 ++---
nose2/plugins/attrib.py | 2 +-
nose2/plugins/collect.py | 8 +-
nose2/plugins/coverage.py | 18 ++-
nose2/plugins/debugger.py | 2 +-
nose2/plugins/doctests.py | 3 +-
nose2/plugins/dundertest.py | 7 +-
nose2/plugins/junitxml.py | 46 ++++++--
nose2/plugins/loader/discovery.py | 8 +-
nose2/plugins/loader/eggdiscovery.py | 4 +-
nose2/plugins/loader/generators.py | 7 +-
nose2/plugins/loader/loadtests.py | 18 +--
nose2/plugins/loader/parameters.py | 2 +-
nose2/plugins/loader/testclasses.py | 8 +-
nose2/plugins/mp.py | 14 +--
nose2/plugins/printhooks.py | 4 +-
nose2/plugins/result.py | 8 +-
nose2/result.py | 12 +-
nose2/runner.py | 2 +-
nose2/session.py | 2 +-
nose2/sphinxext.py | 2 +-
nose2/suite.py | 12 +-
nose2/tests/_common.py | 14 +--
.../functional/support/scenario/doctests/docs.py | 4 +
.../functional/support/scenario/doctests/docs.txt | 4 +
.../scenario/doctests/doctests_pkg1/__init__.py | 0
.../scenario/doctests/doctests_pkg1/docs1.py | 4 +
.../scenario/doctests/doctests_pkg1/docs1.txt | 4 +
.../test_junitxml_empty_properties.py | 7 ++
.../junitxml/empty_properties/unittest.cfg | 4 +
.../test_junitxml_missing_properties.py | 7 ++
.../junitxml/missing_properties/unittest.cfg | 4 +
.../test_junitxml_with_properties.py | 7 ++
.../scenario/junitxml/with_properties/unittest.cfg | 4 +
nose2/tests/functional/test_coverage.py | 9 +-
nose2/tests/functional/test_doctests_plugin.py | 60 ++++++++++
nose2/tests/functional/test_junitxml_plugin.py | 73 +++++++++++-
nose2/tests/functional/test_loading.py | 16 +++
nose2/tests/functional/test_loadtests_plugin.py | 11 ++
nose2/tests/functional/test_util.py | 6 +-
nose2/tests/unit/test_collector.py | 21 ++++
nose2/tests/unit/test_loader.py | 15 +++
nose2/tests/unit/test_util.py | 16 +++
nose2/tools/decorators.py | 4 +-
nose2/tools/params.py | 8 +-
nose2/tools/such.py | 39 +++----
nose2/util.py | 46 +++++---
requirements-py26.txt | 1 +
setup.py | 2 +-
77 files changed, 774 insertions(+), 276 deletions(-)
diff --cc debian/.git-dpm
index 0e5aff4,0000000..9450b94
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
- 56e3c8607517504ab9516fc8f70c58e3c4aafabe
- 56e3c8607517504ab9516fc8f70c58e3c4aafabe
- 60063426fa67f3941e41913c851970821a0bdc4c
++59407e85d2b5af15d19bacfea4317e081d4bf6f8
++59407e85d2b5af15d19bacfea4317e081d4bf6f8
++5d7fc2e9f3985c66a168e439ccf75fdc47cf2ff2
+5d7fc2e9f3985c66a168e439ccf75fdc47cf2ff2
+nose2_0.6.0.orig.tar.gz
+b12f55b357192e0f3f8f6a17ef8f78f3c4e4c92b
+125953
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/requirements.patch
index 76675d9,0000000..3fea4ea
mode 100644,000000..100644
--- a/debian/patches/requirements.patch
+++ b/debian/patches/requirements.patch
@@@ -1,30 -1,0 +1,30 @@@
- From 56e3c8607517504ab9516fc8f70c58e3c4aafabe Mon Sep 17 00:00:00 2001
++From 59407e85d2b5af15d19bacfea4317e081d4bf6f8 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 9b9b30b..a2d385f 100644
++index 79f9ecb..5444bb0 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
More information about the Python-modules-commits
mailing list