[Python-modules-commits] r34070 - in packages/python-memprof/trunk/debian (3 files)

[vicho at users.alioth.debian.org]

    Date: Monday, August 31, 2015 @ 19:49:07
  Author: vicho
Revision: 34070

Fix "FTBFS: DistributionNotFound: The 'memprof' distribution was not found and is required by the application" by applying patch "for_upstream__Dont_die_with_python_3_4_if_memprof_is_not_yet_inst.patch" (Closes: #796478)

Added:
  packages/python-memprof/trunk/debian/patches/for_upstream__Dont_die_with_python_3_4_if_memprof_is_not_yet_inst.patch
Modified:
  packages/python-memprof/trunk/debian/changelog
  packages/python-memprof/trunk/debian/patches/series

Modified: packages/python-memprof/trunk/debian/changelog
===================================================================
--- packages/python-memprof/trunk/debian/changelog	2015-08-31 19:48:59 UTC (rev 34069)
+++ packages/python-memprof/trunk/debian/changelog	2015-08-31 19:49:07 UTC (rev 34070)
@@ -3,6 +3,10 @@
   * New upstream release
   * Drop XS-Testsuite
   * Bump standards-version to 3.9.6 (no change needed)
+  * Fix "FTBFS: DistributionNotFound: The 'memprof' distribution was not
+    found and is required by the application" by applying patch
+    "for_upstream__Dont_die_with_python_3_4_if_memprof_is_not_yet_inst.patch"
+    (Closes: #796478)
 
  -- Javi Merino <vicho at debian.org>  Mon, 24 Aug 2015 22:31:52 +0100
 

Added: packages/python-memprof/trunk/debian/patches/for_upstream__Dont_die_with_python_3_4_if_memprof_is_not_yet_inst.patch
===================================================================
--- packages/python-memprof/trunk/debian/patches/for_upstream__Dont_die_with_python_3_4_if_memprof_is_not_yet_inst.patch	                        (rev 0)
+++ packages/python-memprof/trunk/debian/patches/for_upstream__Dont_die_with_python_3_4_if_memprof_is_not_yet_inst.patch	2015-08-31 19:49:07 UTC (rev 34070)
@@ -0,0 +1,31 @@
+From: Javi Merino <merino.jav at gmail.com>
+Origin: https://github.com/JaviMerino/memprof/commit/9454f2fb925a6f3c9c6ace3f6717d53ca0561711
+Bug-Debian: http://bugs.debian.org/796478
+Subject: Don't die with python 3.4 if memprof is not yet installed
+
+pkg_resources changed behaviour in python 3.4 and now raises
+DistributionNotFound if the package you're building is not yet
+installed.  When running the testsuite we import memprof in the current
+directory.  However pkg_resources is unable to find it and we fail to
+get the current version of memprof.  Set it to local in order to be able
+to run the testsuite before installing the package.
+---
+ memprof/__init__.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/memprof/__init__.py b/memprof/__init__.py
+index 91938a1..93e3b57 100644
+--- a/memprof/__init__.py
++++ b/memprof/__init__.py
+@@ -17,4 +17,7 @@
+ from .memprof import *
+ import pkg_resources
+ 
+-__version__ = pkg_resources.get_distribution("memprof").version
++try:
++    __version__ = pkg_resources.get_distribution("memprof").version
++except pkg_resources.DistributionNotFound:
++    __version__ = "local"
+-- 
+2.5.0
+

Modified: packages/python-memprof/trunk/debian/patches/series
===================================================================
--- packages/python-memprof/trunk/debian/patches/series	2015-08-31 19:48:59 UTC (rev 34069)
+++ packages/python-memprof/trunk/debian/patches/series	2015-08-31 19:49:07 UTC (rev 34070)
@@ -1 +1,2 @@
 deb_specific__dont_require_argparse.patch
+for_upstream__Dont_die_with_python_3_4_if_memprof_is_not_yet_inst.patch