Skip to content
Commits on Source (3)
python-pyflow (1.1.20-2) unstable; urgency=medium
* Porting to Python3
* Standards-Version: 4.4.0
-- Steffen Moeller <moeller@debian.org> Fri, 02 Aug 2019 18:59:18 +0200
python-pyflow (1.1.20-1) unstable; urgency=medium
* New upstream version
......
......@@ -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}
......
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.
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
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]
python3_print.patch
Python3_fdopen.patch
Python3_exception.patch
#!/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)