[Python-modules-commits] [nose2] 03/16: merge patched into master
Pierre-Elliott Bécue
peb-guest at moszumanska.debian.org
Sat Dec 23 18:32:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
peb-guest pushed a commit to branch master
in repository nose2.
commit 47c0d21540b4785867af6ea86ff5d63780a8289e
Merge: 45c6a05 9932a69
Author: Pierre-Elliott Bécue <becue at crans.org>
Date: Fri Dec 22 23:48:00 2017 +0100
merge patched into master
MANIFEST.in | 5 +-
PKG-INFO | 76 ++++--
README.rst | 68 ++++--
debian/.git-dpm | 6 +-
debian/patches/requirements.patch | 30 ---
debian/patches/series | 1 -
docs/changelog.rst | 45 +++-
docs/conf.py | 227 ++----------------
docs/configuration.rst | 6 +
docs/dev/compat.rst | 6 -
docs/dev/contributing.rst | 151 ++++++++----
docs/dev/hook_reference.rst | 64 +++++
docs/dev/internals.rst | 1 -
docs/dev/writing_plugins.rst | 2 +-
docs/differences.rst | 8 +-
docs/getting_started.rst | 9 +-
docs/plugins.rst | 11 +-
docs/plugins/layers.rst | 90 +++----
docs/plugins/mp.rst | 2 +-
docs/such_dsl.rst | 2 +-
nose2.egg-info/PKG-INFO | 76 ++++--
nose2.egg-info/SOURCES.txt | 40 +++-
nose2.egg-info/entry_points.txt | 2 +-
nose2.egg-info/requires.txt | 39 ++-
nose2/_version.py | 4 +-
nose2/backports/ordereddict.py | 264 ---------------------
nose2/compat.py | 37 ---
nose2/events.py | 157 +++++++++++-
nose2/exceptions.py | 5 +
nose2/loader.py | 3 +-
nose2/main.py | 2 +-
nose2/plugins/buffer.py | 50 +++-
nose2/plugins/collect.py | 4 +-
nose2/plugins/coverage.py | 75 ++++--
nose2/plugins/junitxml.py | 91 +++++--
nose2/plugins/layers.py | 233 ++++++++++++------
nose2/plugins/loader/discovery.py | 13 +-
nose2/plugins/loader/functions.py | 16 +-
nose2/plugins/loader/generators.py | 9 +-
nose2/plugins/loader/parameters.py | 16 +-
nose2/plugins/loader/testcases.py | 5 +-
nose2/plugins/loader/testclasses.py | 12 +-
nose2/plugins/mp.py | 130 ++++++----
nose2/plugins/prof.py | 6 +
nose2/plugins/result.py | 2 +-
nose2/session.py | 11 +-
nose2/suite.py | 57 ++++-
nose2/tests/_common.py | 8 +-
.../functional/support/lib/layer_hooks_plugin.py | 34 +++
.../coverage_of_imports/lib20171102/__init__.py | 6 +
.../coverage_of_imports/lib20171102/mod1.py | 15 ++
.../coverage_of_imports/test_import_coverage.py | 11 +
.../expected_failures/expected_failures.py | 8 +-
.../scenario/junitxml/chdir/test_junitxml_chdir.py | 3 +-
.../support/scenario/layers/test_layers.py | 4 +-
.../test_layers_and_attributes.py | 2 +-
.../scenario/layers_and_non_layers}/__init__.py | 0
.../scenario/layers_and_non_layers/common.py | 60 +++++
.../scenario/layers_and_non_layers/test_layers.py | 67 ++++++
.../test_such_with_has_setup.py | 24 ++
.../test_such_with_uses_decorator.py | 51 ++++
.../scenario/layers_hooks/test_layers_simple.py | 53 +++++
.../scenario/layers_hooks/test_simple_such.py | 9 +
.../layers_with_errors/test_layers_with_errors.py | 2 +-
.../test_layers_with_inheritance.py | 2 +-
.../scenario/module_import_err/pkg}/__init__.py | 0
.../module_import_err/pkg/test_attribute_err.py | 11 +
.../module_import_err/pkg/test_import_err.py | 13 +
.../test_coverage_config/coveragerc/.coveragerc | 2 +
.../coveragerc/covered_lib_coveragerc}/__init__.py | 0
.../coveragerc/covered_lib_coveragerc/mod1.py | 10 +
.../coveragerc/test_coveragerc.py | 8 +
.../nose2cfg/covered_lib_nose2cfg}/__init__.py | 0
.../nose2cfg/covered_lib_nose2cfg/mod1.py | 10 +
.../test_coverage_config/nose2cfg/nose2.cfg | 2 +
.../test_coverage_config/nose2cfg/test_nose2cfg.py | 8 +
.../tests_in_package/pkg1/test/test_things.py | 5 +-
.../pkgunegg/test/test_things.py | 5 +-
.../functional/support/such/test_such_timing.py | 50 ++++
nose2/tests/functional/test_coverage.py | 88 +++++--
nose2/tests/functional/test_layers_hooks.py | 132 +++++++++++
nose2/tests/functional/test_layers_plugin.py | 13 +-
nose2/tests/functional/test_loading.py | 63 ++++-
nose2/tests/functional/test_mp_plugin.py | 34 ++-
nose2/tests/functional/test_session.py | 30 +++
nose2/tests/functional/test_such_dsl.py | 7 +
nose2/tests/functional/test_util.py | 16 ++
nose2/tests/unit/test_buffer_plugin.py | 35 ++-
nose2/tests/unit/test_collector.py | 2 +-
nose2/tests/unit/test_config.py | 2 +-
nose2/tests/unit/test_failfast.py | 2 +-
nose2/tests/unit/test_functions_loader.py | 2 +-
nose2/tests/unit/test_junitxml.py | 63 ++++-
nose2/tests/unit/test_layers_plugin.py | 128 +++++++++-
nose2/tests/unit/test_mp_plugin.py | 17 ++
nose2/tests/unit/test_session.py | 2 +-
nose2/tools/such.py | 37 +--
nose2/util.py | 156 +++++++++---
requirements-2.7.txt | 1 +
requirements-3.2.txt | 1 +
.../backports/__init__.py => requirements-3.3.txt | 0
.../backports/__init__.py => requirements-3.4.txt | 0
.../backports/__init__.py => requirements-3.5.txt | 0
.../backports/__init__.py => requirements-3.6.txt | 0
.../backports/__init__.py => requirements-3.7.txt | 0
requirements-docs.txt | 4 +-
requirements-py26.txt | 5 -
requirements-pypy2.7.txt | 1 +
requirements-pypy3.2.txt | 1 +
requirements-pypy3.3.txt | 1 +
.../__init__.py => requirements-pypy3.5.txt | 0
requirements.txt | 2 +-
setup.cfg | 1 -
setup.py | 45 ++--
tox.ini | 38 +--
115 files changed, 2427 insertions(+), 1154 deletions(-)
diff --cc debian/.git-dpm
index 4688239,0000000..b7467a7
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
- b7b971ac88b34fac693c893f38630b8561267a5a
- b7b971ac88b34fac693c893f38630b8561267a5a
- c83bcdbd03446a6ae2561847b00942df67ed22b5
++9932a698755a353ea9f6d806c5ca7afca16a0d00
++9932a698755a353ea9f6d806c5ca7afca16a0d00
++9932a698755a353ea9f6d806c5ca7afca16a0d00
+9932a698755a353ea9f6d806c5ca7afca16a0d00
+nose2_0.7.3.orig.tar.gz
+abf36bb4e87c852ec9918b501cabc8b58ec494e8
+139822
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
--
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