ci: Build wheels for Python 3.6

elprans · elprans · commit 2fe0089d02dd · 2017-01-02T11:12:56.000-05:00
diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
@@ -14,6 +14,8 @@ environment:
     matrix:
         - PYTHON: "C:\\Python35\\python.exe"
         - PYTHON: "C:\\Python35-x64\\python.exe"
+        - PYTHON: "C:\\Python36\\python.exe"
+        - PYTHON: "C:\\Python36-x64\\python.exe"
 
 install:
     - "%PYTHON% -m pip install --upgrade pip wheel setuptools"
diff --git a/.ci/travis-before-install.sh b/.ci/travis-before-install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ "${TRAVIS_OS_NAME}" == "linux" -a "${BUILD}" == "full" ]; then
+if [[ "${TRAVIS_OS_NAME}" == "linux" && "${BUILD}" == *wheels* ]]; then
     # Allow docker guests to connect to the database
     sudo service postgresql stop ${PGVERSION}
     echo "listen_addresses = '*'" | \
diff --git a/.ci/travis-build-docs.sh b/.ci/travis-build-docs.sh
@@ -1,73 +1,11 @@
 #!/bin/bash
 
-# Based on https://gist.github.com/domenic/ec8b0fc8ab45f39403dd
-
 set -e -x
 
-if [ "${BUILD}" != "docs" ]; then
+if [[ "${BUILD}" != *docs* ]]; then
     echo "Skipping documentation build."
     exit 0
 fi
 
-SOURCE_BRANCH="master"
-TARGET_BRANCH="gh-pages"
-DOC_BUILD_DIR="_build/html/"
-
 pip install -r docs/requirements.txt
 make htmldocs
-
-if [ "${TRAVIS_PULL_REQUEST}" != "false" -o -z "${TRAVIS_TAG}" ]; then
-    echo "Skipping documentation deploy."
-    exit 0
-fi
-
-git config --global user.email "infra@magic.io"
-git config --global user.name "Travis CI"
-
-REPO=$(git config remote.origin.url)
-SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:}
-COMMITISH=$(git rev-parse --verify HEAD)
-AUTHOR=$(git show --format="%aN <%aE>" "${COMMITISH}")
-
-git clone "${REPO}" docs/gh-pages
-cd docs/gh-pages
-git checkout "${TARGET_BRANCH}" || git checkout --orphan "${TARGET_BRANCH}"
-cd ..
-
-rm -r gh-pages/devel/
-rsync -a "${DOC_BUILD_DIR}/" gh-pages/devel/
-
-if [ -n "${TRAVIS_TAG}" ]; then
-    rm -r gh-pages/current/
-    rsync -a "${DOC_BUILD_DIR}/" gh-pages/current/
-fi
-
-cd gh-pages
-
-if git diff --quiet --exit-code; then
-    echo "No changes to documentation."
-    exit 0
-fi
-
-git add --all .
-git commit -m "Automatic documentation update" --author="${AUTHOR}"
-
-set +x
-echo "Decrypting push key..."
-ENCRYPTED_KEY_VAR="encrypted_${DOCS_PUSH_KEY_LABEL}_key"
-ENCRYPTED_IV_VAR="encrypted_${DOCS_PUSH_KEY_LABEL}_iv"
-ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR}
-ENCRYPTED_IV=${!ENCRYPTED_IV_VAR}
-openssl aes-256-cbc -K "${ENCRYPTED_KEY}" -iv "${ENCRYPTED_IV}" \
-            -in "${TRAVIS_BUILD_DIR}/.ci/push_key.enc" \
-            -out "${TRAVIS_BUILD_DIR}/.ci/push_key" -d
-set -x
-chmod 600 "${TRAVIS_BUILD_DIR}/.ci/push_key"
-eval `ssh-agent -s`
-ssh-add "${TRAVIS_BUILD_DIR}/.ci/push_key"
-
-git push "${SSH_REPO}" "${TARGET_BRANCH}"
-rm "${TRAVIS_BUILD_DIR}/.ci/push_key"
-
-cd "${TRAVIS_BUILD_DIR}"
-rm -rf docs/gh-pages
diff --git a/.ci/travis-build-wheels.sh b/.ci/travis-build-wheels.sh
@@ -3,7 +3,7 @@
 set -e -x
 
 
