[Python-modules-commits] [nose] 07/08: merge patched into master
Brian May
bam at moszumanska.debian.org
Thu Nov 19 00:19:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository nose.
commit a6a651e0a57535e783142e2dc96435e79e7a4076
Merge: 5ad9867 f15c252
Author: Brian May <bam at debian.org>
Date: Thu Nov 19 11:07:11 2015 +1100
merge patched into master
CHANGELOG | 5 +++++
PKG-INFO | 2 +-
debian/.git-dpm | 6 ++---
debian/patches/disable-unstable-tests | 8 +++----
debian/patches/no-distribute_setup | 4 ++--
debian/patches/no-google-analytics | 2 +-
debian/patches/no-install-data | 4 ++--
.../doc_tests/test_init_plugin/example.cfg | 3 +++
.../test_xunit_plugin/support/nosetests.xml | 18 +++++++++++++++
functional_tests/nosetests.xml | 2 ++
functional_tests/support/coverage2/.coverage | Bin 0 -> 3896 bytes
.../support/issue191/UNKNOWN.egg-info/PKG-INFO | 10 +++++++++
.../support/issue191/UNKNOWN.egg-info/SOURCES.txt | 6 +++++
.../issue191/UNKNOWN.egg-info/dependency_links.txt | 1 +
.../issue191/UNKNOWN.egg-info/top_level.txt | 1 +
functional_tests/support/issue408/nosetests.xml | 0
functional_tests/support/xunit.xml | 25 +++++++++++++++++++++
.../test_multiprocessing/test_keyboardinterrupt.py | 4 ++++
nose.egg-info/PKG-INFO | 2 +-
nose.egg-info/SOURCES.txt | 11 +++++++++
nose/__init__.py | 2 +-
nose/loader.py | 10 ++++-----
setup.py | 2 +-
unit_tests/support/doctest/noname_wrapped.not_pyc | Bin 0 -> 378 bytes
24 files changed, 106 insertions(+), 22 deletions(-)
diff --cc debian/.git-dpm
index bf758d9,0000000..f466f20
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
- a25b870ba7e9120b511f225adffaf7573e1db952
- a25b870ba7e9120b511f225adffaf7573e1db952
- 111d43588cf3a65f0b219649b47deba1602a02e8
++f15c252c5e4e8b1ea9d6924b2a9bec4efbacbd00
++f15c252c5e4e8b1ea9d6924b2a9bec4efbacbd00
++f97053e0cd15a0709976837af19b8c3ecb4ebc3a
+f97053e0cd15a0709976837af19b8c3ecb4ebc3a
+nose_1.3.7.orig.tar.gz
+97f2a04c9d43b29ddf4794a1a1d1ba803f1074c6
+280488
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/disable-unstable-tests
index c34cd1c,0000000..110ee0b
mode 100644,000000..100644
--- a/debian/patches/disable-unstable-tests
+++ b/debian/patches/disable-unstable-tests
@@@ -1,52 -1,0 +1,52 @@@
- From a25b870ba7e9120b511f225adffaf7573e1db952 Mon Sep 17 00:00:00 2001
++From f15c252c5e4e8b1ea9d6924b2a9bec4efbacbd00 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57 at gmail.com>
+Date: Thu, 8 Oct 2015 10:02:00 -0700
+Subject: Disable some unstable tests in multiprocessing module
+
+Forwarded: not-needed
+Last-Update: 2014-05-04
+
+Patch-Name: disable-unstable-tests
+---
+ functional_tests/test_multiprocessing/test_keyboardinterrupt.py | 2 ++
+ functional_tests/test_multiprocessing/test_process_timeout.py | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/functional_tests/test_multiprocessing/test_keyboardinterrupt.py b/functional_tests/test_multiprocessing/test_keyboardinterrupt.py
- index 2bcbe73..adfe5e6 100644
++index 18c8af1..aead7e2 100644
+--- a/functional_tests/test_multiprocessing/test_keyboardinterrupt.py
++++ b/functional_tests/test_multiprocessing/test_keyboardinterrupt.py
- @@ -59,6 +59,7 @@ def get_log_content(logfile):
++@@ -63,6 +63,7 @@ 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)
- @@ -79,6 +80,7 @@ def test_keyboardinterrupt():
++@@ -83,6 +84,7 @@ 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 6b858f8..73b4e3b 100644
+--- a/functional_tests/test_multiprocessing/test_process_timeout.py
++++ b/functional_tests/test_multiprocessing/test_process_timeout.py
+@@ -1,4 +1,5 @@
+ import os
++import nose
+
+ from test_multiprocessing import MPTestBase
+
+@@ -7,6 +8,7 @@ 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 --cc debian/patches/no-distribute_setup
index a83cee6,0000000..93654c6
mode 100644,000000..100644
--- a/debian/patches/no-distribute_setup
+++ b/debian/patches/no-distribute_setup
@@@ -1,31 -1,0 +1,31 @@@
- From 3b43067beb604d20e8c6bba3cd683580f682fc85 Mon Sep 17 00:00:00 2001
++From decd72017fb1400fd4afb4bfae2dabee1d81a333 Mon Sep 17 00:00:00 2001
+From: Stefano Rivera <stefanor at debian.org>
+Date: Thu, 8 Oct 2015 10:01:59 -0700
+Subject: Don't even think about using distribute_setup to download things
+ during build
+
+Forwarded: not-needed
+Last-Update: 2012-02-03
+
+Patch-Name: no-distribute_setup
+---
+ setup.py | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index 9724f9a..7c60184 100644
++index a710b30..765b7ae 100644
+--- a/setup.py
++++ b/setup.py
+@@ -7,11 +7,7 @@ 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,):
+- try:
+- import setuptools
+- except ImportError:
+- from distribute_setup import use_setuptools
+- use_setuptools()
++ import setuptools
+
+ extra = {'use_2to3': True,
+ 'test_dirs': test_dirs,
diff --cc debian/patches/no-google-analytics
index 42f7103,0000000..89f00e4
mode 100644,000000..100644
--- a/debian/patches/no-google-analytics
+++ b/debian/patches/no-google-analytics
@@@ -1,34 -1,0 +1,34 @@@
- From d62d2ff9276767dd36e2c64fabbfd18f3b964697 Mon Sep 17 00:00:00 2001
++From 8de672fb0d7d512c95472d10e99b17e51890f79c Mon Sep 17 00:00:00 2001
+From: Stefano Rivera <stefanor at debian.org>
+Date: Thu, 8 Oct 2015 10:01:58 -0700
+Subject: Remove Google Analytics tracking JS
+
+Forwarded: not-needed
+Last-Update: 2013-03-04
+
+Patch-Name: no-google-analytics
+---
+ doc/.templates/layout.html | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/doc/.templates/layout.html b/doc/.templates/layout.html
+index 2d961b0..4237ef7 100644
+--- a/doc/.templates/layout.html
++++ b/doc/.templates/layout.html
+@@ -3,16 +3,3 @@
+ {%- 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 --cc debian/patches/no-install-data
index 2d1acac,0000000..f2bb862
mode 100644,000000..100644
--- a/debian/patches/no-install-data
+++ b/debian/patches/no-install-data
@@@ -1,27 -1,0 +1,27 @@@
- From 8281a3389608667d1b9ee6473ae9b9ec8a001689 Mon Sep 17 00:00:00 2001
++From 5498e10a2aa0527b5ec9c0bc1c6deb0dae7508e2 Mon Sep 17 00:00:00 2001
+From: Charlie Smotherman <cjsmo at cableone.net>
+Date: Thu, 8 Oct 2015 10:01:57 -0700
+Subject: Don't install manpage with setup.py.
+
+ Use debhelper to install manpage so we can use update-alternatives to
+ manage the manpages.
+Last-Update: 2013-03-04
+
+Patch-Name: no-install-data
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
- index 5695444..9724f9a 100644
++index a2091c0..a710b30 100644
+--- a/setup.py
++++ b/setup.py
+@@ -106,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']},
--
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