[Python-apps-commits] r10866 - in packages/pybik/trunk/debian (6 files)

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

    Date: Sunday, May 18, 2014 @ 14:50:23
  Author: barcc-guest
Revision: 10866

Added patch to fix option for pickle protocol

Added:
  packages/pybik/trunk/debian/patches/
  packages/pybik/trunk/debian/patches/fix-pickle-protocol.diff
  packages/pybik/trunk/debian/patches/series
Modified:
  packages/pybik/trunk/debian/changelog
  packages/pybik/trunk/debian/copyright
  packages/pybik/trunk/debian/rules

Modified: packages/pybik/trunk/debian/changelog
===================================================================
--- packages/pybik/trunk/debian/changelog	2014-05-18 11:24:42 UTC (rev 10865)
+++ packages/pybik/trunk/debian/changelog	2014-05-18 14:50:23 UTC (rev 10866)
@@ -6,11 +6,12 @@
   * Cryptographic verification of upstream packages
   * Added DEP12 upstream metadata
   * Removed patches (included upstream)
+  * Added patch to fix option for pickle protocol
   * Use a pickle protocol compatible with all supported Python 3 versions
   * No need to remove __pycache__ directories in debian/rules any more
   * autopkgtest depends on xauth
 
- -- B. Clausius <barcc at gmx.de>  Wed, 26 Feb 2014 21:34:56 +0100
+ -- B. Clausius <barcc at gmx.de>  Sun, 18 May 2014 16:50:05 +0200
 
 pybik (1.1-2) unstable; urgency=low
 

Modified: packages/pybik/trunk/debian/copyright
===================================================================
--- packages/pybik/trunk/debian/copyright	2014-05-18 11:24:42 UTC (rev 10865)
+++ packages/pybik/trunk/debian/copyright	2014-05-18 14:50:23 UTC (rev 10866)
@@ -11,7 +11,7 @@
  * Dale Mellor <dale_mellor at users.sourceforge.net>
 
 Files: *
-Copyright: 2009-2013 B. Clausius <barcc at gmx.de>
+Copyright: 2009-2014 B. Clausius <barcc at gmx.de>
 License: GPL-3+
 
 Files: data/ui/images/BEAMED?EIGHTH?NOTES.png

Added: packages/pybik/trunk/debian/patches/fix-pickle-protocol.diff
===================================================================
--- packages/pybik/trunk/debian/patches/fix-pickle-protocol.diff	                        (rev 0)
+++ packages/pybik/trunk/debian/patches/fix-pickle-protocol.diff	2014-05-18 14:50:23 UTC (rev 10866)
@@ -0,0 +1,28 @@
+Description: Fix option for pickle protocol
+Author: B. Clausius <barcc at gmx.de>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/setup.py
++++ b/setup.py
+@@ -391,7 +391,7 @@
+         self.force = None
+         self.parallel = None
+         self.fast = None
+-        self.pickle_protocol = '-1'
++        self.pickle_protocol = None
+         
+     def finalize_options(self):
+         self.set_undefined_options('build',
+@@ -409,7 +409,10 @@
+             self.parallel = multiprocessing.cpu_count()
+         else:
+             self.parallel = int(self.parallel)
+-        self.pickle_protocol = int(self.pickle_protocol)
++        if self.pickle_protocol is None:
++            self.pickle_protocol = -1
++        else:
++            self.pickle_protocol = int(self.pickle_protocol)
+                 
+     def run(self):
+         from tools import modeldata

Added: packages/pybik/trunk/debian/patches/series
===================================================================
--- packages/pybik/trunk/debian/patches/series	                        (rev 0)
+++ packages/pybik/trunk/debian/patches/series	2014-05-18 14:50:23 UTC (rev 10866)
@@ -0,0 +1 @@
+fix-pickle-protocol.diff

Modified: packages/pybik/trunk/debian/rules
===================================================================
--- packages/pybik/trunk/debian/rules	2014-05-18 11:24:42 UTC (rev 10865)
+++ packages/pybik/trunk/debian/rules	2014-05-18 14:50:23 UTC (rev 10866)
@@ -46,7 +46,12 @@
 	                        --data-dir=/usr/share"
 
 override_dh_auto_test:
-	# Pybik has no unittests, skip autodetection due to false positive
+	# test whether pickled data can be loaded with all supported Python versions
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="{interpreter} -c 'import glob,pickle; \
+	           [(print(\"test with {version}:\", f), pickle.load(open(f, \"rb\"))) \
+	           for f in glob.glob(\"build/models/*\")]'" \
+	dh_auto_test
 
 override_dh_python3:
 	dh_python3 -p pybik