Verified Commit 2b3be889 authored by Michael R. Crusoe's avatar Michael R. Crusoe 🏳️‍🌈
Browse files

add extra deps 

add patch for test to use python3
parent d9d95100

debian/changelog

+2 −2
Original line number Diff line number Diff line 
cwltool (1.0.20181217162649+dfsg-1) UNRELEASED; urgency=medium

cwltool (1.0.20181217162649+dfsg-1) unstable; urgency=medium



  [ Jelmer Vernooij ]

  * Remove unnecessary X-Python{,3}-Version field in debian/control.
@@ -10,7 +10,7 @@ cwltool (1.0.20181217162649+dfsg-1) UNRELEASED; urgency=medium 
  * Remove --provenance feature until python3-prov 1.5.2+ issue is

    resolved.



 -- Michael R. Crusoe <michael.crusoe@gmail.com>  Wed, 03 Oct 2018 04:40:50 -0700

 -- Michael R. Crusoe <michael.crusoe@gmail.com>  Sun, 23 Dec 2018 15:24:58 -0800



cwltool (1.0.20180302231433-1) unstable; urgency=medium

debian/control

+4 −1
Original line number Diff line number Diff line
@@ -19,10 +19,13 @@ Build-Depends: debhelper (>= 10), 
               python3-pytest,

               python3-pytest-xdist,

               python3-pytest-runner,

	       python3-pytest-mock,

               python3-mock,

               python3-mypy,

               python3-psutil,

	       python3-prov,

               nodejs,

               help2man

# python3-ruamel.ordereddict,

Standards-Version: 4.2.1

Vcs-Browser: https://salsa.debian.org/med-team/cwltool

Vcs-Git: https://salsa.debian.org/med-team/cwltool.git

debian/patches/python3

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Author: Michael R. Crusoe <michael.crusoe@gmail.com>

Description: Use python3 in test CWL tool description

--- cwltool.orig/tests/wf/echo.cwl

+++ cwltool/tests/wf/echo.cwl

@@ -22,4 +22,4 @@

     type: File

     outputBinding:

       glob: foo$(inputs.r).txt

-arguments: [python, -c, $(inputs.script), $(inputs.r)]

+arguments: [python3, -c, $(inputs.script), $(inputs.r)]

--- cwltool.orig/tests/wf/js_output.cwl

+++ cwltool/tests/wf/js_output.cwl

@@ -6,5 +6,5 @@

 inputs: []

 outputs: []

 arguments:

-  - valueFrom: ${console.log("Log message");console.error("Error message");return ["python", "-c", "True"]}

-    shellQuote: false

\ No newline at end of file

+  - valueFrom: ${console.log("Log message");console.error("Error message");return ["python3", "-c", "True"]}

+    shellQuote: false

debian/patches/series

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ disable_prov 
exclude_jshint

spelling

cleanup-tests

python3