Michael R. Crusoe pushed to branch master at Debian Med / cwltest
Commits: da91529c by Michael R. Crusoe at 2026-02-04T14:15:40+01:00 adjust patch for older setuptools-scm - - - - - 2 changed files: - debian/patches/0001-drop-_version.py-file-it-isn-t-needed.patch - debian/patches/python3 Changes: ===================================== debian/patches/0001-drop-_version.py-file-it-isn-t-needed.patch ===================================== @@ -1,15 +1,15 @@ -From f8dd28ce50eb9f3287bd135d184e02bafc17275f Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" <[email protected]> Date: Wed, 4 Feb 2026 12:27:49 +0100 Subject: drop `_version.py` file, it isn't needed -Forwarded: not-needed +From f8dd28ce50eb9f3287bd135d184e02bafc17275f Mon Sep 17 00:00:00 2001 +Forwarded: not-needed --- .gitignore | 2 -- Makefile | 4 ++-- - pyproject.toml | 5 +---- + pyproject.toml | 3 +-- release-test.sh | 9 +++++++++ - 4 files changed, 12 insertions(+), 8 deletions(-) + 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index dbcde96..7670538 100644 @@ -42,7 +42,7 @@ index c415b7f..b4f2da3 100644 ## pylint : run static code analysis on Python code diff --git a/pyproject.toml b/pyproject.toml -index 8d258c8..8be7502 100644 +index 8d258c8..9a3204f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ @@ -54,12 +54,10 @@ index 8d258c8..8be7502 100644 ] build-backend = "setuptools.build_meta" -@@ -66,6 +66,3 @@ include_trailing_comma = "True" - force_grid_wrap = "0" - use_parentheses = "True" +@@ -68,4 +68,3 @@ use_parentheses = "True" line_length = "88" -- --[tool.setuptools_scm] + + [tool.setuptools_scm] -write_to = "cwltest/_version.py" diff --git a/release-test.sh b/release-test.sh index 1eb6004..7710c41 100755 @@ -119,6 +117,3 @@ index 1eb6004..7710c41 100755 pip install "-r${DIR}/test-requirements.txt" mkdir not-${module} pushd not-${module} --- -2.47.3 - ===================================== debian/patches/python3 ===================================== @@ -1,8 +1,17 @@ -From: Michael R. Crusoe <[email protected]> +From: "Michael R. Crusoe" <[email protected]> +Date: Wed, 4 Feb 2026 14:15:13 +0100 Subject: Upgrade test file to use Python 3 + Forwarded: https://github.com/common-workflow-language/cwltest/pull/266 ---- cwltest.orig/tests/test-data/v1.0/args.py -+++ cwltest/tests/test-data/v1.0/args.py +--- + tests/test-data/v1.0/args.py | 4 ++-- + tests/test-data/v1.0/cat1-testcli.cwl | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/tests/test-data/v1.0/args.py b/tests/test-data/v1.0/args.py +index 190fd5c..4e29cc9 100644 +--- a/tests/test-data/v1.0/args.py ++++ b/tests/test-data/v1.0/args.py @@ -1,7 +1,7 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 @@ -14,8 +23,10 @@ Forwarded: https://github.com/common-workflow-language/cwltest/pull/266 - json.dump({"args": args}, f) \ No newline at end of file + json.dump({"args": args}, f) ---- cwltest.orig/tests/test-data/v1.0/cat1-testcli.cwl -+++ cwltest/tests/test-data/v1.0/cat1-testcli.cwl +diff --git a/tests/test-data/v1.0/cat1-testcli.cwl b/tests/test-data/v1.0/cat1-testcli.cwl +index 311cd86..f67c299 100644 +--- a/tests/test-data/v1.0/cat1-testcli.cwl ++++ b/tests/test-data/v1.0/cat1-testcli.cwl @@ -6,7 +6,7 @@ "hints": [ { View it on GitLab: https://salsa.debian.org/med-team/cwltest/-/commit/da91529c64bf7d1f1d7b090fe2851aa9093cb524 -- View it on GitLab: https://salsa.debian.org/med-team/cwltest/-/commit/da91529c64bf7d1f1d7b090fe2851aa9093cb524 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
