From fc2896f3e288ad76a131da204d817e5269db39d7 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Tue, 7 Jul 2020 18:03:04 +0300
Subject: [PATCH 1/3] Upload wheels to GitHub Releases on tags

---
 .travis.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1f56254ea..4945c4475 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,6 @@ env:
       - BUILD_DEPENDS=""
       - TEST_DEPENDS="pytest pytest-cov"
       - MACOSX_DEPLOYMENT_TARGET=10.10
-      - WHEELHOUSE_UPLOADER_USERNAME=travis-worker
-      # Following generated with
-      # travis encrypt -r python-pillow/pillow-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>
-      - secure: "ky76goiK6n4k8V9/uG340GSFVwmjE7G76l9xbhhGZkcph4eTwN5VRM/tqyJvlNs/HZOhKSILfyGBeaG8qf7gHmwr0touPT+EjWn4TNV8iyVj75ZshgRE9DuaIAfdH89gW2m+BmvBDyzi0JE3KVCu55NcGm8h7Ecl6nmQ/c2iROY="
 
 language: python
 # Default Python version is usually 3.6
@@ -219,16 +215,20 @@ install:
     - if [[ -n "$LATEST" ]]; then BUILD_COMMIT=master; fi
     - clean_code $REPO_DIR $BUILD_COMMIT
     - build_wheel $REPO_DIR $PLAT
+    - ls -l "${TRAVIS_BUILD_DIR}/wheelhouse/"
 
 script:
     - install_run $PLAT
 
-after_success:
-    # Upload wheels to Rackspace container
-    - if [[ -z "$LATEST" ]]; then
-        pip install wheelhouse-uploader;
-        python -m wheelhouse_uploader upload --local-folder
-          ${TRAVIS_BUILD_DIR}/wheelhouse/
-          --no-update-index
-          wheels;
-      fi
+# Upload wheels to GitHub Releases
+deploy:
+  provider: releases
+  api_key:
+    secure: PTgVG7DrYa2FTSQOq0eDaHDZb1vy0vf6MulyuoXMg8rssPQgJ/mYxRpNDK4V0EKolpN7f8s/OGg+fpNNtp5pOCJGsx0Okcf+YB2ac+Xl7DQPBucbDKFXs1ndf/ny6umk0TXX8JTrDp/mJDJf401yx1+qsZ6X/PFvchXvXVrQ+SQ=
+  file_glob: true
+  file: "${TRAVIS_BUILD_DIR}/${WHEEL_SDIR}/*.whl"
+  on:
+    condition: -z "$LATEST"
+    repo: python-pillow/pillow-wheels
+    tags: true
+  skip_cleanup: true

From acf191200ff481bc75302b2434765e8c21bea503 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Tue, 7 Jul 2020 18:03:17 +0300
Subject: [PATCH 2/3] Only build latest when tag is blank

---
 .travis.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4945c4475..7ff254bdf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -106,17 +106,20 @@ jobs:
       os: osx
       osx_image: xcode9.3
       language: generic
+      if: tag IS blank
       env:
         - MB_PYTHON_VERSION=3.6
         - LATEST="true"
 
     - name: "3.6 Xenial latest"
       os: linux
+      if: tag IS blank
       env:
         - MB_PYTHON_VERSION=3.6
         - LATEST="true"
     - name: "3.6 Xenial 32-bit latest"
       os: linux
+      if: tag IS blank
       env:
         - MB_PYTHON_VERSION=3.6
         - PLAT=i686
@@ -126,6 +129,7 @@ jobs:
       os: osx
       osx_image: xcode9.3
       language: generic
+      if: tag IS blank
       env:
         - MB_PYTHON_VERSION=3.7
         - LATEST="true"
@@ -133,28 +137,33 @@ jobs:
       os: osx
       osx_image: xcode9.3
       language: generic
+      if: tag IS blank
       env:
         - MB_PYTHON_VERSION=3.8
         - LATEST="true"
 
     - name: "3.7 Xenial latest"
       os: linux
+      if: tag IS blank
       env:
         - MB_PYTHON_VERSION=3.7
         - LATEST="true"
     - name: "3.7 Xenial 32-bit latest"
       os: linux
+      if: tag IS blank
       env:
         - MB_PYTHON_VERSION=3.7
         - PLAT=i686
         - LATEST="true"
     - name: "3.8 Xenial latest"
       os: linux
+      if: tag IS blank
       env:
         - MB_PYTHON_VERSION=3.8
         - LATEST="true"
     - name: "3.8 Xenial 32-bit latest"
       os: linux
+      if: tag IS blank
       env:
         - MB_PYTHON_VERSION=3.8
         - PLAT=i686
@@ -164,12 +173,14 @@ jobs:
       os: osx
       osx_image: xcode9.3
       language: generic
+      if: tag IS blank
       env:
         - MB_PYTHON_VERSION=pypy3.6-7.3
         - MB_PYTHON_OSX_VER=10.9
         - LATEST="true"
     - name: "3.6 Xenial 64-bit PyPy latest"
       os: linux
+      if: tag IS blank
       env:
         - MB_PYTHON_VERSION=pypy3.6-7.3
         - MB_ML_VER=2010
@@ -179,6 +190,7 @@ jobs:
     - name: "3.6 Xenial aarch64 latest"
       os: linux
       arch: arm64
+      if: tag IS blank
       env:
         - PLAT=aarch64
         - MB_ML_VER=2014
@@ -188,6 +200,7 @@ jobs:
     - name: "3.7 Xenial aarch64 latest"
       os: linux
       arch: arm64
+      if: tag IS blank
       env:
         - PLAT=aarch64
         - MB_ML_VER=2014
@@ -197,6 +210,7 @@ jobs:
     - name: "3.8 Xenial aarch64 latest"
       os: linux
       arch: arm64
+      if: tag IS blank
       env:
         - PLAT=aarch64
         - MB_ML_VER=2014

From 66906821275f385bcc61b887646f269ec32ada75 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Fri, 7 Aug 2020 14:25:53 +0300
Subject: [PATCH 3/3] Use variable

Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7ff254bdf..d97f3b21f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -229,7 +229,7 @@ install:
     - if [[ -n "$LATEST" ]]; then BUILD_COMMIT=master; fi
     - clean_code $REPO_DIR $BUILD_COMMIT
     - build_wheel $REPO_DIR $PLAT
-    - ls -l "${TRAVIS_BUILD_DIR}/wheelhouse/"
+    - ls -l "${TRAVIS_BUILD_DIR}/${WHEEL_SDIR}/"
 
 script:
     - install_run $PLAT