[med-svn] [Git][med-team/python-pyflow][master] 3 commits: Upload to unstable

[Steffen Möller]

Steffen Möller pushed to branch master at Debian Med / python-pyflow


Commits:
e9d2b506 by Andreas Tille at 2019-08-02T17:14:46Z
Upload to unstable

- - - - -
909eff26 by Steffen Moeller at 2019-08-02T17:15:28Z
Porting to Python3

- - - - -
65bcd414 by Steffen Moeller at 2019-08-02T17:16:21Z
Merge branch 'master' of salsa.debian.org:med-team/python-pyflow

- - - - -


7 changed files:

- debian/changelog
- debian/control
- + debian/patches/Python3_exception.patch
- + debian/patches/Python3_fdopen.patch
- + debian/patches/python3_print.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+python-pyflow (1.1.20-2) unstable; urgency=medium
+
+  * Porting to Python3
+  * Standards-Version: 4.4.0
+
+ -- Steffen Moeller <moeller at debian.org>  Fri, 02 Aug 2019 18:59:18 +0200
+
 python-pyflow (1.1.20-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/control
=====================================
@@ -6,13 +6,13 @@ Testsuite: autopkgtest-pkg-python
 Priority: optional
 Build-Depends: debhelper (>= 11~),
                dh-python,
-               python-all
-Standards-Version: 4.1.4
+               python3-all
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/med-team/python-pyflow
 Vcs-Git: https://salsa.debian.org/med-team/python-pyflow.git
 Homepage: https://illumina.github.io/pyflow/
 
-Package: python-pyflow
+Package: python3-pyflow
 Architecture: any
 Depends: ${python:Depends},
          ${misc:Depends}


=====================================
debian/patches/Python3_exception.patch
=====================================
@@ -0,0 +1,13 @@
+Index: python-pyflow/pyflow/src/pyflow.py
+===================================================================
+--- python-pyflow.orig/pyflow/src/pyflow.py
++++ python-pyflow/pyflow/src/pyflow.py
+@@ -3492,7 +3492,7 @@ class WorkflowRunner(object) :
+             except KeyboardInterrupt:
+                 msg = "Keyboard Interrupt, shutting down running tasks..."
+                 self._killWorkflow(msg)
+-            except DataDirException, e:
++            except DataDirException(e):
+                 # Special exception for when pyflow directory can't be initialized.
+                 # A killWorkflow is not needed for this case, because no workflow
+                 # could be started.


=====================================
debian/patches/Python3_fdopen.patch
=====================================
@@ -0,0 +1,18 @@
+Index: python-pyflow/pyflow/src/pyflow.py
+===================================================================
+--- python-pyflow.orig/pyflow/src/pyflow.py
++++ python-pyflow/pyflow/src/pyflow.py
+@@ -788,9 +788,11 @@ def writeDotScript(taskDotScriptFile,
+     """
+     import inspect
+ 
+-    dsfp = os.fdopen(os.open(taskDotScriptFile, os.O_WRONLY | os.O_CREAT, 0755), 'w')
++    dsfp = os.fdopen(os.open(taskDotScriptFile, os.O_WRONLY | os.O_CREAT,
++                                                stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH),
++                     'w')
+ 
+-    dsfp.write("""#!/usr/bin/env python
++    dsfp.write("""#!/usr/bin/env python3
+ #
+ # This is a script to create a dot graph from pyflow state files.
+ # Usage: $script >| task_graph.dot


=====================================
debian/patches/python3_print.patch
=====================================
@@ -0,0 +1,50 @@
+Index: python-pyflow/scratch/pybox/hijack.py
+===================================================================
+--- python-pyflow.orig/scratch/pybox/hijack.py
++++ python-pyflow/scratch/pybox/hijack.py
+@@ -1,4 +1,4 @@
+-
++from __future__ import print_function
+ 
+ class A :
+   def __init__(self) :
+@@ -20,6 +20,6 @@ b.inc = a.inc
+ 
+ b.inc()
+ 
+-print "a", a.x
+-print "b", b.x
++print("a", a.x)
++print("b", b.x)
+ 
+Index: python-pyflow/scratch/pybox/inspect.py
+===================================================================
+--- python-pyflow.orig/scratch/pybox/inspect.py
++++ python-pyflow/scratch/pybox/inspect.py
+@@ -1,7 +1,8 @@
++from __future__ import print_function
+ 
+ def f(x) :
+   return x + 2
+ 
+ import inspect
+-print inspect.getsource(f)
++print(inspect.getsource(f))
+ 
+Index: python-pyflow/scratch/test/testtasks/slow_yeller.py
+===================================================================
+--- python-pyflow.orig/scratch/test/testtasks/slow_yeller.py
++++ python-pyflow/scratch/test/testtasks/slow_yeller.py
+@@ -1,10 +1,11 @@
+ #!/usr/bin/env python
++from __future__ import print_function
+ 
+ import os,sys,time
+ import datetime
+ 
+ if len(sys.argv) != 2 :
+-    print "usage $0 arg"
++    print("usage $0 arg")
+     sys.exit(1)
+ 
+ arg=sys.argv[1]


=====================================
debian/patches/series
=====================================
@@ -0,0 +1,3 @@
+python3_print.patch
+Python3_fdopen.patch
+Python3_exception.patch


=====================================
debian/rules
=====================================
@@ -1,13 +1,10 @@
 #!/usr/bin/make -f
 
-# DH_VERBOSE := 1
+DH_VERBOSE := 1
 
 export PYBUILD_NAME = pyflow
 
 py2srcdir=pyflow
 
 %:
-	dh $@ --with python2 --buildsystem=pybuild --sourcedirectory=$(py2srcdir)
-
-#override_dh_auto_configure:
-#	dh_auto_configure --sourcedirectory=$(py2srcdir)
+	dh $@ --with python3 --buildsystem=pybuild --sourcedirectory=$(py2srcdir)



View it on GitLab: https://salsa.debian.org/med-team/python-pyflow/compare/91d467d425b82431ff0d9a4f8b14ae969aeb66d0...65bcd414b5a1a4c892392740f822822849846286

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-pyflow/compare/91d467d425b82431ff0d9a4f8b14ae969aeb66d0...65bcd414b5a1a4c892392740f822822849846286
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190802/3e918c35/attachment-0001.html>