Make link_pyqt work with PyQt 5.11

(cherry picked from commit 14205ae14f)
Allow PyQt 5.10 to fail on Travis
2018-07-10 16:09:44 +02:00 · 2018-07-10 16:09:44 +02:00 · 2018-07-10 16:09:44 +02:00 · 2018-07-10 16:09:44 +02:00 · 2018-07-10 15:29:21 +02:00 · 2018-07-10 15:29:17 +02:00
5 changed files with 13 additions and 13 deletions
--- a/.github/CONTRIBUTING.asciidoc
+++ b/.github/CONTRIBUTING.asciidoc
@@ -1,8 +1,3 @@
-IMPORTANT: I'm currently (July 2018) more busy than usual until September,
-because of exams coming up. Review of non-trivial pull requests will thus be
-delayed until then. If you're reading this note after mid-September, please
-open an issue.
-
 - Before you start to work on something, please leave a comment on the relevant
  issue (or open one). This makes sure there is no duplicate work done.

--- a/.travis.yml
+++ b/.travis.yml
@@ -65,6 +65,10 @@ matrix:
      env: TESTENV=shellcheck
      services: docker
  fast_finish: true
+  allow_failures:
+    # https://github.com/qutebrowser/qutebrowser/issues/4055
+    - os: linux
+      env: TESTENV=py36-pyqt510

 cache:
  directories:
--- a/doc/contributing.asciidoc
+++ b/doc/contributing.asciidoc
@@ -5,11 +5,6 @@ The Compiler <mail@qutebrowser.org>
 :data-uri:
 :toc:

-IMPORTANT: I'm currently (July 2018) more busy than usual until September,
-because of exams coming up. Review of non-trivial pull requests will thus be
-delayed until then. If you're reading this note after mid-September, please
-open an issue.
-
 I `&lt;3` footnote:[Of course, that says `<3` in HTML.] contributors!

 This document contains guidelines for contributing to qutebrowser, as well as
--- a/misc/qutebrowser.nsi
+++ b/misc/qutebrowser.nsi
@@ -40,8 +40,6 @@ Section "Install"
  ; Uninstall old versions
  ExecWait 'MsiExec.exe /quiet /qn /norestart /X{633F41F9-FE9B-42D1-9CC4-718CBD01EE11}'
  ExecWait 'MsiExec.exe /quiet /qn /norestart /X{9331D947-AC86-4542-A755-A833429C6E69}'
-  RMDir /r "$INSTDIR\*.*"
-  CreateDirectory "$INSTDIR"

  SetOutPath "$INSTDIR"
  
--- a/scripts/link_pyqt.py
+++ b/scripts/link_pyqt.py
@@ -136,7 +136,15 @@ def link_pyqt(executable, venv_path):
        executable: The python executable where the source files are present.
        venv_path: The path to the virtualenv site-packages.
    """
-    sip_file = get_lib_path(executable, 'sip')
+    try:
+        get_lib_path(executable, 'PyQt5.sip')
+    except Error:
+        # There is no PyQt5.sip, so we need to copy the toplevel sip.
+        sip_file = get_lib_path(executable, 'sip')
+    else:
+        # There is a PyQt5.sip, it'll get copied with the PyQt5 dir.
+        sip_file = None
+
    sipconfig_file = get_lib_path(executable, 'sipconfig', required=False)
    pyqt_dir = os.path.dirname(get_lib_path(executable, 'PyQt5.QtCore'))
Author	SHA1	Message	Date
Florian Bruhin	21adb2cc54	Make link_pyqt work with PyQt 5.11 (cherry picked from commit `14205ae14f`)	2018-07-10 16:09:44 +02:00
Florian Bruhin	6b406899f1	Allow PyQt 5.10 to fail on Travis See #4055 (cherry picked from commit `727b418d8b`)	2018-07-10 16:09:44 +02:00
Florian Bruhin	2a3663a6e6	Add workaround for chrome-extension:// URLs Fixes #4049 (cherry picked from commit `b9e3d3cab9`)	2018-07-10 16:09:44 +02:00
Florian Bruhin	3970464891	Strip trailing newlines from pastebin URL (cherry picked from commit `274b66ec46`)	2018-07-10 16:09:44 +02:00
Florian Bruhin	af2eabdbfa	Add a mkvenv-pypi-old environment Fixes #4038 See #3662 (cherry picked from commit `e80e695a56`)	2018-07-10 15:29:21 +02:00
Florian Bruhin	5c299278c2	Handle download errors when the reply is already gone Fixes #1270 (cherry picked from commit `0a31e19eda`)	2018-07-10 15:29:17 +02:00