[Python-modules-commits] r34098 - in packages/python-padme/trunk/debian (4 files)

[zyga-guest at users.alioth.debian.org]

    Date: Wednesday, September 2, 2015 @ 11:11:57
  Author: zyga-guest
Revision: 34098

* Improve compatibility with the most recent version of python-mock. This
  fixes a build issue that occurs when padme tries to patch-away bugs in
  mock that were fixed in the meantime. 
* Remove the autopkgtest header from debian/control (this is now standard)
* Bump Standards-Version to 3.9.6 (no change required)

Added:
  packages/python-padme/trunk/debian/patches/improve-compatiblity-with-mock
Modified:
  packages/python-padme/trunk/debian/changelog
  packages/python-padme/trunk/debian/control
  packages/python-padme/trunk/debian/patches/series

Modified: packages/python-padme/trunk/debian/changelog
===================================================================
--- packages/python-padme/trunk/debian/changelog	2015-09-02 10:26:53 UTC (rev 34097)
+++ packages/python-padme/trunk/debian/changelog	2015-09-02 11:11:57 UTC (rev 34098)
@@ -1,3 +1,13 @@
+python-padme (1.1.1-2) UNRELEASED; urgency=medium
+
+  * Improve compatibility with the most recent version of python-mock. This
+    fixes a build issue that occurs when padme tries to patch-away bugs in
+    mock that were fixed in the meantime. 
+  * Remove the autopkgtest header from debian/control (this is now standard)
+  * Bump Standards-Version to 3.9.6 (no change required)
+
+ -- Zygmunt Krynicki <zygmunt.krynicki at canonical.com>  Wed, 02 Sep 2015 12:36:24 +0200
+
 python-padme (1.1.1-1) unstable; urgency=medium
 
   * Initial release. (Closes: #780126)

Modified: packages/python-padme/trunk/debian/control
===================================================================
--- packages/python-padme/trunk/debian/control	2015-09-02 10:26:53 UTC (rev 34097)
+++ packages/python-padme/trunk/debian/control	2015-09-02 11:11:57 UTC (rev 34098)
@@ -12,10 +12,9 @@
                python3-all,
                python3-setuptools,
                python3-sphinx
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.2
-XS-Testsuite: autopkgtest
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-padme/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-padme/trunk/
 Homepage: https://github.com/zyga/padme/

Added: packages/python-padme/trunk/debian/patches/improve-compatiblity-with-mock
===================================================================
--- packages/python-padme/trunk/debian/patches/improve-compatiblity-with-mock	                        (rev 0)
+++ packages/python-padme/trunk/debian/patches/improve-compatiblity-with-mock	2015-09-02 11:11:57 UTC (rev 34098)
@@ -0,0 +1,27 @@
+Description: <short summary of the patch>
+ This patch fixes a build issue that started to occur as upstream mock has
+ re-organized its internal layout. The issue is that padme needs to patch (fix)
+ bugs in mock that are present on certain versions (especially in released
+ versions of python that have broken unittest.mock) and the patching code does
+ mess with some of the mock internals.
+Author: Zygmunt Krynicki <zygmunt.krynicki at canonical.com>
+
+Origin: upstream
+Bug: https://github.com/zyga/padme/issues/15
+Forwarded: not-needed
+Last-Update: 2015-09-02
+
+--- python-padme-1.1.1.orig/padme/tests.py
++++ python-padme-1.1.1/padme/tests.py
+@@ -38,7 +38,10 @@ if sys.version_info[0:2] >= (3, 4):
+     from unittest import mock
+ else:
+     import unittest2 as unittest
+-    import mock
++    try:
++        import mock.mock as mock
++    except ImportError:
++        import mock
+ 
+ 
+ # https://code.google.com/p/mock/issues/detail?id=247

Modified: packages/python-padme/trunk/debian/patches/series
===================================================================
--- packages/python-padme/trunk/debian/patches/series	2015-09-02 10:26:53 UTC (rev 34097)
+++ packages/python-padme/trunk/debian/patches/series	2015-09-02 11:11:57 UTC (rev 34098)
@@ -1 +1,2 @@
 001-old-unittest2-support
+improve-compatiblity-with-mock