-if [ "${TRAVIS_BRANCH}" != "releases" -o "${BUILD}" != "full" ]; then
+if [[ "${TRAVIS_BRANCH}" != "releases" || "${BUILD}" != *wheels* ]]; then
     # Not a release
     exit 0
 fi
@@ -37,29 +37,23 @@ _upload_wheels() {
 
 
 if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
-    ML_PYTHON_VERSION=$(python3 -c "import sys; \
-        print('cp{maj}{min}-cp{maj}{min}m'.format( \
-              maj=sys.version_info.major, min=sys.version_info.minor))")
-
-    PYTHON_VERSION=$(python3 -c "import sys; \
-        print('{maj}.{min}'.format( \
-              maj=sys.version_info.major, min=sys.version_info.minor))")
-
-    if [[ "${RELEASE_PYTHON_VERSIONS}" != *"${PYTHON_VERSION}"* ]]; then
-        echo "Skipping release on Python ${PYTHON_VERSION}."
-        exit 0
-    fi
-
-    for arch in x86_64 i686; do
-        ML_IMAGE="quay.io/pypa/manylinux1_${arch}"
-        docker pull "${ML_IMAGE}"
-        docker run --rm \
-            -v "${_root}":/io \
-            -e "PYMODULE=${PYMODULE}" \
-            -e "PYTHON_VERSION=${ML_PYTHON_VERSION}" \
-            "${ML_IMAGE}" /io/.ci/build-manylinux-wheels.sh
-
-        _upload_wheels
+    for pyver in ${RELEASE_PYTHON_VERSIONS}; do
+        ML_PYTHON_VERSION=$(python3 -c \
+            "print('cp{maj}{min}-cp{maj}{min}m'.format( \
+                   maj='${pyver}'.split('.')[0], \
+                   min='${pyver}'.split('.')[1]))")
+
+        for arch in x86_64 i686; do
+            ML_IMAGE="quay.io/pypa/manylinux1_${arch}"
+            docker pull "${ML_IMAGE}"
+            docker run --rm \
+                -v "${_root}":/io \
+                -e "PYMODULE=${PYMODULE}" \
+                -e "PYTHON_VERSION=${ML_PYTHON_VERSION}" \
+                "${ML_IMAGE}" /io/.ci/build-manylinux-wheels.sh
+
+            _upload_wheels
+        done
     done
 
 elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then
diff --git a/.ci/travis-publish-docs.sh b/.ci/travis-publish-docs.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+# Based on https://gist.github.com/domenic/ec8b0fc8ab45f39403dd
+
+set -e -x
+
+SOURCE_BRANCH="master"
+TARGET_BRANCH="gh-pages"
+DOC_BUILD_DIR="_build/html/"
+
+if [ "${TRAVIS_PULL_REQUEST}" != "false" -o -z "${TRAVIS_TAG}" ]; then
+    echo "Skipping documentation deploy."
+    exit 0
+fi
+
+pip install -r docs/requirements.txt
+make htmldocs
+
+git config --global user.email "infra@magic.io"
+git config --global user.name "Travis CI"
+
+REPO=$(git config remote.origin.url)
+SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:}
+COMMITISH=$(git rev-parse --verify HEAD)
+AUTHOR=$(git show --format="%aN <%aE>" "${COMMITISH}")
+
+git clone "${REPO}" docs/gh-pages
+cd docs/gh-pages
+git checkout "${TARGET_BRANCH}" || git checkout --orphan "${TARGET_BRANCH}"
+cd ..
+
+rm -r gh-pages/devel/
+rsync -a "${DOC_BUILD_DIR}/" gh-pages/devel/
+
+if [ -n "${TRAVIS_TAG}" ]; then
+    rm -r gh-pages/current/
+    rsync -a "${DOC_BUILD_DIR}/" gh-pages/current/
+fi
+
+cd gh-pages
+
+if git diff --quiet --exit-code; then
+    echo "No changes to documentation."
+    exit 0
+fi
+
+git add --all .
+git commit -m "Automatic documentation update" --author="${AUTHOR}"
+
+set +x
+echo "Decrypting push key..."
+ENCRYPTED_KEY_VAR="encrypted_${DOCS_PUSH_KEY_LABEL}_key"
+ENCRYPTED_IV_VAR="encrypted_${DOCS_PUSH_KEY_LABEL}_iv"
+ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR}
+ENCRYPTED_IV=${!ENCRYPTED_IV_VAR}
+openssl aes-256-cbc -K "${ENCRYPTED_KEY}" -iv "${ENCRYPTED_IV}" \
+            -in "${TRAVIS_BUILD_DIR}/.ci/push_key.enc" \
+            -out "${TRAVIS_BUILD_DIR}/.ci/push_key" -d
+set -x
+chmod 600 "${TRAVIS_BUILD_DIR}/.ci/push_key"
+eval `ssh-agent -s`
+ssh-add "${TRAVIS_BUILD_DIR}/.ci/push_key"
+
+git push "${SSH_REPO}" "${TARGET_BRANCH}"
+rm "${TRAVIS_BUILD_DIR}/.ci/push_key"
+
+cd "${TRAVIS_BUILD_DIR}"
+rm -rf docs/gh-pages
diff --git a/.ci/travis-release.sh b/.ci/travis-release.sh
@@ -26,7 +26,7 @@ release_platforms=(
     "win_amd64"
 )
 
