From 57cdb8711c0be77537fc886842ae7bb72805276a Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Wed, 2 May 2018 23:31:56 +0200
Subject: [PATCH 1/2] linux: transfer ownership of the wheel to the current
 user

---
 cibuildwheel/linux.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py
index 29b990b0f..9d90a7ee5 100644
--- a/cibuildwheel/linux.py
+++ b/cibuildwheel/linux.py
@@ -95,6 +95,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
 
                 # we're all done here; move it to output
                 mv "$delocated_wheel" /output
+                chown {uid}:{gid} "/output/$(basename "$delocated_wheel")"
             done
         '''.format(
             package_name=package_name,
@@ -108,6 +109,8 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
             ),
             build_verbosity_flag=' '.join(get_build_verbosity_extra_flags(build_verbosity)),
             environment_exports='\n'.join(environment.as_shell_commands()),
+            uid=os.getuid(),
+            gid=os.getgid(),
         )
 
         docker_process = subprocess.Popen([

From d186b0bbb794d1a4d521bf1bff05c46bb70b6667 Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Wed, 2 May 2018 22:39:24 +0200
Subject: [PATCH 2/2] Use travis-ci provided python3 on Linux

---
 .travis.yml | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a9d61238c..a38e23620 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,42 +5,28 @@ matrix:
     # Linux Python 2
     - sudo: required
       language: python
-      services:
-        - docker
-      env:
-        - "PYTHON=python2"
+      python: 2.7
+      services: docker
+      env: PYTHON=python
 
     # Linux Python 3
     - sudo: required
       language: python
-      services:
-        - docker
-      env:
-        - "PYTHON=python3"
-      before_install:
-        - sudo apt-get -qq update
-        - sudo apt-get install -y python3-pip
+      python: 3.4
+      services: docker
+      env: PYTHON=python
 
     # macOS Python 2
     - os: osx
-      env:
-        - "PYTHON=python2"
+      env: PYTHON=python2
 
     # macOS Python 3
     - os: osx
-      env:
-        - "PYTHON=python3"
+      env: PYTHON=python3
       before_install:
         - brew update
         - brew outdated python || brew upgrade python
 
-script:
-  - |
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      $PYTHON -m pip install -r requirements-dev.txt
-      $PYTHON ./bin/run_tests.py
-    else
-      # linux test requires root to clean up the wheelhouse (docker runs as root)
-      sudo $PYTHON -m pip install -r requirements-dev.txt
-      sudo $PYTHON ./bin/run_tests.py
-    fi
+install: $PYTHON -m pip install -r requirements-dev.txt
+
+script: $PYTHON ./bin/run_tests.py