temporary: manylinux images do not work with github, py36 was not dropped

Author: penguinolog

.github/workflows/pythonpackage.yml

@@ -201,43 +201,43 @@ jobs:
         run: |
           twine upload --skip-existing dist/*
 
-  DeployManyLinux:
-    needs: [ TestLinux, TestWindows ]
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    container:
-      image: ${{ matrix.MANYLINUX.CONTAINER }}
-      env:
-        PYTHONDONTWRITEBYTECODE: 1
-    strategy:
-      matrix:
-        PYTHON: [ "cp37-cp37m", "cp38-cp38", "cp39-cp39" ]
-        MANYLINUX:
-          - NAME: manylinux2010_x86_64
-            CONTAINER: "quay.io/pypa/manylinux2010_x86_64"
-          - NAME: manylinux2014_x86_64
-            CONTAINER: "quay.io/pypa/manylinux2014_x86_64"
-    name: "${{ matrix.PYTHON }} for ${{ matrix.MANYLINUX.NAME }}"
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install main dependencies
-        run: |
-          /opt/python/${{ matrix.PYTHON }}/bin/python -m pip install -U pip wheel setuptools
-          /opt/python/${{ matrix.PYTHON }}/bin/pip install --upgrade -r build_requirements.txt
-          /opt/python/${{ matrix.PYTHON }}/bin/pip install --upgrade twine
-      - name: Build package
-        run: /opt/python/${{ matrix.PYTHON }}/bin/python setup.py bdist_wheel clean
-      - name: Bundle external shared libraries into the wheels
-        run: |
-          for whl in dist/*.whl; do
-              echo "Repairing $whl..."
-              auditwheel repair "$whl" -w dist/
-          done
-      - name: Cleanup OS specific wheels
-        run: rm -fv dist/*-linux_*.whl
-      - name: Deploy
-        env:
-          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: |
-          twine upload --skip-existing dist/*
+#  DeployManyLinux:
+#    needs: [ TestLinux, TestWindows ]
+#    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+#    runs-on: ubuntu-latest
+#    container:
+#      image: ${{ matrix.MANYLINUX.CONTAINER }}
+#      env:
+#        PYTHONDONTWRITEBYTECODE: 1
+#    strategy:
+#      matrix:
+#        PYTHON: [ "cp37-cp37m", "cp38-cp38", "cp39-cp39" ]
+#        MANYLINUX:
+#          - NAME: manylinux2010_x86_64
+#            CONTAINER: "quay.io/pypa/manylinux2010_x86_64"
+#          - NAME: manylinux2014_x86_64
+#            CONTAINER: "quay.io/pypa/manylinux2014_x86_64"
+#    name: "${{ matrix.PYTHON }} for ${{ matrix.MANYLINUX.NAME }}"
+#    steps:
+#      - uses: actions/checkout@v2
+#      - name: Install main dependencies
+#        run: |
+#          /opt/python/${{ matrix.PYTHON }}/bin/python -m pip install -U pip wheel setuptools
+#          /opt/python/${{ matrix.PYTHON }}/bin/pip install --upgrade -r build_requirements.txt
+#          /opt/python/${{ matrix.PYTHON }}/bin/pip install --upgrade twine
+#      - name: Build package
+#        run: /opt/python/${{ matrix.PYTHON }}/bin/python setup.py bdist_wheel clean
+#      - name: Bundle external shared libraries into the wheels
+#        run: |
+#          for whl in dist/*.whl; do
+#              echo "Repairing $whl..."
+#              auditwheel repair "$whl" -w dist/
+#          done
+#      - name: Cleanup OS specific wheels
+#        run: rm -fv dist/*-linux_*.whl
+#      - name: Deploy
+#        env:
+#          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+#          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+#        run: |
+#          twine upload --skip-existing dist/*

.travis.yml

@@ -9,6 +9,9 @@ install:
   - pip install --upgrade coveralls
 
 _python:
+  - &python36
+    name: "Python 3.6"
+    python: "3.6"
   - &python37
     name: "Python 3.7"
     python: "3.7"
@@ -126,6 +129,10 @@ jobs:
       script:
         - black --check advanced_descriptors
 
+    - stage: test
+      <<: *python36
+      after_success:
+        - coveralls
     - stage: test
       <<: *python37
       after_success:
@@ -139,6 +146,8 @@ jobs:
       after_success:
         - coveralls
 
+    - <<: *test_cythonized
+      <<: *python36
     - <<: *test_cythonized
       <<: *python37
     - <<: *test_cythonized
@@ -160,6 +169,13 @@ jobs:
       script:
         - ./tools/run_docker_manylinux2014.sh advanced_descriptors "i686"
 
+    - stage: deploy
+      # This prevents job from appearing in test plan unless commit is tagged:
+      <<: *deploy
+      name: Build universal and cythonized for x86_64 bdist_wheel. Deploy bdist.
+      script:
+        - ./tools/run_docker_manylinux2014.sh advanced_descriptors "x86_64"
+
     - stage: deploy
       # This prevents job from appearing in test plan unless commit is tagged:
       <<: *deploy

pyproject.toml

@@ -11,7 +11,7 @@ build-backend="setuptools.build_meta"
 [tool.black]
 line-length = 120
 safe = true
-target-version = ["py37", "py38"]
+target-version = ["py36", "py37", "py38"]
 
 [tool.isort]
 line_length = 120

tools/run_docker.sh

@@ -7,12 +7,27 @@ then
     exit 1
 fi
 
-docker pull "quay.io/pypa/manylinux2010_i686" & arch_pull_pid=$!
+manylinux1_image_prefix="quay.io/pypa/manylinux2010_"
+dock_ext_args=""
+declare -A docker_pull_pids=()  # This syntax requires at least bash v4
 
-echo
-echo
-echo waiting for docker pull pid $arch_pull_pid to complete downloading container for i686 arch...
-wait $arch_pull_pid  # await for docker image for current arch to be pulled from hub
+for arch in x86_64 i686
+do
+    docker pull "${manylinux1_image_prefix}${arch}" &
+    docker_pull_pids[$arch]=$!
+done
 
-echo Building wheel for i686 arch
-docker run --rm -v "$(pwd)":/io "quay.io/pypa/manylinux2010_i686" linux32 /io/tools/build-wheels.sh "$package_name"
+for arch in x86_64 i686
+do
+    echo
+    echo
+    arch_pull_pid=${docker_pull_pids[$arch]}
+    echo waiting for docker pull pid $arch_pull_pid to complete downloading container for $arch arch...
+    wait $arch_pull_pid  # await for docker image for current arch to be pulled from hub
+    [ $arch == "i686" ] && dock_ext_args="linux32"
+
+    echo Building wheel for $arch arch
+    docker run --rm -v "$(pwd)":/io "${manylinux1_image_prefix}${arch}" $dock_ext_args /io/tools/build-wheels.sh "$package_name"
+
+    dock_ext_args=""  # Reset docker args, just in case
+done