From f667faa6471437b13487e8ea2cf99b24978b148c Mon Sep 17 00:00:00 2001 From: labuzm Date: Sun, 9 Aug 2020 00:25:23 +0200 Subject: [PATCH] adjust regex and use --rm for docker container --- kaacore | 2 +- scripts/wheel_builder.sh | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kaacore b/kaacore index 620006da..a6b4cfba 160000 --- a/kaacore +++ b/kaacore @@ -1 +1 @@ -Subproject commit 620006da81d549cb504a89c78a0c5cf86e01a955 +Subproject commit a6b4cfbabcd8a062e7091f418e63f2cf062a9abe diff --git a/scripts/wheel_builder.sh b/scripts/wheel_builder.sh index e6b0ff43..305303d8 100755 --- a/scripts/wheel_builder.sh +++ b/scripts/wheel_builder.sh @@ -25,7 +25,7 @@ python -c 'import versioneer; versioneer.write_to_version_file("_build_version.p for PY_VERSION in ${TARGETS} do - sudo docker run -i -t -v `pwd`:/host "${DOCKER_IMAGE}" \ + sudo docker run --rm -it -v `pwd`:/host "${DOCKER_IMAGE}" \ /bin/bash /host/scripts/docker_wheel_builder.sh ${PY_VERSION} done diff --git a/setup.py b/setup.py index ac36faea..3bdf8843 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ def _filter_cmake_manifest(cmake_manifest): - pattern = r'^_skbuild/.+(/src/kaa/.+)|(/bin/shaderc)$' + pattern = r'^_skbuild/.+(?:(/src/kaa/.+)|(/bin/shaderc))$' return [ path for path in cmake_manifest if re.match(pattern, path)