[Python-modules-commits] r33565 - in packages/python-mock/tags (12 files)
fladi at users.alioth.debian.org
fladi at users.alioth.debian.org
Fri Jul 31 17:05:25 UTC 2015
Date: Friday, July 31, 2015 @ 17:05:24
Author: fladi
Revision: 33565
[svn-buildpackage] Tagging python-mock 1.3.0-2
Added:
packages/python-mock/tags/1.3.0-2/
packages/python-mock/tags/1.3.0-2/debian/changelog
(from rev 33564, packages/python-mock/trunk/debian/changelog)
packages/python-mock/tags/1.3.0-2/debian/control
(from rev 33563, packages/python-mock/trunk/debian/control)
packages/python-mock/tags/1.3.0-2/debian/patches/
packages/python-mock/tags/1.3.0-2/debian/patches/pbr.patch
(from rev 33561, packages/python-mock/trunk/debian/patches/pbr.patch)
packages/python-mock/tags/1.3.0-2/debian/patches/series
(from rev 33561, packages/python-mock/trunk/debian/patches/series)
packages/python-mock/tags/1.3.0-2/debian/rules
(from rev 33505, packages/python-mock/trunk/debian/rules)
Deleted:
packages/python-mock/tags/1.3.0-2/debian/changelog
packages/python-mock/tags/1.3.0-2/debian/control
packages/python-mock/tags/1.3.0-2/debian/patches/series
packages/python-mock/tags/1.3.0-2/debian/patches/six.patch
packages/python-mock/tags/1.3.0-2/debian/rules
Deleted: packages/python-mock/tags/1.3.0-2/debian/changelog
===================================================================
--- packages/python-mock/trunk/debian/changelog 2015-07-22 19:35:28 UTC (rev 33448)
+++ packages/python-mock/tags/1.3.0-2/debian/changelog 2015-07-31 17:05:24 UTC (rev 33565)
@@ -1,115 +0,0 @@
-python-mock (1.0.1+dfsg-4) UNRELEASED; urgency=medium
-
- [ Jean-Michel Nirgal Vourgère ]
- * Remove David Watson from Uploaders. (Closes: #771614)
-
- [ Michael Fladischer ]
- * Add lintian override for missing PGP signature on upstream tarballs.
- * Use pypi.debian.net service for uscan.
- * Add dversionmangle and repacksuffix options for DFSG-repack to
- d/watch.
- * Do not include prebuilt HTML documentation in source tarball.
- * Bump Standards-Version to 3.9.6.
- * Drop unnecessary versioned dependencies on python-all and python3-
- all.
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 10 Mar 2014 20:33:25 +0100
-
-python-mock (1.0.1-3) unstable; urgency=medium
-
- * Team upload.
- * d/patches/python3.4_compat.patch: Fix FTBFS with Python 3.4.
- (Closes: #739890) (LP: #1283742)
- * d/control: Bump Standards-Version with no other changes necessary.
-
- -- Barry Warsaw <barry at debian.org> Wed, 26 Feb 2014 15:39:36 -0500
-
-python-mock (1.0.1-2) unstable; urgency=low
-
- [ Michael Fladischer ]
- * Upload to unstable.
- * Remove temporary fix for PKG-INFO.
-
- [ Jakub Wilk ]
- * Use canonical URIs for Vcs-* fields.
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Wed, 08 May 2013 07:45:16 +0200
-
-python-mock (1.0.1-1) experimental; urgency=low
-
- [ Michael Fladischer]
- * New upstream release.
- * Fix upstream name, contact and year in d/copyright.
-
- [ Thomas Goirand ]
- * Uploading to experimental.
-
- -- Thomas Goirand <zigo at debian.org> Thu, 14 Feb 2013 21:43:58 +0800
-
-python-mock (0.8.0-3) unstable; urgency=low
-
- * Team upload.
- * debian/control: python-mock-doc needs to Break/Replace
- python-mock (<< 0.7.2) to ensure clean upgrades from squeeze
- to wheezy. Thanks to Andreas Beckmann (Closes: #694296).
-
- -- Andrew Starr-Bochicchio <asb at debian.org> Fri, 30 Nov 2012 17:02:02 -0500
-
-python-mock (0.8.0-2) unstable; urgency=low
-
- * Add mock.egg-info/PKG-INFO to d/clean to allow two builds in a row
- (Closes: #671252).
- * Run tests during build (Closes: #667554).
- - Add patch for python3 unittests.
- - B-D on python-unittest2 for python2.x.
- - Add override for dh_auto_test.
- * Exclude SOURCES.txt and add temporary fix for Metadata-Version in
- PKG-INFO.
- * Change order of my name.
- * Update years in d/copyright.
- * Use DEP5 1.0 format URL.
- * Drop d/s/local-options from SVN.
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 04 Jun 2012 20:34:13 +0200
-
-python-mock (0.8.0-1) unstable; urgency=low
-
- * Team upload.
- * New upstream release
- * debian/control
- - bump Standards-Version to 3.9.3 (no changes needed)
-
- -- Sandro Tosi <morph at debian.org> Wed, 04 Apr 2012 23:08:09 +0200
-
-python-mock (0.7.2-1) unstable; urgency=low
-
- * New upstream release. (Closes: #617799)
- * Set PMPT as maintainer and myself as uploader.
- * Switch to source format 3.0 (quilt).
- * Switch to dh_python2.
- * Use pypi.python.org in d/watch.
- * Use DEP5 for copyright file.
- * Streamline packaging code with wrap-and-sort.
- * Bumped Standards-Version to 3.9.2 (no change necessary).
- * Move HTML documentation to u/s/d/python-mock/html/.
- * Use dh_link to create the documentation source symlinks.
- * Set X-P-V to >= 2.4.
- * Build for Python3.
- * Use dh_sphinxdoc.
- * Ship documentation in separate package.
-
- -- Fladischer Michael <FladischerMichael at fladi.at> Tue, 23 Aug 2011 13:13:44 +0200
-
-python-mock (0.6.0-1.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * Fix "doesn't depend on python" by applying patch to debian/control
- by Jakub Wilk (Closes: #588586)
-
- -- Marek Kubica <marek at xivilization.net> Sat, 17 Jul 2010 12:27:08 +0200
-
-python-mock (0.6.0-1) unstable; urgency=low
-
- * Initial release (Closes: #540372)
-
- -- David Watson <david at kutoken.com> Fri, 21 Aug 2009 14:22:49 +0100
Copied: packages/python-mock/tags/1.3.0-2/debian/changelog (from rev 33564, packages/python-mock/trunk/debian/changelog)
===================================================================
--- packages/python-mock/tags/1.3.0-2/debian/changelog (rev 0)
+++ packages/python-mock/tags/1.3.0-2/debian/changelog 2015-07-31 17:05:24 UTC (rev 33565)
@@ -0,0 +1,142 @@
+python-mock (1.3.0-2) unstable; urgency=medium
+
+ * Lower Build-Depends on python-pbr to (>= 0.11) to allow it to build
+ in unstable (Closes: #793945).
+ * Add pbr.patch to sync pbr version between requirements.txt and
+ setup.py.
+ * Add python-funcsigs to Depends (Closes: #794013).
+ * Build-Depend on unittest2 (>= 1.1.0) so we can drop six.patch.
+ * Remove six.patch now that there is a sufficiently new unittest2
+ available.
+
+ -- Michael Fladischer <fladi at debian.org> Fri, 31 Jul 2015 12:17:26 +0200
+
+python-mock (1.3.0-1) unstable; urgency=medium
+
+ [ Jean-Michel Nirgal Vourgère ]
+ * Remove David Watson from Uploaders. (Closes: #771614)
+
+ [ Michael Fladischer ]
+ * New upstream release.
+ * Add six.patch to provide python2 and 3 compatibility for tests.
+ * Add python-six and python3-six to Build-Depends.
+ * Add OSLO_PACKAGE_VERSION in d/rules to allow pbr to run the tests.
+ * Add lintian override for missing PGP signature on upstream tarballs.
+ * Add dversionmangle and repacksuffix options for DFSG-repack to
+ d/watch.
+ * Bump Standards-Version to 3.9.6.
+ * Drop unnecessary versioned dependencies on python-all and python3-
+ all.
+ * Update years in d/copyright.
+ * Change my email address to fladi at debian.org.
+ * Use pypi.debian.net service for uscan.
+ * Switch buildsystem to pybuild.
+ * Remove PHONY target declarations from d/rules.
+ * Remove html directory from Files-Excluded as upstream no longer
+ ships it in their tarball.
+ * Remove python3.2_tests.patch and python3.4_compat.patch as they are
+ no longer needed.
+ * Rename BSD-mock license to BSD-3-clause.
+ * Add python(3)-pbr and python-setuptools (>= 17.1) to Build-Depends.
+ * Reformat packaging files with cme for better readability.
+
+ -- Michael Fladischer <fladi at debian.org> Tue, 28 Jul 2015 17:31:58 +0200
+
+python-mock (1.0.1-3) unstable; urgency=medium
+
+ * Team upload.
+ * d/patches/python3.4_compat.patch: Fix FTBFS with Python 3.4.
+ (Closes: #739890) (LP: #1283742)
+ * d/control: Bump Standards-Version with no other changes necessary.
+
+ -- Barry Warsaw <barry at debian.org> Wed, 26 Feb 2014 15:39:36 -0500
+
+python-mock (1.0.1-2) unstable; urgency=low
+
+ [ Michael Fladischer ]
+ * Upload to unstable.
+ * Remove temporary fix for PKG-INFO.
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Wed, 08 May 2013 07:45:16 +0200
+
+python-mock (1.0.1-1) experimental; urgency=low
+
+ [ Michael Fladischer]
+ * New upstream release.
+ * Fix upstream name, contact and year in d/copyright.
+
+ [ Thomas Goirand ]
+ * Uploading to experimental.
+
+ -- Thomas Goirand <zigo at debian.org> Thu, 14 Feb 2013 21:43:58 +0800
+
+python-mock (0.8.0-3) unstable; urgency=low
+
+ * Team upload.
+ * debian/control: python-mock-doc needs to Break/Replace
+ python-mock (<< 0.7.2) to ensure clean upgrades from squeeze
+ to wheezy. Thanks to Andreas Beckmann (Closes: #694296).
+
+ -- Andrew Starr-Bochicchio <asb at debian.org> Fri, 30 Nov 2012 17:02:02 -0500
+
+python-mock (0.8.0-2) unstable; urgency=low
+
+ * Add mock.egg-info/PKG-INFO to d/clean to allow two builds in a row
+ (Closes: #671252).
+ * Run tests during build (Closes: #667554).
+ - Add patch for python3 unittests.
+ - B-D on python-unittest2 for python2.x.
+ - Add override for dh_auto_test.
+ * Exclude SOURCES.txt and add temporary fix for Metadata-Version in
+ PKG-INFO.
+ * Change order of my name.
+ * Update years in d/copyright.
+ * Use DEP5 1.0 format URL.
+ * Drop d/s/local-options from SVN.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 04 Jun 2012 20:34:13 +0200
+
+python-mock (0.8.0-1) unstable; urgency=low
+
+ * Team upload.
+ * New upstream release
+ * debian/control
+ - bump Standards-Version to 3.9.3 (no changes needed)
+
+ -- Sandro Tosi <morph at debian.org> Wed, 04 Apr 2012 23:08:09 +0200
+
+python-mock (0.7.2-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #617799)
+ * Set PMPT as maintainer and myself as uploader.
+ * Switch to source format 3.0 (quilt).
+ * Switch to dh_python2.
+ * Use pypi.python.org in d/watch.
+ * Use DEP5 for copyright file.
+ * Streamline packaging code with wrap-and-sort.
+ * Bumped Standards-Version to 3.9.2 (no change necessary).
+ * Move HTML documentation to u/s/d/python-mock/html/.
+ * Use dh_link to create the documentation source symlinks.
+ * Set X-P-V to >= 2.4.
+ * Build for Python3.
+ * Use dh_sphinxdoc.
+ * Ship documentation in separate package.
+
+ -- Fladischer Michael <FladischerMichael at fladi.at> Tue, 23 Aug 2011 13:13:44 +0200
+
+python-mock (0.6.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "doesn't depend on python" by applying patch to debian/control
+ by Jakub Wilk (Closes: #588586)
+
+ -- Marek Kubica <marek at xivilization.net> Sat, 17 Jul 2010 12:27:08 +0200
+
+python-mock (0.6.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #540372)
+
+ -- David Watson <david at kutoken.com> Fri, 21 Aug 2009 14:22:49 +0100
Deleted: packages/python-mock/tags/1.3.0-2/debian/control
===================================================================
--- packages/python-mock/trunk/debian/control 2015-07-22 19:35:28 UTC (rev 33448)
+++ packages/python-mock/tags/1.3.0-2/debian/control 2015-07-31 17:05:24 UTC (rev 33565)
@@ -1,67 +0,0 @@
-Source: python-mock
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Michael Fladischer <fladi at debian.org>
-Section: python
-Priority: extra
-Build-Depends: debhelper (>= 8),
- dh-python,
- python-all,
- python-pbr (>= 1.3),
- python-setuptools (>= 17.1),
- python-unittest2,
- python3-all,
- python3-pbr (>= 1.3),
- python3-setuptools
-Build-Depends-Indep: libjs-jquery,
- python-sphinx (>= 1.0.7+dfsg-1~)
-Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-mock/trunk/
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-mock/trunk/
-Homepage: http://www.voidspace.org.uk/python/mock/
-X-Python-Version: >= 2.4
-X-Python3-Version: >= 3.0
-
-Package: python-mock
-Architecture: all
-Depends: ${misc:Depends},
- ${python:Depends}
-Suggests: python-mock-doc
-Description: Mocking and Testing Library
- mock provides a core mock.Mock class that is intended to reduce the
- need to create a host of trivial stubs throughout your test suite.
- After performing an action, you can make assertions about which methods
- / attributes were used and arguments they were called with. You can
- also specify return values and set specific attributes in the normal
- way.
-
-Package: python3-mock
-Architecture: all
-Depends: ${misc:Depends},
- ${python3:Depends}
-Suggests: python-mock-doc
-Description: Mocking and Testing Library (Python3 version)
- mock provides a core mock.Mock class that is intended to reduce the
- need to create a host of trivial stubs throughout your test suite.
- After performing an action, you can make assertions about which methods
- / attributes were used and arguments they were called with. You can
- also specify return values and set specific attributes in the normal
- way.
- .
- This package contains the Python 3 version of the library.
-
-Package: python-mock-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends},
- ${sphinxdoc:Depends}
-Breaks: python-mock (<< 0.7.2)
-Replaces: python-mock (<< 0.7.2)
-Description: Mocking and Testing Library (Documentation)
- mock provides a core mock.Mock class that is intended to reduce the
- need to create a host of trivial stubs throughout your test suite.
- After performing an action, you can make assertions about which methods
- / attributes were used and arguments they were called with. You can
- also specify return values and set specific attributes in the normal
- way.
- .
- This package contains the documentation.
Copied: packages/python-mock/tags/1.3.0-2/debian/control (from rev 33563, packages/python-mock/trunk/debian/control)
===================================================================
--- packages/python-mock/tags/1.3.0-2/debian/control (rev 0)
+++ packages/python-mock/tags/1.3.0-2/debian/control 2015-07-31 17:05:24 UTC (rev 33565)
@@ -0,0 +1,72 @@
+Source: python-mock
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Michael Fladischer <fladi at debian.org>
+Section: python
+Priority: extra
+Build-Depends: debhelper (>= 8),
+ dh-python,
+ python-all,
+ python-funcsigs,
+ python-pbr (>= 0.11),
+ python-setuptools (>= 17.1),
+ python-six,
+ python-unittest2 (>= 1.1.0),
+ python3-all,
+ python3-pbr (>= 0.11),
+ python3-setuptools,
+ python3-six,
+ python3-unittest2
+Build-Depends-Indep: libjs-jquery,
+ python-sphinx (>= 1.0.7+dfsg-1~)
+Standards-Version: 3.9.6
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-mock/trunk/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-mock/trunk/
+Homepage: http://www.voidspace.org.uk/python/mock/
+X-Python-Version: >= 2.4
+X-Python3-Version: >= 3.0
+
+Package: python-mock
+Architecture: all
+Depends: python-funcsigs,
+ ${misc:Depends},
+ ${python:Depends}
+Suggests: python-mock-doc
+Description: Mocking and Testing Library
+ mock provides a core mock.Mock class that is intended to reduce the
+ need to create a host of trivial stubs throughout your test suite.
+ After performing an action, you can make assertions about which methods
+ / attributes were used and arguments they were called with. You can
+ also specify return values and set specific attributes in the normal
+ way.
+
+Package: python3-mock
+Architecture: all
+Depends: ${misc:Depends},
+ ${python3:Depends}
+Suggests: python-mock-doc
+Description: Mocking and Testing Library (Python3 version)
+ mock provides a core mock.Mock class that is intended to reduce the
+ need to create a host of trivial stubs throughout your test suite.
+ After performing an action, you can make assertions about which methods
+ / attributes were used and arguments they were called with. You can
+ also specify return values and set specific attributes in the normal
+ way.
+ .
+ This package contains the Python 3 version of the library.
+
+Package: python-mock-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends},
+ ${sphinxdoc:Depends}
+Breaks: python-mock (<< 0.7.2)
+Replaces: python-mock (<< 0.7.2)
+Description: Mocking and Testing Library (Documentation)
+ mock provides a core mock.Mock class that is intended to reduce the
+ need to create a host of trivial stubs throughout your test suite.
+ After performing an action, you can make assertions about which methods
+ / attributes were used and arguments they were called with. You can
+ also specify return values and set specific attributes in the normal
+ way.
+ .
+ This package contains the documentation.
Copied: packages/python-mock/tags/1.3.0-2/debian/patches/pbr.patch (from rev 33561, packages/python-mock/trunk/debian/patches/pbr.patch)
===================================================================
--- packages/python-mock/tags/1.3.0-2/debian/patches/pbr.patch (rev 0)
+++ packages/python-mock/tags/1.3.0-2/debian/patches/pbr.patch 2015-07-31 17:05:24 UTC (rev 33565)
@@ -0,0 +1,16 @@
+Description: sync pbr version between requirements.txt and setup.py
+Author: Michael Fladischer <fladi at debian.org>
+Last-Update: 2015-07-31
+Forwarded: no
+
+Index: python-mock/setup.py
+===================================================================
+--- python-mock.orig/setup.py 2015-07-15 02:06:46.000000000 +0200
++++ python-mock/setup.py 2015-07-31 18:37:58.533472306 +0200
+@@ -14,5 +14,5 @@
+ sys.exit(1)
+
+ setuptools.setup(
+- setup_requires=['pbr>=1.3'],
++ setup_requires=['pbr>=0.11'],
+ pbr=True)
Deleted: packages/python-mock/tags/1.3.0-2/debian/patches/series
===================================================================
--- packages/python-mock/trunk/debian/patches/series 2015-07-28 15:31:16 UTC (rev 33506)
+++ packages/python-mock/tags/1.3.0-2/debian/patches/series 2015-07-31 17:05:24 UTC (rev 33565)
@@ -1 +0,0 @@
-six.patch
Copied: packages/python-mock/tags/1.3.0-2/debian/patches/series (from rev 33561, packages/python-mock/trunk/debian/patches/series)
===================================================================
--- packages/python-mock/tags/1.3.0-2/debian/patches/series (rev 0)
+++ packages/python-mock/tags/1.3.0-2/debian/patches/series 2015-07-31 17:05:24 UTC (rev 33565)
@@ -0,0 +1 @@
+pbr.patch
Deleted: packages/python-mock/tags/1.3.0-2/debian/patches/six.patch
===================================================================
--- packages/python-mock/trunk/debian/patches/six.patch 2015-07-28 15:31:16 UTC (rev 33506)
+++ packages/python-mock/tags/1.3.0-2/debian/patches/six.patch 2015-07-31 17:05:24 UTC (rev 33565)
@@ -1,351 +0,0 @@
-Description: Use six to make tests useable in both python2 and 3
- Upstream uses methods from the unittest framework (assertRaisesRegex[p]) that haven been renamed
- between python2 and 3. six already provides a convenience wrapper for this. The
- internal detection of python2/3 has been replaced with the one from six.
- The unittest framework is now imported using its python2.7 name instead of
- importing unittest2 as unittest.
-Author: Michael Fladischer <fladi at debian.org>
-Last-Update: 2015-07-28
-Forwarded: no
-
-Index: python-mock/mock/tests/testmock.py
-===================================================================
---- python-mock.orig/mock/tests/testmock.py 2015-07-23 21:20:55.000000000 +0200
-+++ python-mock/mock/tests/testmock.py 2015-07-28 17:07:22.857335343 +0200
-@@ -2,15 +2,16 @@
- # E-mail: fuzzyman AT voidspace DOT org DOT uk
- # http://www.voidspace.org.uk/python/mock/
-
--import unittest2 as unittest
- from mock.tests.support import (
-- callable, inPy3k, is_instance, next
-+ callable, is_instance, next
- )
-
-+import six
- import copy
- import pickle
- import sys
- import tempfile
-+import unittest
-
- import mock
- from mock import (
-@@ -206,7 +207,7 @@
-
- mock = create_autospec(f)
- mock.side_effect = ValueError('Bazinga!')
-- self.assertRaisesRegex(ValueError, 'Bazinga!', mock)
-+ six.assertRaisesRegex(self, ValueError, 'Bazinga!', mock)
-
- @unittest.skipUnless('java' in sys.platform,
- 'This test only applies to Jython')
-@@ -499,7 +500,8 @@
-
- # this should be allowed
- mock.something
-- self.assertRaisesRegex(
-+ six.assertRaisesRegex(
-+ self,
- AttributeError,
- "Mock object has no attribute 'something_else'",
- getattr, mock, 'something_else'
-@@ -518,12 +520,14 @@
- mock.x
- mock.y
- mock.__something__
-- self.assertRaisesRegex(
-+ six.assertRaisesRegex(
-+ self,
- AttributeError,
- "Mock object has no attribute 'z'",
- getattr, mock, 'z'
- )
-- self.assertRaisesRegex(
-+ six.assertRaisesRegex(
-+ self,
- AttributeError,
- "Mock object has no attribute '__foobar__'",
- getattr, mock, '__foobar__'
-@@ -589,13 +593,13 @@
-
- def test_assert_called_with_message(self):
- mock = Mock()
-- self.assertRaisesRegex(AssertionError, 'Not called',
-- mock.assert_called_with)
-+ six.assertRaisesRegex(self, AssertionError, 'Not called',
-+ mock.assert_called_with)
-
-
- def test_assert_called_once_with_message(self):
- mock = Mock(name='geoffrey')
-- self.assertRaisesRegex(AssertionError,
-+ six.assertRaisesRegex(self, AssertionError,
- r"Expected 'geoffrey' to be called once\.",
- mock.assert_called_once_with)
-
-@@ -663,7 +667,7 @@
- copy.copy(Mock())
-
-
-- @unittest.skipIf(inPy3k, "no old style classes in Python 3")
-+ @unittest.skipIf(six.PY3, "no old style classes in Python 3")
- def test_spec_old_style_classes(self):
- class Foo:
- bar = 7
-@@ -677,7 +681,7 @@
- self.assertRaises(AttributeError, lambda: mock.foo)
-
-
-- @unittest.skipIf(inPy3k, "no old style classes in Python 3")
-+ @unittest.skipIf(six.PY3, "no old style classes in Python 3")
- def test_spec_set_old_style_classes(self):
- class Foo:
- bar = 7
-@@ -1463,7 +1467,7 @@
- second = mopen().readline()
- self.assertEqual('abc', first)
- self.assertEqual('abc', second)
--
-+
- def test_mock_parents(self):
- for Klass in Mock, MagicMock:
- m = Klass()
-Index: python-mock/mock/tests/testmagicmethods.py
-===================================================================
---- python-mock.orig/mock/tests/testmagicmethods.py 2015-07-14 04:07:05.000000000 +0200
-+++ python-mock/mock/tests/testmagicmethods.py 2015-07-28 17:09:02.415394727 +0200
-@@ -4,10 +4,6 @@
-
- from __future__ import division
-
--import unittest2 as unittest
--
--from mock.tests.support import inPy3k
--
- try:
- unicode
- except NameError:
-@@ -15,14 +11,16 @@
- unicode = str
- long = int
-
-+import six
- import inspect
- import sys
- import textwrap
-+import unittest
-+
- from mock import Mock, MagicMock
- from mock.mock import _magics
-
-
--
- class TestMockingMagicMethods(unittest.TestCase):
-
- def test_deleting_magic_methods(self):
-@@ -86,7 +84,7 @@
- self.assertEqual(str(mock), 'foo')
-
-
-- @unittest.skipIf(inPy3k, "no unicode in Python 3")
-+ @unittest.skipIf(six.PY3, "no unicode in Python 3")
- def test_unicode(self):
- mock = Mock()
- self.assertEqual(unicode(mock), unicode(str(mock)))
-@@ -166,7 +164,7 @@
- self.assertEqual(mock.value, 16)
-
- del mock.__truediv__
-- if inPy3k:
-+ if six.PY3:
- def itruediv(mock):
- mock /= 4
- self.assertRaises(TypeError, itruediv, mock)
-@@ -198,7 +196,7 @@
- self.assertTrue(bool(m))
-
- nonzero = lambda s: False
-- if not inPy3k:
-+ if six.PY2:
- m.__nonzero__ = nonzero
- else:
- m.__bool__ = nonzero
-@@ -216,7 +214,7 @@
- self. assertTrue(mock <= 3)
- self. assertTrue(mock >= 3)
-
-- if not inPy3k:
-+ if six.PY2:
- # incomparable in Python 3
- self.assertEqual(Mock() < 3, object() < 3)
- self.assertEqual(Mock() > 3, object() > 3)
-@@ -294,7 +292,7 @@
-
- name = '__nonzero__'
- other = '__bool__'
-- if inPy3k:
-+ if six.PY3:
- name, other = other, name
- getattr(mock, name).return_value = False
- self.assertFalse(hasattr(mock, other))
-@@ -330,7 +328,7 @@
- self.assertEqual(unicode(mock), object.__str__(mock))
- self.assertIsInstance(unicode(mock), unicode)
- self.assertTrue(bool(mock))
-- if not inPy3k:
-+ if six.PY2:
- self.assertEqual(oct(mock), '1')
- else:
- # in Python 3 oct and hex use __index__
-@@ -340,7 +338,7 @@
- # how to test __sizeof__ ?
-
-
-- @unittest.skipIf(inPy3k, "no __cmp__ in Python 3")
-+ @unittest.skipIf(six.PY3, "no __cmp__ in Python 3")
- def test_non_default_magic_methods(self):
- mock = MagicMock()
- self.assertRaises(AttributeError, lambda: mock.__cmp__)
-@@ -405,7 +403,7 @@
- mock = MagicMock()
- def set_setattr():
- mock.__setattr__ = lambda self, name: None
-- self.assertRaisesRegex(AttributeError,
-+ six.assertRaisesRegex(self, AttributeError,
- "Attempting to set unsupported magic method '__setattr__'.",
- set_setattr
- )
-Index: python-mock/mock/tests/support.py
-===================================================================
---- python-mock.orig/mock/tests/support.py 2015-07-14 04:07:05.000000000 +0200
-+++ python-mock/mock/tests/support.py 2015-07-28 17:10:24.101083124 +0200
-@@ -1,7 +1,7 @@
- import sys
-+import unittest
-
- info = sys.version_info
--import unittest2
-
-
- try:
-Index: python-mock/mock/tests/testcallable.py
-===================================================================
---- python-mock.orig/mock/tests/testcallable.py 2015-07-14 04:07:05.000000000 +0200
-+++ python-mock/mock/tests/testcallable.py 2015-07-28 17:12:22.763533785 +0200
-@@ -2,7 +2,8 @@
- # E-mail: fuzzyman AT voidspace DOT org DOT uk
- # http://www.voidspace.org.uk/python/mock/
-
--import unittest2 as unittest
-+import unittest
-+
- from mock.tests.support import is_instance, X, SomeClass
-
- from mock import (
-Index: python-mock/mock/tests/testhelpers.py
-===================================================================
---- python-mock.orig/mock/tests/testhelpers.py 2015-07-14 04:07:05.000000000 +0200
-+++ python-mock/mock/tests/testhelpers.py 2015-07-28 17:12:14.159356169 +0200
-@@ -2,8 +2,9 @@
- # E-mail: fuzzyman AT voidspace DOT org DOT uk
- # http://www.voidspace.org.uk/python/mock/
-
--import unittest2 as unittest
--from mock.tests.support import inPy3k
-+import six
-+
-+import unittest
-
- from mock import (
- call, create_autospec, MagicMock,
-@@ -403,7 +404,7 @@
- m = create_autospec(Foo, a='3')
- self.assertEqual(m.a, '3')
-
-- @unittest.skipUnless(inPy3k, "Keyword only arguments Python 3 specific")
-+ @unittest.skipUnless(six.PY3, "Keyword only arguments Python 3 specific")
- def test_create_autospec_keyword_only_arguments(self):
- func_def = "def foo(a, *, b=None):\n pass\n"
- namespace = {}
-@@ -558,7 +559,7 @@
- mock.g.assert_called_once_with(3, 4)
-
-
-- @unittest.skipIf(inPy3k, "No old style classes in Python 3")
-+ @unittest.skipIf(six.PY3, "No old style classes in Python 3")
- def test_old_style_classes(self):
- class Foo:
- def f(self, a, b):
-@@ -745,7 +746,7 @@
- mock.assert_called_with(4, 5)
-
-
-- @unittest.skipIf(inPy3k, 'no old style classes in Python 3')
-+ @unittest.skipIf(six.PY3, 'no old style classes in Python 3')
- def test_signature_old_style_class(self):
- class Foo:
- def __init__(self, a, b=3):
-@@ -773,7 +774,7 @@
- create_autospec(Foo)
-
-
-- @unittest.skipIf(inPy3k, 'no old style classes in Python 3')
-+ @unittest.skipIf(six.PY3, 'no old style classes in Python 3')
- def test_old_style_class_with_no_init(self):
- # this used to raise an exception
- # due to Foo.__init__ raising an AttributeError
-Index: python-mock/mock/tests/testpatch.py
-===================================================================
---- python-mock.orig/mock/tests/testpatch.py 2015-07-14 04:07:05.000000000 +0200
-+++ python-mock/mock/tests/testpatch.py 2015-07-28 17:11:46.126777402 +0200
-@@ -4,11 +4,11 @@
-
- import os
- import sys
--
--import unittest2 as unittest
-+import six
-+import unittest
-
- from mock.tests import support
--from mock.tests.support import inPy3k, SomeClass, is_instance, callable
-+from mock.tests.support import SomeClass, is_instance, callable
-
- from mock import (
- NonCallableMock, CallableMixin, patch, sentinel,
-@@ -18,7 +18,7 @@
- from mock.mock import _patch, _get_target
-
- builtin_string = '__builtin__'
--if inPy3k:
-+if six.PY3:
- builtin_string = 'builtins'
- unicode = str
-
-Index: python-mock/mock/tests/testsentinel.py
-===================================================================
---- python-mock.orig/mock/tests/testsentinel.py 2015-07-14 04:07:05.000000000 +0200
-+++ python-mock/mock/tests/testsentinel.py 2015-07-28 17:10:42.037453706 +0200
-@@ -2,7 +2,7 @@
- # E-mail: fuzzyman AT voidspace DOT org DOT uk
- # http://www.voidspace.org.uk/python/mock/
-
--import unittest2 as unittest
-+import unittest
-
- from mock import sentinel, DEFAULT
-
-Index: python-mock/mock/tests/testwith.py
-===================================================================
---- python-mock.orig/mock/tests/testwith.py 2015-07-23 21:20:55.000000000 +0200
-+++ python-mock/mock/tests/testwith.py 2015-07-28 17:09:53.028441006 +0200
-@@ -4,7 +4,7 @@
-
- from warnings import catch_warnings
-
--import unittest2 as unittest
-+import unittest
-
- from mock.tests.support import is_instance
- from mock import MagicMock, Mock, patch, sentinel, mock_open, call
Deleted: packages/python-mock/tags/1.3.0-2/debian/rules
===================================================================
--- packages/python-mock/trunk/debian/rules 2015-07-22 19:35:28 UTC (rev 33448)
+++ packages/python-mock/tags/1.3.0-2/debian/rules 2015-07-31 17:05:24 UTC (rev 33565)
@@ -1,23 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export PYBUILD_NAME=mock
-
-%:
- dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
-
-override_dh_auto_build:
- dh_auto_build
- PYTHONPATH=. sphinx-build -b html -N docs/ docs/.build/html
-
-override_dh_installchangelogs:
- dh_installchangelogs -- docs/changelog.txt
-
-override_dh_compress:
- dh_compress -X.js -X.html -X.txt
-
-override_dh_clean:
- rm -rf docs/.build
- dh_clean
Copied: packages/python-mock/tags/1.3.0-2/debian/rules (from rev 33505, packages/python-mock/trunk/debian/rules)
===================================================================
--- packages/python-mock/tags/1.3.0-2/debian/rules (rev 0)
+++ packages/python-mock/tags/1.3.0-2/debian/rules 2015-07-31 17:05:24 UTC (rev 33565)
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog -S Version | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/')
+export PYBUILD_NAME=mock
+
+%:
+ dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+
+override_dh_auto_build:
+ dh_auto_build
+ PYTHONPATH=. sphinx-build -b html -N docs/ docs/.build/html
+
+override_dh_installchangelogs:
+ dh_installchangelogs -- docs/changelog.txt
+
+override_dh_compress:
+ dh_compress -X.js -X.html -X.txt
+
+override_dh_clean:
+ rm -rf docs/.build
+ dh_clean
More information about the Python-modules-commits
mailing list