Michael R. Crusoe pushed to branch master at Debian Med / cwltest
Commits: 824a2632 by Michael R. Crusoe at 2023-06-09T11:27:05+02:00 add package description - - - - - 9c768f52 by Michael R. Crusoe at 2023-06-09T11:27:13+02:00 add itp - - - - - 849ceb2c by Michael R. Crusoe at 2023-06-09T11:31:41+02:00 Silence package-contains-documentation-outside-usr-share-doc false-positives - - - - - a67aec89 by Michael R. Crusoe at 2023-06-09T11:34:33+02:00 document patch, already applied upstream - - - - - a65cc960 by Michael R. Crusoe at 2023-06-09T11:45:17+02:00 mark the test CWL file as executable - - - - - 9ceeeed0 by Michael R. Crusoe at 2023-06-09T11:45:18+02:00 suggest also installing a cwl-runner - - - - - 5 changed files: - debian/changelog - debian/control - + debian/cwltest.lintian-overrides - debian/patches/test_paths - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,5 +1,5 @@ cwltest (2.3.20230607140609-1) UNRELEASED; urgency=medium - * Initial release. (Closes: #XXXXXX) + * Initial release. (Closes: #1037201) -- Michael R. Crusoe <[email protected]> Wed, 07 Jun 2023 14:31:22 +0100 ===================================== debian/control ===================================== @@ -38,6 +38,8 @@ Depends: ${python3:Depends}, python3-defusedxml, python3-ruamel.yaml, Recommends: python3-pytest +Suggests: cwl-runner Description: Common Workflow Language testing framework - - + This is a testing tool for checking the output of Tools and Workflows described + with the Common Workflow Language. Among other uses, it is used to run the CWL + conformance tests. ===================================== debian/cwltest.lintian-overrides ===================================== @@ -0,0 +1,3 @@ +package-contains-documentation-outside-usr-share-doc [usr/lib/python3/dist-packages/cwltest/tests/test-data/cores.txt] +package-contains-documentation-outside-usr-share-doc [usr/lib/python3/dist-packages/cwltest/tests/test-data/v1.0/hello.txt] +# test data, not docs ===================================== debian/patches/test_paths ===================================== @@ -1,27 +1,28 @@ From: Michael R. Crusoe <[email protected]> Subject: test_catories path fixes ---- cwltest.orig/tests/test_categories.py -+++ cwltest/tests/test_categories.py -@@ -14,15 +14,12 @@ +Origin: upstream,https://github.com/common-workflow-language/cwltest/commit/0f9117efaa811494135983f732bf55266d4b4ccb + +--- a/tests/test_categories.py ++++ b/tests/test_categories.py +@@ -14,15 +14,10 @@ def test_unsupported_with_required_tests() -> None: cwl_runner = get_data("tests/test-data/mock_cwl_runner.py") -+ cwd = os.getcwd() -+ os.chdir(get_data("tests/test-data/")) - args = [ +- args = [ - "--test", - schema_salad.ref_resolver.file_uri( - get_data("tests/test-data/required-unsupported.yml") - ), -+ "--test", "required-unsupported.yml" - ] -- cwd = os.getcwd() +- ] + cwd = os.getcwd() ++ os.chdir(get_data("tests/test-data/")) ++ args = ["--test", "required-unsupported.yml"] try: - os.chdir(get_data("tests/test-data/")) error_code, stdout, stderr = run_with_mock_cwl_runner(args) finally: os.chdir(cwd) -@@ -35,22 +32,19 @@ +@@ -35,21 +30,19 @@ def test_unsupported_with_required_tests() -> None: else: q = "" assert ( @@ -40,7 +41,6 @@ Subject: test_catories path fixes - "0 tests passed, 2 failures, 0 unsupported features{n}".format( - cwl_runner=cwl_runner, n=n, p=p, q=q - ) -- ) == stderr + f"The `id` field is missing.{n}" + f"The `id` field is missing.{n}" + f"Test [1/2] Required test that is unsupported (without tags){n}" @@ -53,7 +53,7 @@ Subject: test_catories path fixes + f"Test 2 failed: {cwl_runner} --quiet return-unsupported.cwl {q}v1.0{p}cat-job.json{q}{n}" + f"Required test that is unsupported (with tags){n}" + f"Does not support required feature{n}" -+ f"0 tests passed, 2 failures, 0 unsupported features{n}") == stderr ++ f"0 tests passed, 2 failures, 0 unsupported features{n}" + ) == stderr - def test_unsupported_with_optional_tests() -> None: ===================================== debian/rules ===================================== @@ -9,3 +9,6 @@ export CWLTOOL_OPTIONS=--no-container %: dh $@ --with python3 --buildsystem=pybuild + +execute_after_dh_auto_install: + find debian -name 'cat1-testcli.cwl' -exec chmod a+x {} \; View it on GitLab: https://salsa.debian.org/med-team/cwltest/-/compare/5c77268060ee7875e032e4f757675bc00a0d75d0...9ceeeed062f709a0433644570e47236631985f34 -- View it on GitLab: https://salsa.debian.org/med-team/cwltest/-/compare/5c77268060ee7875e032e4f757675bc00a0d75d0...9ceeeed062f709a0433644570e47236631985f34 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
