Skip to content

Commit 1eb83d1

Browse files
jfennickmr-c
authored andcommitted
strip newline from version string; fix mypy error
1 parent 33f00c5 commit 1eb83d1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cwltool.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ RUN apk add --no-cache git gcc python3-dev libxml2-dev libxslt-dev libc-dev linu
44

55
WORKDIR /cwltool
66
COPY . .
7-
RUN export SETUPTOOLS_SCM_PRETEND_VERSION_FOR_CWLTOOL=$(grep __version__ cwltool/_version.py | awk -F\' '{ print $2 }') ; \
7+
RUN export SETUPTOOLS_SCM_PRETEND_VERSION_FOR_CWLTOOL=$(grep __version__ cwltool/_version.py | awk -F\' '{ print $2 }' | tr -d '\\n') ; \
88
CWLTOOL_USE_MYPYC=1 MYPYPATH=mypy-stubs pip wheel --no-binary schema-salad \
99
--wheel-dir=/wheels .[deps] # --verbose
1010
RUN rm /wheels/schema_salad*

cwltool/software_requirements.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def get_container_from_software_requirements(
159159
[DOCKER_CONTAINER_TYPE], tool_info
160160
)
161161
if container_description:
162-
return container_description.identifier
162+
return str(container_description.identifier)
163163

164164
return None
165165

0 commit comments

Comments
 (0)