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

Keep python3-prov dependency to minimize our changes, but keep the --provenance feature disabled.

parent 7f42ec5b

debian/changelog

+7 −0
Original line number Diff line number Diff line 
cwltool (1.0.20181217162649+dfsg-4) unstable; urgency=medium



  * Keep python3-prov dependency to minimize our changes, but keep the --

    provenance feature disabled.



 -- Michael R. Crusoe <michael.crusoe@gmail.com>  Thu, 27 Dec 2018 05:12:15 -0800



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



  * Fix our patches to the tests, run them in parallel

debian/patches/cleanup-tests

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ Forwarded: https://github.com/common-workflow-language/cwltool/pull/1024 
     assert "checksum" not in stdout

--- cwltool.orig/tests/test_pack.py

+++ cwltool/tests/test_pack.py

@@ -122,7 +122,7 @@

@@ -123,7 +123,7 @@

 

 @needs_docker

 @pytest.mark.parametrize('wf_path,job_path,namespaced', cwl_to_run)
@@ -129,7 +129,7 @@ Forwarded: https://github.com/common-workflow-language/cwltool/pull/1024 
     load_tool.loaders = {}

 

     document_loader, workflowobj, uri = fetch_document(

@@ -142,8 +142,8 @@

@@ -143,8 +143,8 @@

     normal_output = StringIO()

     packed_output = StringIO()

debian/patches/disable_prov

+4 −2
Original line number Diff line number Diff line
@@ -50,12 +50,13 @@ Description: Disable --provance until python3-proc issue is resolved 
                          help="Print corresponding RDF graph for workflow and exit")

--- cwltool.orig/setup.py

+++ cwltool/setup.py

@@ -57,8 +57,6 @@

@@ -57,8 +57,7 @@

           'mypy-extensions',

           'six >= 1.9.0',  # >= 1.9.0 required by prov

           'psutil',

-          'prov == 1.5.1',

-          'bagit >= 1.6.4',

+          'prov >= 1.5.1',

           'typing-extensions',

       ],

       extras_require={
@@ -729,12 +730,13 @@ Description: Disable --provance until python3-proc issue is resolved 
+# For now, we do not ship the --provenance feature in Debian

--- cwltool.orig/requirements.txt

+++ cwltool/requirements.txt

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

@@ -5,8 +5,7 @@

 schema-salad>=3.0,<3.1

 typing>=3.5.3; python_version<"3.6"

 pathlib2==2.3.2; python_version<"3"

-prov==1.5.1

-bagit==1.6.4

+prov>=1.5.1

 mypy-extensions

 psutil

 subprocess32 >= 3.5.0; os.name=="posix" and python_version<"3.5"