From e2b3ed63a292537ec7bf37a904ad2925d6afa0bf Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Mon, 14 Feb 2022 09:54:26 -0500 Subject: [PATCH] 18723: Use setuptools console entrypoints, fix dev-jobs.dockerfile Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- sdk/cwl/arvados_cwl/__init__.py | 6 +++++- sdk/dev-jobs.dockerfile | 6 ++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py index c3848b2629..734945c0f7 100644 --- a/sdk/cwl/arvados_cwl/__init__.py +++ b/sdk/cwl/arvados_cwl/__init__.py @@ -258,7 +258,11 @@ def exit_signal_handler(sigcode, frame): logger.error(str(u"Caught signal {}, exiting.").format(sigcode)) sys.exit(-sigcode) -def main(args, stdout, stderr, api_client=None, keep_client=None, +def main(args=sys.argv[1:], + stdout=sys.stdout, + stderr=sys.stderr, + api_client=None, + keep_client=None, install_sig_handlers=True): parser = arg_parser() diff --git a/sdk/dev-jobs.dockerfile b/sdk/dev-jobs.dockerfile index 1e0068ffd4..b55b056b2d 100644 --- a/sdk/dev-jobs.dockerfile +++ b/sdk/dev-jobs.dockerfile @@ -23,9 +23,7 @@ ARG pipcmd=pip3 RUN apt-get update -q && apt-get install -qy --no-install-recommends \ git ${pythoncmd}-pip ${pythoncmd}-virtualenv ${pythoncmd}-dev libcurl4-gnutls-dev \ - libgnutls28-dev nodejs ${pythoncmd}-pyasn1-modules build-essential - -RUN $pipcmd install -U setuptools six requests + libgnutls28-dev nodejs ${pythoncmd}-pyasn1-modules build-essential ${pythoncmd}-setuptools ARG sdk ARG runner @@ -39,7 +37,7 @@ ADD cwl/dist/$runner /tmp/ RUN cd /tmp/arvados-python-client-* && $pipcmd install . RUN if test -d /tmp/schema-salad-* ; then cd /tmp/schema-salad-* && $pipcmd install . ; fi -RUN if test -d /tmp/cwltool-* ; then cd /tmp/cwltool-* && $pipcmd install networkx==2.2 && $pipcmd install . ; fi +RUN if test -d /tmp/cwltool-* ; then cd /tmp/cwltool-* && $pipcmd install . ; fi RUN cd /tmp/arvados-cwl-runner-* && $pipcmd install . # Install dependencies and set up system. -- 2.30.2