Attempt to factor out package scripts

apache · Jun 24, 2019 · bebc6ab · bebc6ab
1 parent edd39a2
commit bebc6ab
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 139 deletions.
diff --git a/dev/tasks/python-wheels/manylinux1-test.sh → dev/tasks/python-wheels/manylinux-test.sh b/dev/tasks/python-wheels/manylinux1-test.sh → dev/tasks/python-wheels/manylinux-test.sh
@@ -20,7 +20,7 @@
 set -e
 
 # Install built wheel
-pip install -q /arrow/python/manylinux1/dist/*.whl
+pip install -q /arrow/python/$WHEEL_TAG/dist/*.whl
 
 # Runs tests on installed distribution from an empty directory
 python --version

diff --git a/dev/tasks/python-wheels/manylinux2010-test.sh b/dev/tasks/python-wheels/manylinux2010-test.sh
diff --git a/...tasks/python-wheels/travis.manylinux1.yml → dev/tasks/python-wheels/travis.manylinux.yml b/...tasks/python-wheels/travis.manylinux1.yml → dev/tasks/python-wheels/travis.manylinux.yml
@@ -51,22 +51,25 @@ script:
 
   # don't attempt to build it, because the base image by pypa is updated
   # regularly and would cause undeterministic builds
-  - docker-compose pull python-manylinux1
+  - BUILD_IMAGE=python-{{ wheel_tag }}
+  - docker-compose pull $BUILD_IMAGE
   - docker-compose run
       -e SETUPTOOLS_SCM_PRETEND_VERSION={{ arrow.no_rc_version }}
       -e PYTHON_VERSION="{{ python_version }}"
       -e UNICODE_WIDTH="{{ unicode_width }}"
-      python-manylinux1
+      $BUILD_IMAGE
   - popd
 
   # test on multiple distributions
   {%- for image in test_docker_images %}
-  - docker run -it --shm-size 2G --volume $(pwd)/arrow:/arrow {{ image }}
-      /arrow/dev/tasks/python-wheels/manylinux1-test.sh
+  - docker run -it --shm-size 2G --volume $(pwd)/arrow:/arrow
+      --env WHEEL_TAG="{{ wheel_tag }}"
+      {{ image }}
+      /arrow/dev/tasks/python-wheels/manylinux-test.sh
   {%- endfor %}
 
   # prepare for deployment
-  - sudo mv arrow/python/manylinux1/dist/* dist/
+  - sudo mv arrow/python/{{ wheel_tag }}/dist/* dist/
 
 deploy:
   provider: releases

diff --git a/dev/tasks/python-wheels/travis.manylinux2010.yml b/dev/tasks/python-wheels/travis.manylinux2010.yml
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
@@ -159,21 +159,23 @@ tasks:
   wheel-manylinux1-cp27m:
     ci: travis
     platform: linux
-    template: python-wheels/travis.manylinux1.yml
+    template: python-wheels/travis.manylinux.yml
     params:
       python_version: 2.7
       unicode_width: 16
+      wheel_tag: manylinux1
       test_docker_images: []
     artifacts:
       - pyarrow-{no_rc_version}-cp27-cp27m-manylinux1_x86_64.whl
 
   wheel-manylinux1-cp27mu:
     ci: travis
     platform: linux
-    template: python-wheels/travis.manylinux1.yml
+    template: python-wheels/travis.manylinux.yml
     params:
       python_version: 2.7
       unicode_width: 32
+      wheel_tag: manylinux1
       test_docker_images:
         - python:2.7-slim  # debian ucs4
     artifacts:
@@ -182,10 +184,11 @@ tasks:
   wheel-manylinux1-cp35m:
     ci: travis
     platform: linux
-    template: python-wheels/travis.manylinux1.yml
+    template: python-wheels/travis.manylinux.yml
     params:
       python_version: 3.5
       unicode_width: 16
+      wheel_tag: manylinux1
       test_docker_images:
         - python:3.5-slim
     artifacts:
@@ -194,10 +197,11 @@ tasks:
   wheel-manylinux1-cp36m:
     ci: travis
     platform: linux
-    template: python-wheels/travis.manylinux1.yml
+    template: python-wheels/travis.manylinux.yml
     params:
       python_version: 3.6
       unicode_width: 16
+      wheel_tag: manylinux1
       test_docker_images:
         - python:3.6-slim
     artifacts:
@@ -206,10 +210,11 @@ tasks:
   wheel-manylinux1-cp37m:
     ci: travis
     platform: linux
-    template: python-wheels/travis.manylinux1.yml
+    template: python-wheels/travis.manylinux.yml
     params:
       python_version: 3.7
       unicode_width: 16
+      wheel_tag: manylinux1
       test_docker_images:
         - python:3.7-slim
     artifacts:
@@ -218,10 +223,11 @@ tasks:
   wheel-manylinux2010-cp27m:
     ci: travis
     platform: linux
-    template: python-wheels/travis.manylinux2010.yml
+    template: python-wheels/travis.manylinux.yml
     params:
       python_version: 2.7
       unicode_width: 16
+      wheel_tag: manylinux2010
       test_docker_images: []
     artifacts:
       - pyarrow-{no_rc_version}-cp27-cp27m-manylinux2010_x86_64.whl
@@ -233,6 +239,7 @@ tasks:
     params:
       python_version: 2.7
       unicode_width: 32
+      wheel_tag: manylinux2010
       test_docker_images:
         - python:2.7-slim  # debian ucs4
     artifacts:
@@ -245,6 +252,7 @@ tasks:
     params:
       python_version: 3.5
       unicode_width: 16
+      wheel_tag: manylinux2010
       test_docker_images:
         - python:3.5-slim
     artifacts:
@@ -257,6 +265,7 @@ tasks:
     params:
       python_version: 3.6
       unicode_width: 16
+      wheel_tag: manylinux2010
       test_docker_images:
         - python:3.6-slim
     artifacts:
@@ -269,6 +278,7 @@ tasks:
     params:
       python_version: 3.7
       unicode_width: 16
+      wheel_tag: manylinux2010
       test_docker_images:
         - python:3.7-slim
     artifacts: