Unverified Commit 8cc36040 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #18954 from nsoranzo/release_23.2_drop_shellescape

[23.2] Don't check availability of shellescape
parents c0f4ba11 b0b9bbeb
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
from .cwltool_deps import (
    needs_shell_quoting,
    shellescape,
)
from .cwltool_deps import needs_shell_quoting
from .parser import (
    tool_proxy,
    tool_proxy_from_persistent_representation,
@@ -21,5 +18,4 @@ __all__ = (
    "to_cwl_job",
    "to_galaxy_parameters",
    "needs_shell_quoting",
    "shellescape",
)
+2 −9
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Use this as the import interface for cwltool and just call
:func:`ensure_cwltool_available` before using any of the imported
functionality at runtime.
"""

import re
import warnings

@@ -70,11 +71,6 @@ except ImportError:
    visit_class = None  # type: ignore[assignment]
    normalizeFilesDirs = None  # type: ignore[assignment]

try:
    import shellescape
except ImportError:
    shellescape = None

try:
    import schema_salad
    from schema_salad import (
@@ -104,7 +100,7 @@ def ensure_cwltool_available():

    Throw an ImportError with a description of the problem if they do not exist.
    """
    if main is None or workflow is None or shellescape is None:
    if main is None or workflow is None:
        message = "This feature requires cwltool and dependencies to be available, they are not."
        if main is None:
            message += " cwltool is not unavailable."
@@ -112,8 +108,6 @@ def ensure_cwltool_available():
            message += " cwltool.load_tool.resolve_and_validate_document is unavailable - cwltool version is too old."
        if requests is None:
            message += " Library 'requests' unavailable."
        if shellescape is None:
            message += " Library 'shellescape' unavailable."
        if schema_salad is None:
            message += " Library 'schema_salad' unavailable."
        raise ImportError(message)
@@ -136,7 +130,6 @@ __all__ = (
    "resolve_and_validate_document",
    "RuntimeContext",
    "schema_salad",
    "shellescape",
    "sourceline",
    "StdFsAccess",
    "visit_class",