Add .wait()

plasticityai · Nov 8, 2018 · 858ab00 · 858ab00
1 parent 6a02ba4
commit 858ab00
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -177,7 +177,7 @@ Deploy Linux Wheels:
     - echo "aws_access_key_id = $AWS_ACCESS_KEY_ID" >> /.awsstore/credentials
     - echo "aws_secret_access_key = $AWS_SECRET_ACCESS_KEY" >> /.awsstore/credentials
     - eval "copytocibuildwheel() { export CIBUILDWHEEL_CONTAINER=\$(docker ps --format 'table {{.ID}}\t{{.Names}}\t{{.Image}}' | grep 'quay.io/pypa/manylinux1' | head -n1 | awk '{print \$2}') && (docker cp $CI_PROJECT_DIR/. \$CIBUILDWHEEL_CONTAINER:/project || true) && docker exec \$CIBUILDWHEEL_CONTAINER mkdir -p /root/.aws && docker cp /.awsstore/credentials \$CIBUILDWHEEL_CONTAINER:/root/.aws/credentials; }"
-    - eval "repeatcopytocibuildwheel() { while sleep 1; do copytocibuildwheel || true; done }"
+    - eval "repeatcopytocibuildwheel() { while sleep 1; do copytocibuildwheel || (echo 'Could not locate container:' && docker ps); done }"
     - export -f copytocibuildwheel
     - export -f repeatcopytocibuildwheel
     - export CIBW_PLATFORM=linux

diff --git a/setup.py b/setup.py
@@ -218,7 +218,7 @@ def download_and_install_wheel():
                 "import pkg_resources;"
                 "pkg_resources.require('" + requirement + "');"
                 "importlib.import_module('" + package_name + "');"
-            ])
+            ]).wait()
             if req_rc == 0:
                 print("Requirement met...skipping install of: ", package_name)
             else:

diff --git a/version.py b/version.py
@@ -1,2 +1,2 @@
-__version_info__ = ('0', '1', '114')
+__version_info__ = ('0', '1', '115')
 __version__ = '.'.join(__version_info__)