[Python-modules-commits] r28771 - in packages/nose/trunk/debian (7 files)
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Sun May 4 07:14:20 UTC 2014
Date: Sunday, May 4, 2014 @ 07:14:19
Author: mitya57-guest
Revision: 28771
* New upstream bugfix release.
* Drop patches applied upstream (for issues 780, 782, 783 and 788).
* Refresh disable-unstable-tests patch.
Modified:
packages/nose/trunk/debian/changelog
packages/nose/trunk/debian/patches/disable-unstable-tests
packages/nose/trunk/debian/patches/series
Deleted:
packages/nose/trunk/debian/patches/issue780
packages/nose/trunk/debian/patches/issue782
packages/nose/trunk/debian/patches/issue783
packages/nose/trunk/debian/patches/issue788
Modified: packages/nose/trunk/debian/changelog
===================================================================
--- packages/nose/trunk/debian/changelog 2014-05-04 01:12:19 UTC (rev 28770)
+++ packages/nose/trunk/debian/changelog 2014-05-04 07:14:19 UTC (rev 28771)
@@ -1,3 +1,11 @@
+nose (1.3.2-1) UNRELEASED; urgency=medium
+
+ * New upstream bugfix release.
+ * Drop patches applied upstream (for issues 780, 782, 783 and 788).
+ * Refresh disable-unstable-tests patch.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sun, 04 May 2014 11:12:46 +0400
+
nose (1.3.1-2) unstable; urgency=medium
* Backport a patch (issue780) to fix UnboundMethod regression with
Modified: packages/nose/trunk/debian/patches/disable-unstable-tests
===================================================================
--- packages/nose/trunk/debian/patches/disable-unstable-tests 2014-05-04 01:12:19 UTC (rev 28770)
+++ packages/nose/trunk/debian/patches/disable-unstable-tests 2014-05-04 07:14:19 UTC (rev 28771)
@@ -1,7 +1,7 @@
Description: Disable some unstable tests in multiprocessing module
Author: Dmitry Shachnev <mitya57 at gmail.com>
Forwarded: not-needed
-Last-Update: 2014-03-14
+Last-Update: 2014-05-04
--- a/functional_tests/test_multiprocessing/test_keyboardinterrupt.py
+++ b/functional_tests/test_multiprocessing/test_keyboardinterrupt.py
@@ -37,21 +37,3 @@
assert "TimedOutException: 'timeout.test_timeout'" in self.output
assert "Ran 2 tests in" in self.output
assert "FAILED (errors=1)" in self.output
---- a/functional_tests/test_multiprocessing/test_concurrent_shared.py
-+++ b/functional_tests/test_multiprocessing/test_concurrent_shared.py
-@@ -1,6 +1,7 @@
- import os
- import sys
- import unittest
-+import nose
-
- import multiprocessing
- from test_multiprocessing import MPTestBase
-@@ -23,6 +24,7 @@
- MPTestBase.setUp(self)
-
- def runTest(self):
-+ raise nose.SkipTest('Disabled in Debian')
- assert 'Ran 2 tests in 1.' in self.output, "make sure two tests use 1.x seconds (no more than 2 seconds)"
- assert str(self.output).strip().endswith('OK')
-
Deleted: packages/nose/trunk/debian/patches/issue780
===================================================================
--- packages/nose/trunk/debian/patches/issue780 2014-05-04 01:12:19 UTC (rev 28770)
+++ packages/nose/trunk/debian/patches/issue780 2014-05-04 07:14:19 UTC (rev 28771)
@@ -1,16 +0,0 @@
-Description: UnboundMethod: fix a regression with Python 3
-Origin: upstream, https://github.com/nose-devs/nose/commit/43c35e49106916
-Last-Update: 2014-03-24
-
---- a/nose/pyversion.py
-+++ b/nose/pyversion.py
-@@ -89,7 +89,8 @@
- self.__dict__ = func.__dict__.copy()
- self._func = func
- self.__self__ = UnboundSelf(cls)
-- self.im_class = cls
-+ if sys.version_info < (3, 0):
-+ self.im_class = cls
-
- def address(self):
- cls = self.__self__.cls
Deleted: packages/nose/trunk/debian/patches/issue782
===================================================================
--- packages/nose/trunk/debian/patches/issue782 2014-05-04 01:12:19 UTC (rev 28770)
+++ packages/nose/trunk/debian/patches/issue782 2014-05-04 07:14:19 UTC (rev 28771)
@@ -1,46 +0,0 @@
-Description: make doctest work with new configparser versions
-Origin: upstream, https://github.com/nose-devs/nose/commit/5bcedc9a0601b4
-Bug-Debian: https://bugs.debian.org/741750
-Last-Update: 2014-03-19
-
---- a/unit_tests/test_config_defaults.rst
-+++ b/unit_tests/test_config_defaults.rst
-@@ -89,9 +89,9 @@ Invalid config files
-
- (file-like object)
-
-- >>> options, args = parse([], StringIO("spam"))
-+ >>> options, args = parse([], StringIO("spam")) # doctest: +ELLIPSIS
- error: Error reading config file '<???>': File contains no section headers.
-- file: <???>, line: 1
-+ file: ...<???>..., line: 1
- 'spam'
-
- (filename)
-@@ -99,7 +99,7 @@ Invalid config files
- >>> options, args = parse([], os.path.join(support, "invalid.cfg"))
- ... # doctest: +ELLIPSIS
- error: Error reading config file '...invalid.cfg': File contains no section headers.
-- file: ...invalid.cfg, line: 1
-+ file: ...invalid.cfg..., line: 1
- 'spam\n'
-
- (filenames, length == 1)
-@@ -107,7 +107,7 @@ Invalid config files
- >>> options, args = parse([], [os.path.join(support, "invalid.cfg")])
- ... # doctest: +ELLIPSIS
- error: Error reading config file '...invalid.cfg': File contains no section headers.
-- file: ...invalid.cfg, line: 1
-+ file: ...invalid.cfg..., line: 1
- 'spam\n'
-
- (filenames, length > 1)
-@@ -120,7 +120,7 @@ file is bad
- ... os.path.join(support, "b.cfg")])
- ... # doctest: +ELLIPSIS
- error: Error reading config file '...invalid.cfg': File contains no section headers.
-- file: ...invalid.cfg, line: 1
-+ file: ...invalid.cfg..., line: 1
- 'spam\n'
-
-
Deleted: packages/nose/trunk/debian/patches/issue783
===================================================================
--- packages/nose/trunk/debian/patches/issue783 2014-05-04 01:12:19 UTC (rev 28770)
+++ packages/nose/trunk/debian/patches/issue783 2014-05-04 07:14:19 UTC (rev 28771)
@@ -1,24 +0,0 @@
-Description: fix failure in test_try_run
-Origin: upstream, https://github.com/nose-devs/nose/commit/192694ed9f7044
-Last-Update: 2014-03-19
-
---- a/nose/util.py
-+++ b/nose/util.py
-@@ -8,7 +8,7 @@ import re
- import sys
- import types
- import unittest
--from nose.pyversion import ClassType, TypeType, isgenerator
-+from nose.pyversion import ClassType, TypeType, isgenerator, ismethod
-
-
- log = logging.getLogger('nose')
-@@ -449,6 +449,8 @@ def try_run(obj, names):
- # py.test compatibility
- try:
- args, varargs, varkw, defaults = inspect.getargspec(func)
-+ if hasattr(func, '__call__') and ismethod(func.__call__):
-+ args.pop(0)
- except TypeError:
- # Not a function. If it's callable, call it anyway
- if hasattr(func, '__call__'):
Deleted: packages/nose/trunk/debian/patches/issue788
===================================================================
--- packages/nose/trunk/debian/patches/issue788 2014-05-04 01:12:19 UTC (rev 28770)
+++ packages/nose/trunk/debian/patches/issue788 2014-05-04 07:14:19 UTC (rev 28771)
@@ -1,17 +0,0 @@
-Description: fix issue680 test failure when LC_ALL=C
-Origin: upstream, https://github.com/nose-devs/nose/commit/759d91cdcf654f
-Last-Update: 2014-03-19
-
---- a/functional_tests/test_xunit.py
-+++ b/functional_tests/test_xunit.py
-@@ -86,8 +86,8 @@ class TestIssue680(PluginTester, unittest.TestCase):
-
- def runTest(self):
- print str(self.output)
-- f = open(xml_results_filename,'r')
-- result = f.read()
-+ f = open(xml_results_filename,'rb')
-+ result = f.read().decode('utf-8')
- f.close()
- print result
- assert 'tests="1" errors="0" failures="0" skip="0"' in result
Modified: packages/nose/trunk/debian/patches/series
===================================================================
--- packages/nose/trunk/debian/patches/series 2014-05-04 01:12:19 UTC (rev 28770)
+++ packages/nose/trunk/debian/patches/series 2014-05-04 07:14:19 UTC (rev 28771)
@@ -2,7 +2,3 @@
no-google-analytics
no-distribute_setup
disable-unstable-tests
-issue780
-issue782
-issue783
-issue788
More information about the Python-modules-commits
mailing list