Michael R. Crusoe pushed to branch master at Debian Med / cwltool
Commits: 98d695f3 by Michael R. Crusoe at 2024-10-04T17:01:52+02:00 Added patch to trim the Python instal_requires to avoid bringing in the soon-to-be removed python3-pkg-resources. Closes: #1083349 - - - - - eea7ba04 by Michael R. Crusoe at 2024-10-04T17:03:28+02:00 d/patches/remove-python3-shellescape: fix metadata, patch is forwarded upstream - - - - - 9ae00b5c by Michael R. Crusoe at 2024-10-04T17:04:41+02:00 routine-update: Ready to upload to unstable - - - - - 5 changed files: - debian/changelog - debian/patches/disable_prov - + debian/patches/drop-old-deps - debian/patches/remove-python3-shellescape - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +cwltool (3.1.20240909164951-3) unstable; urgency=medium + + * Added patch to trim the Python instal_requires to avoid bringing in the + soon-to-be removed python3-pkg-resources. Closes: #1083349 + * d/patches/remove-python3-shellescape: fix metadata, patch is + forwarded upstream + + -- Michael R. Crusoe <[email protected]> Fri, 04 Oct 2024 17:04:41 +0200 + cwltool (3.1.20240909164951-2) unstable; urgency=medium * Team Upload ===================================== debian/patches/disable_prov ===================================== @@ -842,7 +842,7 @@ Forwarded: not-needed - assert pickle.dumps(research_object) is not None --- cwltool.orig/setup.py +++ cwltool/setup.py -@@ -128,7 +128,7 @@ +@@ -127,7 +127,7 @@ "rdflib >= 4.2.2, < 7.1.0", "shellescape >= 3.4.1, < 3.9", "schema-salad >= 8.7, < 9", @@ -850,7 +850,7 @@ Forwarded: not-needed + "prov >= 1.5.1", "mypy-extensions", "psutil >= 5.6.6", - "importlib_resources>=1.4;python_version<'3.9'", + "coloredlogs", --- cwltool.orig/tests/test_main_parsed_args.py +++ cwltool/tests/test_main_parsed_args.py @@ -19,22 +19,3 @@ ===================================== debian/patches/drop-old-deps ===================================== @@ -0,0 +1,21 @@ +Author: Michael R. Crusoe <[email protected]> +Description: These aren't needed for Python 3.12+ +Forwarded: https://github.com/common-workflow-language/cwltool/pull/2048 +--- cwltool.orig/setup.py ++++ cwltool/setup.py +@@ -121,7 +121,6 @@ + package_dir={"cwltool.tests": "tests"}, + include_package_data=True, + install_requires=[ +- "setuptools", + "requests >= 2.6.1", # >= 2.6.1 to workaround + # https://github.com/ionrock/cachecontrol/issues/137 + "ruamel.yaml >= 0.16, < 0.19", +@@ -131,7 +130,6 @@ + "prov == 1.5.1", + "mypy-extensions", + "psutil >= 5.6.6", +- "importlib_resources>=1.4;python_version<'3.9'", + "coloredlogs", + "pydot >= 1.4.1, <3", + "argcomplete", ===================================== debian/patches/remove-python3-shellescape ===================================== @@ -1,5 +1,9 @@ ---- a/cwltool/command_line_tool.py -+++ b/cwltool/command_line_tool.py +Author: Alexandre Detiste <[email protected]> +Date: Sun Sep 15 02:06:57 2024 +0200 +Description: remove last user of old python3-shellescape +Forwarded: https://github.com/common-workflow-language/cwltool/pull/2041 +--- cwltool.orig/cwltool/command_line_tool.py ++++ cwltool/cwltool/command_line_tool.py @@ -31,7 +31,7 @@ cast, ) @@ -18,8 +22,8 @@ cmd.extend(aslist(arg)) j.command_line = ["/bin/sh", "-c", " ".join(cmd)] else: ---- a/cwltool/job.py -+++ b/cwltool/job.py +--- cwltool.orig/cwltool/job.py ++++ cwltool/cwltool/job.py @@ -35,7 +35,7 @@ ) @@ -38,9 +42,9 @@ for arg in (runtime + self.command_line) ] ), ---- a/setup.py -+++ b/setup.py -@@ -126,7 +126,6 @@ +--- cwltool.orig/setup.py ++++ cwltool/setup.py +@@ -125,7 +125,6 @@ # https://github.com/ionrock/cachecontrol/issues/137 "ruamel.yaml >= 0.16, < 0.19", "rdflib >= 4.2.2, < 7.1.0", ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ +drop-old-deps disable_prov remove-python3-shellescape View it on GitLab: https://salsa.debian.org/med-team/cwltool/-/compare/fdc4220bd88d96517880bcf37897eb486c59da62...9ae00b5c69a5b3a7743c3586d0c2c2eb1d0dbe1e -- View it on GitLab: https://salsa.debian.org/med-team/cwltool/-/compare/fdc4220bd88d96517880bcf37897eb486c59da62...9ae00b5c69a5b3a7743c3586d0c2c2eb1d0dbe1e 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
