[med-svn] [Git][med-team/cwltest][master] 3 commits: Added patch to remove need to build with "python-is-python3" package.
Michael R. Crusoe (@crusoe)
gitlab at salsa.debian.org
Wed Feb 4 12:42:12 GMT 2026
Michael R. Crusoe pushed to branch master at Debian Med / cwltest
Commits:
8dcd85a0 by Michael R. Crusoe at 2026-02-04T12:13:26+01:00
Added patch to remove need to build with "python-is-python3" package.
- - - - -
59657ba8 by Michael R. Crusoe at 2026-02-04T12:45:54+01:00
d/clean: remove generated manual page
- - - - -
9afcd394 by Michael R. Crusoe at 2026-02-04T13:34:40+01:00
Add patch to skip the creation of cwltest/_version.py
- - - - -
6 changed files:
- debian/changelog
- + debian/clean
- debian/control
- + debian/patches/0001-drop-_version.py-file-it-isn-t-needed.patch
- + debian/patches/python3
- + debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+cwltest (2.6.20251216093331-2) UNRELEASED; urgency=medium
+
+ * Added patch to remove need to build with "python-is-python3" package.
+ * d/clean: remove generated manual page
+ * Add patch to skip the creation of cwltest/_version.py
+
+ -- Michael R. Crusoe <crusoe at debian.org> Wed, 04 Feb 2026 12:12:45 +0100
+
cwltest (2.6.20251216093331-1) unstable; urgency=medium
* New upstream version
=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+debian/cwltest.1
=====================================
debian/control
=====================================
@@ -19,7 +19,6 @@ Build-Depends: debhelper-compat (= 13),
python3-pytest-xdist <!nocheck>,
python3-pytest-runner <!nocheck>,
python3-pytest-mock <!nocheck>,
- python-is-python3 <!nocheck>,
cwltool <!nocheck>,
python3-typing-extensions <!nocheck> <!nodoc>,
help2man <!nodoc>
=====================================
debian/patches/0001-drop-_version.py-file-it-isn-t-needed.patch
=====================================
@@ -0,0 +1,124 @@
+From f8dd28ce50eb9f3287bd135d184e02bafc17275f Mon Sep 17 00:00:00 2001
+From: "Michael R. Crusoe" <michael.crusoe at gmail.com>
+Date: Wed, 4 Feb 2026 12:27:49 +0100
+Subject: drop `_version.py` file, it isn't needed
+Forwarded: not-needed
+
+---
+ .gitignore | 2 --
+ Makefile | 4 ++--
+ pyproject.toml | 5 +----
+ release-test.sh | 9 +++++++++
+ 4 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/.gitignore b/.gitignore
+index dbcde96..7670538 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -6,8 +6,6 @@
+ build
+ dist
+
+-cwltest/_version.py
+-
+ # Generated by tox
+ coverage.xml
+ .coverage
+diff --git a/Makefile b/Makefile
+index c415b7f..b4f2da3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -103,10 +103,10 @@ codespell:
+ codespell -w $(shell git ls-files | grep -v mypy-stubs | grep -v gitignore)
+
+ ## format : check/fix all code indentation and formatting (runs black)
+-format: $(filter-out cwltest/_version.py,$(PYSOURCES)) mypy-stubs
++format: $(PYSOURCES) mypy-stubs
+ black $^
+
+-format-check: $(filter-out cwltest/_version.py,$(PYSOURCES)) mypy-stubs
++format-check: $(PYSOURCES) mypy-stubs
+ black --diff --check $^
+
+ ## pylint : run static code analysis on Python code
+diff --git a/pyproject.toml b/pyproject.toml
+index 8d258c8..8be7502 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,7 +1,7 @@
+ [build-system]
+ requires = [
+ "setuptools>=61.2",
+- "setuptools_scm>=8.0.4,<10",
++ "setuptools_scm[simple]>=8.0.4,<10",
+ ]
+ build-backend = "setuptools.build_meta"
+
+@@ -66,6 +66,3 @@ include_trailing_comma = "True"
+ force_grid_wrap = "0"
+ use_parentheses = "True"
+ line_length = "88"
+-
+-[tool.setuptools_scm]
+-write_to = "cwltest/_version.py"
+diff --git a/release-test.sh b/release-test.sh
+index 1eb6004..7710c41 100755
+--- a/release-test.sh
++++ b/release-test.sh
+@@ -36,8 +36,10 @@ then
+ && pip install --force-reinstall -U pip==${pipver} \
+ && pip install setuptools==${setuptoolsver} wheel
+ pip install -rtest-requirements.txt ".${extras}"
++ pip show cwltest | grep Version | grep -v -q 0.0.0
+ make test
+ pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
++ pip show cwltest | grep Version | grep -v -q 0.0.0
+ mkdir testenv1/not-${module}
+ # if there is a subdir named '${module}' py.test will execute tests
+ # there instead of the installed module's tests
+@@ -62,13 +64,16 @@ rm -f lib/python-wheels/setuptools* \
+ && pip install setuptools==${setuptoolsver} wheel
+ # The following can fail if you haven't pushed your commits to ${repo}
+ pip install -e "git+${repo}@${HEAD}#egg=${package}${extras}"
++pip show cwltest | grep Version | grep -v -q 0.0.0
+ pushd src/${package}
+ pip install -rtest-requirements.txt build
++pip show cwltest | grep Version | grep -v -q 0.0.0
+ make dist
+ make test
+ cp dist/${package}*tar.gz ../../../testenv3/
+ cp dist/${module}*whl ../../../testenv4/
+ pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
++pip show cwltest | grep Version | grep -v -q 0.0.0
+ popd # ../.. no subdir named ${proj} here, safe for py.testing the installed module
+ # shellcheck disable=SC2086
+ ${run_tests}
+@@ -86,14 +91,17 @@ rm -f lib/python-wheels/setuptools* \
+ package_tar=$(find . -name "${package}*tar.gz")
+ pip install "-r${DIR}/test-requirements.txt" build
+ pip install "${package_tar}${extras}"
++pip show cwltest | grep Version | grep -v -q 0.0.0
+ mkdir out
+ tar --extract --directory=out -z -f ${package}*.tar.gz
+ pushd out/${package}*
+ make dist
+ make test
+ pip install "-r${DIR}/mypy-requirements.txt"
++pip show cwltest | grep Version | grep -v -q 0.0.0
+ make mypy
+ pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
++pip show cwltest | grep Version | grep -v -q 0.0.0
+ mkdir ../not-${module}
+ pushd ../not-${module}
+ # shellcheck disable=SC2086
+@@ -110,6 +118,7 @@ rm -f lib/python-wheels/setuptools* \
+ && pip install --force-reinstall -U pip==${pipver} \
+ && pip install setuptools==${setuptoolsver} wheel
+ pip install "$(ls ${module}*.whl)${extras}"
++pip show cwltest | grep Version | grep -v -q 0.0.0
+ pip install "-r${DIR}/test-requirements.txt"
+ mkdir not-${module}
+ pushd not-${module}
+--
+2.47.3
+
=====================================
debian/patches/python3
=====================================
@@ -0,0 +1,37 @@
+From: Michael R. Crusoe <crusoe at debian.org>
+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
+@@ -1,7 +1,7 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ import sys
+ import json
+ import os
+ args = [os.path.basename(a) for a in sys.argv[1:]]
+ with open("cwl.output.json", "w") as f:
+- 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
+@@ -6,7 +6,7 @@
+ "hints": [
+ {
+ "class": "DockerRequirement",
+- "dockerPull": "python:2-slim"
++ "dockerPull": "python:3-slim"
+ },
+ {
+ "class": "ResourceRequirement",
+@@ -40,6 +40,6 @@
+ }
+ ],
+ "outputs": [{"id": "args", "type": "string[]"}],
+- "baseCommand": "python",
++ "baseCommand": "python3",
+ "arguments": ["cat"]
+-}
+\ No newline at end of file
++}
=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+0001-drop-_version.py-file-it-isn-t-needed.patch
+python3
View it on GitLab: https://salsa.debian.org/med-team/cwltest/-/compare/22820bc23e124f61055ab84d0df0f3ab0e51adb9...9afcd3941ad407a65940162325c5872928c647fe
--
View it on GitLab: https://salsa.debian.org/med-team/cwltest/-/compare/22820bc23e124f61055ab84d0df0f3ab0e51adb9...9afcd3941ad407a65940162325c5872928c647fe
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260204/0d4415a2/attachment-0001.htm>
More information about the debian-med-commit
mailing list