From c0c636c3eb25a6bf18597c03a5505545ef5b780f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 9 Feb 2017 00:46:11 +0100
Subject: [PATCH] Revert OS X / Windows changes for PyPI packages

---
 .travis.yml                        | 11 --------
 scripts/dev/ci/appveyor_install.py | 40 +++++++++++-------------------
 scripts/dev/ci/travis_install.sh   |  5 ++--
 3 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a87be3d29..5991fea42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,20 +21,9 @@ matrix:
     - os: linux
       env: DOCKER=ubuntu-xenial
       services: docker
-    - os: linux
-      language: python
-      python: 3.5
-      env: TESTENV=py35-pyqt571
-    - os: linux
-      language: python
-      python: 3.6
-      env: TESTENV=py36-pyqt571
     - os: osx
       env: TESTENV=py36 OSX=elcapitan
       osx_image: xcode7.3
-    - os: osx
-      env: TESTENV=py36-pyqt571 OSX=elcapitan
-      osx_image: xcode7.3
     # https://github.com/qutebrowser/qutebrowser/issues/2013
     # - os: osx
     #   env: TESTENV=py35 OSX=yosemite
diff --git a/scripts/dev/ci/appveyor_install.py b/scripts/dev/ci/appveyor_install.py
index ad63ee3a4..2c04304d5 100644
--- a/scripts/dev/ci/appveyor_install.py
+++ b/scripts/dev/ci/appveyor_install.py
@@ -28,7 +28,6 @@ CI machines.
 
 from __future__ import print_function
 
-import os
 import time
 import subprocess
 import urllib
@@ -45,26 +44,22 @@ def pip_install(pkg):
                            pkg])
 
 
-using_pypi = '-pyqt' in os.environ['TESTENV']
+print("Getting PyQt5...")
+qt_version = '5.5.1'
+pyqt_version = '5.5.1'
+pyqt_url = ('https://www.qutebrowser.org/pyqt/'
+            'PyQt5-{}-gpl-Py3.4-Qt{}-x32.exe'.format(
+                pyqt_version, qt_version))
 
+try:
+    urllib.urlretrieve(pyqt_url, r'C:\install-PyQt5.exe')
+except (OSError, IOError):
+    print("Downloading PyQt failed, trying again in 10 seconds...")
+    time.sleep(10)
+    urllib.urlretrieve(pyqt_url, r'C:\install-PyQt5.exe')
 
-if not using_pypi:
-    print("Getting PyQt5...")
-    qt_version = '5.5.1'
-    pyqt_version = '5.5.1'
-    pyqt_url = ('https://www.qutebrowser.org/pyqt/'
-                'PyQt5-{}-gpl-Py3.4-Qt{}-x32.exe'.format(
-                    pyqt_version, qt_version))
-
-    try:
-        urllib.urlretrieve(pyqt_url, r'C:\install-PyQt5.exe')
-    except (OSError, IOError):
-        print("Downloading PyQt failed, trying again in 10 seconds...")
-        time.sleep(10)
-        urllib.urlretrieve(pyqt_url, r'C:\install-PyQt5.exe')
-
-    print("Installing PyQt5...")
-    subprocess.check_call([r'C:\install-PyQt5.exe', '/S'])
+print("Installing PyQt5...")
+subprocess.check_call([r'C:\install-PyQt5.exe', '/S'])
 
 print("Installing tox")
 pip_install('pip')
@@ -73,10 +68,5 @@ pip_install(r'-rmisc\requirements\requirements-tox.txt')
 print("Linking Python...")
 with open(r'C:\Windows\system32\python3.bat', 'w') as f:
     f.write(r'@C:\Python34\python %*')
-with open(r'C:\Windows\system32\python3.5.bat', 'w') as f:
-    f.write(r'@C:\Python35\python %*')
-with open(r'C:\Windows\system32\python3.6.bat', 'w') as f:
-    f.write(r'@C:\Python36\python %*')
 
-if not using_pypi:
-    check_setup(r'C:\Python34\python')
+check_setup(r'C:\Python34\python')
diff --git a/scripts/dev/ci/travis_install.sh b/scripts/dev/ci/travis_install.sh
index b0acb8dbc..deeb44d5c 100644
--- a/scripts/dev/ci/travis_install.sh
+++ b/scripts/dev/ci/travis_install.sh
@@ -93,13 +93,12 @@ elif [[ $TRAVIS_OS_NAME == osx ]]; then
     sudo -H python get-pip.py
 
     brew --version
-
-    brew_install python3
-    [[ $TESTENV != *-pyqt* ]] && brew_install qt5 pyqt5 && check_pyqt
+    brew_install python3 qt5 pyqt5
 
     pip_install -r misc/requirements/requirements-tox.txt
     pip --version
     tox --version
+    check_pyqt
     exit 0
 fi