[med-svn] [Git][med-team/cwltool][master] 2 commits: remove last user of old python3-shellescape

[Alexandre Detiste (@detiste-guest)]

Alexandre Detiste pushed to branch master at Debian Med / cwltool


Commits:
4286737a by Alexandre Detiste at 2024-09-15T02:06:57+02:00
remove last user of old python3-shellescape

- - - - -
b111622d by Alexandre Detiste at 2024-09-15T02:07:32+02:00
apply Multi-Arch: hint

- - - - -


3 changed files:

- debian/control
- + debian/patches/remove-python3-shellescape
- debian/patches/series


Changes:

=====================================
debian/control
=====================================
@@ -20,7 +20,6 @@ Build-Depends: debhelper-compat (= 13),
                python3-coloredlogs <!nocheck> <!nodoc>,
                python3-rdflib (>> 6) <!nocheck>,
                python3-schema-salad (>=8.4.20230808163024) <!nocheck> <!nodoc>,
-               python3-shellescape <!nocheck> <!nodoc>,
                python3-html5lib <!nocheck>,
                python3-sparqlwrapper <!nocheck>,
                python3-keepalive <!nocheck>,
@@ -76,6 +75,7 @@ Description: Common Workflow Language reference implementation
 
 Package: cwltool-doc
 Architecture: all
+Multi-Arch: foreign
 Built-Using: ${sphinxdoc:Built-Using}
 Depends: ${sphinxdoc:Depends}, ${misc:Depends}
 Description: Common Workflow Language reference implementation -- docs


=====================================
debian/patches/remove-python3-shellescape
=====================================
@@ -0,0 +1,50 @@
+--- a/cwltool/command_line_tool.py
++++ b/cwltool/command_line_tool.py
+@@ -31,7 +31,7 @@
+     cast,
+ )
+ 
+-import shellescape
++import shlex
+ from mypy_extensions import mypyc_attr
+ from ruamel.yaml.comments import CommentedMap, CommentedSeq
+ from schema_salad.avro.schema import Schema
+@@ -1164,7 +1164,7 @@
+             for b in builder.bindings:
+                 arg = builder.generate_arg(b)
+                 if b.get("shellQuote", True):
+-                    arg = [shellescape.quote(a) for a in aslist(arg)]
++                    arg = [shlex.quote(a) for a in aslist(arg)]
+                 cmd.extend(aslist(arg))
+             j.command_line = ["/bin/sh", "-c", " ".join(cmd)]
+         else:
+--- a/cwltool/job.py
++++ b/cwltool/job.py
+@@ -35,7 +35,7 @@
+ )
+ 
+ import psutil
+-import shellescape
++import shlex
+ from prov.model import PROV
+ from schema_salad.sourceline import SourceLine
+ from schema_salad.utils import json_dump, json_dumps
+@@ -271,7 +271,7 @@
+             self.outdir,
+             " \\\n    ".join(
+                 [
+-                    shellescape.quote(str(arg)) if shouldquote(str(arg)) else str(arg)
++                    shlex.quote(str(arg)) if shouldquote(str(arg)) else str(arg)
+                     for arg in (runtime + self.command_line)
+                 ]
+             ),
+--- a/setup.py
++++ b/setup.py
+@@ -126,7 +126,6 @@
+         # https://github.com/ionrock/cachecontrol/issues/137
+         "ruamel.yaml >= 0.16, < 0.19",
+         "rdflib >= 4.2.2, < 7.1.0",
+-        "shellescape >= 3.4.1, < 3.9",
+         "schema-salad >= 8.7, < 9",
+         "prov >= 1.5.1",
+         "mypy-extensions",


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 disable_prov
+remove-python3-shellescape



View it on GitLab: https://salsa.debian.org/med-team/cwltool/-/compare/bd9c2335201e745b1210d80d6c9b9b0444140bd7...b111622da3cc21c33e2c11b5bceb1b02296585d7

-- 
View it on GitLab: https://salsa.debian.org/med-team/cwltool/-/compare/bd9c2335201e745b1210d80d6c9b9b0444140bd7...b111622da3cc21c33e2c11b5bceb1b02296585d7
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/20240915/ac107d89/attachment-0001.htm>