[Python-modules-commits] [nose] 01/01: Convert from git-dpm to patches unapplied format
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Mon Oct 30 20:13:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch debian/master
in repository nose.
commit aaa29c25635fac4790fdc68283a28fc4d0077855
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Mon Oct 30 23:13:32 2017 +0300
Convert from git-dpm to patches unapplied format
---
debian/.git-dpm | 11 -----------
debian/gbp.conf | 2 ++
doc/.templates/layout.html | 13 +++++++++++++
functional_tests/test_load_tests_from_test_case.py | 1 -
.../test_multiprocessing/test_keyboardinterrupt.py | 2 --
.../test_multiprocessing/test_process_timeout.py | 2 --
nose/plugins/cover.py | 4 ++--
nose/util.py | 1 -
setup.py | 8 ++++++--
unit_tests/test_xunit.py | 1 -
10 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 97c3345..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-bec238f776c0121d7be097b4e8e6b965f90d9375
-bec238f776c0121d7be097b4e8e6b965f90d9375
-f97053e0cd15a0709976837af19b8c3ecb4ebc3a
-f97053e0cd15a0709976837af19b8c3ecb4ebc3a
-nose_1.3.7.orig.tar.gz
-97f2a04c9d43b29ddf4794a1a1d1ba803f1074c6
-280488
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..3879982
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master
diff --git a/doc/.templates/layout.html b/doc/.templates/layout.html
index 4237ef7..2d961b0 100644
--- a/doc/.templates/layout.html
+++ b/doc/.templates/layout.html
@@ -3,3 +3,16 @@
{%- block relbar1 %}
{% if pagename != 'index' %}{{ super() }}{% endif %}
{% endblock %}
+
+{%- block footer %}
+{{ super() }}
+{% if not embedded %}
+<script src="http://www.google-analytics.com/urchin.js"
+ type="text/javascript">
+</script>
+<script type="text/javascript">
+ _uacct = "UA-2236166-1";
+ urchinTracker();
+</script>
+{% endif %}
+{%- endblock %}
diff --git a/functional_tests/test_load_tests_from_test_case.py b/functional_tests/test_load_tests_from_test_case.py
index 13d0c8a..42f8563 100644
--- a/functional_tests/test_load_tests_from_test_case.py
+++ b/functional_tests/test_load_tests_from_test_case.py
@@ -29,7 +29,6 @@ class NoFixturePlug(Plugin):
pass
def tearDown(self):
pass
- Derived.__qualname__ = Derived.__name__
# must use nose loader here because the default loader in 2.3
# won't load tests from base classes
l = loader.TestLoader()
diff --git a/functional_tests/test_multiprocessing/test_keyboardinterrupt.py b/functional_tests/test_multiprocessing/test_keyboardinterrupt.py
index aead7e2..18c8af1 100644
--- a/functional_tests/test_multiprocessing/test_keyboardinterrupt.py
+++ b/functional_tests/test_multiprocessing/test_keyboardinterrupt.py
@@ -63,7 +63,6 @@ def get_log_content(logfile):
return content
def test_keyboardinterrupt():
- raise nose.SkipTest('Disabled in Debian')
process, logfile, _ = keyboardinterrupt('keyboardinterrupt.py')
stdout, stderr = [s.decode('utf-8') for s in process.communicate(None)]
log = get_log_content(logfile)
@@ -84,7 +83,6 @@ def test_keyboardinterrupt():
def test_keyboardinterrupt_twice():
- raise nose.SkipTest('Disabled in Debian')
process, logfile, killfile = keyboardinterrupt('keyboardinterrupt_twice.py')
waitForKillFile(killfile)
os.killpg(process.pid, signal.SIGINT)
diff --git a/functional_tests/test_multiprocessing/test_process_timeout.py b/functional_tests/test_multiprocessing/test_process_timeout.py
index 73b4e3b..6b858f8 100644
--- a/functional_tests/test_multiprocessing/test_process_timeout.py
+++ b/functional_tests/test_multiprocessing/test_process_timeout.py
@@ -1,5 +1,4 @@
import os
-import nose
from test_multiprocessing import MPTestBase
@@ -8,7 +7,6 @@ class TestMPTimeout(MPTestBase):
suitepath = os.path.join(os.path.dirname(__file__), 'support', 'timeout.py')
def runTest(self):
- raise nose.SkipTest('Disabled in Debian')
assert "TimedOutException: 'timeout.test_timeout'" in self.output
assert "Ran 2 tests in" in self.output
assert "FAILED (errors=1)" in self.output
diff --git a/nose/plugins/cover.py b/nose/plugins/cover.py
index b9bfc82..fbe2e30 100644
--- a/nose/plugins/cover.py
+++ b/nose/plugins/cover.py
@@ -187,7 +187,7 @@ class Coverage(Plugin):
for name, module in sys.modules.items()
if self.wantModuleCoverage(name, module)]
log.debug("Coverage report will cover modules: %s", modules)
- self.coverInstance.report(modules, file=stream, show_missing=True)
+ self.coverInstance.report(modules, file=stream)
import coverage
if self.coverHtmlDir:
@@ -207,7 +207,7 @@ class Coverage(Plugin):
# make sure we have minimum required coverage
if self.coverMinPercentage:
f = StringIO.StringIO()
- self.coverInstance.report(modules, file=f, show_missing=True)
+ self.coverInstance.report(modules, file=f)
multiPackageRe = (r'-------\s\w+\s+\d+\s+\d+(?:\s+\d+\s+\d+)?'
r'\s+(\d+)%\s+\d*\s{0,1}$')
diff --git a/nose/util.py b/nose/util.py
index 80ab1d4..bfe1658 100644
--- a/nose/util.py
+++ b/nose/util.py
@@ -643,7 +643,6 @@ def transplant_class(cls, module):
pass
C.__module__ = module
C.__name__ = cls.__name__
- C.__qualname__ = cls.__name__
return C
diff --git a/setup.py b/setup.py
index 765b7ae..a2091c0 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,11 @@ py_vers_tag = '-%s.%s' % sys.version_info[:2]
test_dirs = ['functional_tests', 'unit_tests', os.path.join('doc','doc_tests'), 'nose']
if sys.version_info >= (3,):
- import setuptools
+ try:
+ import setuptools
+ except ImportError:
+ from distribute_setup import use_setuptools
+ use_setuptools()
extra = {'use_2to3': True,
'test_dirs': test_dirs,
@@ -102,7 +106,7 @@ setup(
license = 'GNU LGPL',
keywords = 'test unittest doctest automatic discovery',
url = 'http://readthedocs.org/docs/nose/',
- #data_files = [('man/man1', ['nosetests.1'])],
+ data_files = [('man/man1', ['nosetests.1'])],
package_data = {'': ['*.txt',
'examples/*.py',
'examples/*/*.py']},
diff --git a/unit_tests/test_xunit.py b/unit_tests/test_xunit.py
index 2a9f69b..d98ccba 100644
--- a/unit_tests/test_xunit.py
+++ b/unit_tests/test_xunit.py
@@ -16,7 +16,6 @@ def mktest():
class TC(unittest.TestCase):
def runTest(self):
pass
- TC.__qualname__ = TC.__name__
test = TC()
return test
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/nose.git
More information about the Python-modules-commits
mailing list