-P="asyncpg-${PACKAGE_VERSION}"
+P="${PYMODULE}-${PACKAGE_VERSION}"
 expected_wheels=()
 
 for pyver in ${RELEASE_PYTHON_VERSIONS}; do
@@ -51,3 +51,5 @@ for distfile in "${expected_wheels[@]}"; do
 done
 
 python -m twine upload dist/*.whl dist/*.tar.*
+
+.ci/travis-publish-docs.sh
diff --git a/.ci/travis-tests.sh b/.ci/travis-tests.sh
@@ -2,7 +2,7 @@
 
 set -e -x
 
-if [ "${BUILD}" != "quick" -a "${BUILD}" != "full" ]; then
+if [[ "${BUILD}" != *tests* ]]; then
     echo "Skipping tests."
     exit 0
 fi
@@ -13,7 +13,7 @@ if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
     eval "$(pyenv init -)"
 fi
 
-if [ "${BUILD}" == "quick" ]; then
+if [[ "${BUILD}" == *quicktests* ]]; then
     make && make quicktest
 else
     make && make test
diff --git a/.travis.yml b/.travis.yml
@@ -3,32 +3,40 @@ language: generic
 env:
     global:
         - PYMODULE=asyncpg
-        - RELEASE_PYTHON_VERSIONS="3.5"
+        - RELEASE_PYTHON_VERSIONS="3.5 3.6"
 
         - S3_UPLOAD_USERNAME=oss-ci-bot
         - S3_UPLOAD_BUCKET=magicstack-oss-releases
+        # S3_UPLOAD_ACCESSKEY:
         - secure: "iU37gukuyeaYM69StkR/aUTNgolblBdw2is034evvrm/SG0bKyzVVSrcK/dts9jolkCxJi+01VfpzxIBu2PF11QnCN1exUILb+XfmR+dVxUnNY2M1qqjILHvQ92rFJ9f2TlbYa2AlwgKynZlY4+edVSACSWwD/+TbWGAQEp0WInalA8ohljir+EPueXaYyC8mmH55cNQIa5WdDA2Vpg5ahRDdhVyD2J+/fLg78syLV7FGlnpXtASo9XiQKmRpPyHIT23yQB444kVh9xcjvuiB3aUBP5bGC2H4unElGYhCvfQvb1GoWvDqyvfzZvTOjlHqnG4AvIPoSCgEu/9cu8Cm/9OxWtqtWy7dECM8ZUIlOi3oPcvwUYDpNYAdATbTr1T6FRCBEp2eOi3sKoeE+nUDgQaN4r+ple4BKYnjrsSllXhI5W8ZqDNoUSsoGu+z6GFn6Dszrj6jbq8JHV4mZT9RCfR1y6inXWYGmaNRlwzm8wPHTav2RbW2O6bbwkkATWwYpyRB2FRlwMX6BB06druZWNOzx09RS8pTHnqcKOXW2mENNMgrA03OJUEV30UG/ncLZELYTpBARSJwymxjmmTK7vEI/HfxHkPrKcLLPPn2GoWym7mF2Lkh+jp81FkCGYrLTquyKPaoeUsofYukWMbGwE99ePL5dLocVDqTzatAoU="
+        # S3_UPLOAD_SECRET:
         - secure: "uCcM67fmT3ODhaHrUKhuid/DJZzy9aMtaVdRCkAkjaF/X0Dgj1Dq9bV/PPLn+HjVIRiloHKK4fk6eMLmnI/PWPnTD7hVYse2ECLEeTxZGtoBmTdBPzdf1+aHpl18o8xbN/XfO02SVk6pTHDSjZIwR8ZeiZ2Q75aY462BW9WBgV0JOL9xK5yJd3TjODsDJpwcK0P4TMwi1j2qKIpXMUJaZkyUPafZIykil2CbcePd2Y5AUfDN2BAqaJZqM9vVCeRRs7ECzCamBPsj2WUmXqs621IH3Ml/sSONCzeQoUlgUsG2a7b+Jic92sVsFHyLVqG56G5urIAsXm+Jc/8Ly/dTk1M3ER/OdvsB0z21mhQfaVHwROixPk6HPCbvTl3PITEauaU+wLwCIduiEbb6fcpoB11n3oRzgiLY5e4+QDA86LBNySDhBE8WIq1VKphgTp7ojgM/mHJg4VBZX3m+89JruUOLi49VPx1cK/CiWEBj3gWHZMNDL9agS5N/fwl6UnD5DAklTZtqlA5M2FZ8/aPN8/FgW4jTEgBBU87Ko2rTvVRmKZeCVEkIBS2lYsRDTG3ZmlyJuh2AGGReUzCh524pNAsonIF2ydCOzLv4DlTZSthOwbdnX0EMBRYuPEa436dgkVUUVP6ds5859IPZeXcN6JKJWPWQkzFWFwzoK9ttQLc="
+
         - TWINE_USERNAME: magicstack-ci
+        # TWINE_PASSWORD:
         - secure: "jyc9xHK3VjGPxvBZKx8Mcf5nfVvfIyGn6b4atcrmwVdJsV1bBLdKoAjUX3RGjNGyAHpNYOEKOdNfeZs+Wziwg5NK7ucC5qybaBK3MOTEOInCzaO0QJpcxThaHBQkkDxVtn8Qu1Gk3S/hXcXWjT2UEYJvQ84diaXn/XYRxfzOYTZX8eUroAWOMnUCYxlPxGzXTAtmuQSiJkL7P7veZTsWsGCOHtCpdAx7dgGb113CD8QheeUoZlH9Ml6jd3fGFteYmuFp7cR6fa3VYVzxp5BFsdEJqSI4VqDvBOpUoLkbpRRKMjosHKtphfi0PAzbkJw6UdKcrqQ/Ca4nGmWk0PIf3LTsJrv44p4ZTPVI8b3lihXMm72QUE28e11yu9SIZRe0hMgmvWlivXEJw3C3YT1N5w+JM3Y5dIWp/YLoiRXVkIzNJQMN3YeWvKEFf/xO1AD2BO3jjU9oBZfKQpxCJ58gPsQrRt6qM3Y6zYuF8s4B+llpwM/ex2xnNwrTbNkp4ARyXyCujX+ixhjiBLtElfGoHPP1jOaIkJhGje9DxaptddfFBDLAdq0/3Q+LHOmwdQcH5+libUy3HnyP7jf51kjjWE3XEJGSchHI2ewEAn9UZRH8h0UNRXutBzUVvKgC6K1lUvqzEreKVxvrYe6zgbZc/DiUvLgIzJBiJgP9rdZYpDQ="
+
         - DOCS_PUSH_KEY_LABEL=0760b951e99c
 
 matrix:
     fast_finish: true
 
     include:
         - os: osx
-          # Travis macOS env does not support Python yet,
-          # so we have to set things up manually in install.sh.
-          env: BUILD=full PYTHON_VERSION=3.5.2 PIP_USER=1
+          env: BUILD=tests,wheels PYTHON_VERSION=3.5.2 PIP_USER=1
+
+        - os: osx
+          env: BUILD=tests,wheels PYTHON_VERSION=3.6.0 PIP_USER=1
 
+        # Do quick test runs for each supported version of PostgreSQL
+        # minus the latest.
         - os: linux
           dist: precise
           sudo: false
           language: python
           python: "3.5"
           services: postgresql
-          env: BUILD=quick PGVERSION=9.1
+          env: BUILD=quicktests PGVERSION=9.1
           addons:
               postgresql: '9.1'
 
@@ -38,7 +46,7 @@ matrix:
           language: python
           python: "3.5"
           services: postgresql
-          env: BUILD=quick PGVERSION=9.2
+          env: BUILD=quicktests PGVERSION=9.2
           addons:
               postgresql: '9.2'
 
@@ -48,7 +56,7 @@ matrix:
           language: python
           python: "3.5"
           services: postgresql
-          env: BUILD=quick PGVERSION=9.3
+          env: BUILD=quicktests PGVERSION=9.3
           addons:
               postgresql: '9.3'
 
@@ -58,7 +66,7 @@ matrix:
           language: python
           python: "3.5"
           services: postgresql
-          env: BUILD=quick PGVERSION=9.4
+          env: BUILD=quicktests PGVERSION=9.4
           addons:
               postgresql: '9.4'
 
@@ -68,40 +76,48 @@ matrix:
           language: python
           python: "3.5"
           services: postgresql
-          env: BUILD=quick PGVERSION=9.5
+          env: BUILD=quicktests PGVERSION=9.5
           addons:
               postgresql: '9.5'
 
+        # Do a full test run on the latest supported version of PostgreSQL
+        # on each supported version of Python.
         - os: linux
           dist: trusty
           sudo: false
           language: python
           python: "3.5"
-          env: BUILD=docs RELEASE=1  # Use this config to publish releases
+          services: postgresql
+          env: BUILD=tests PGVERSION=9.6
+          addons:
+              postgresql: '9.6'
 
         - os: linux
           dist: trusty
-          sudo: required
+          sudo: false
           language: python
-          python: "3.5"
-          env: BUILD=full PGVERSION=9.6
-          services: [postgresql, docker]
+          python: "3.6-dev"
+          services: postgresql
+          env: BUILD=tests PGVERSION=9.6
           addons:
               postgresql: '9.6'
 
+        # Build manylinux wheels.  Each wheel will be tested,
+        # so there is no need for BUILD=tests here.
+        # Also use this job to publish the releases and build
+        # the documentation.
         - os: linux
           dist: trusty
           sudo: required
           language: python
-          python: "3.6-dev"
-          env: BUILD=full PGVERSION=9.6
+          python: "3.5"
+          env: BUILD=wheels,docs,release PGVERSION=9.6
           services: [postgresql, docker]
           addons:
               postgresql: '9.6'
 
 cache:
-    directories:
-        - $HOME/.cache/pip
+    pip
 
 before_install:
     - .ci/travis-before-install.sh
@@ -119,4 +135,4 @@ deploy:
     script: .ci/travis-release.sh
     on:
         tags: true
-        condition: '-n "${RELEASE}"'
+        condition: '"${BUILD}" == *release*'
diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
 if sys.version_info < (3, 5):
     raise RuntimeError('asyncpg requires Python 3.5 or greater')
 
-VERSION = '0.8.1'
+VERSION = '0.8.2'
 CFLAGS = ['-O2']
 LDFLAGS = []
 
