Merge pull request #4284 from janezd/pin-qt-below-5.14

Pin Qt version below 5.14
biolab · Dec 20, 2019 · ccee167 · ccee167
2 parents b648573 + 4794e96
commit ccee167
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis/install_orange.sh b/.travis/install_orange.sh
@@ -7,9 +7,6 @@ if [[ $TRAVIS_PYTHON_VERSION == 3.4 ]]; then pip install pandas==0.20.3; fi
 
 pip install numba==0.41.0 llvmlite==0.26.0
 
-# PyQt >= 5.12 distributes WebEngine separately
-pip install pyqtwebengine
-
 # Install dependencies sequentially
 cat requirements-core.txt \
     requirements-gui.txt \

diff --git a/.travis/install_pyqt.sh b/.travis/install_pyqt.sh
@@ -1,8 +1,11 @@
 if [ ! "$PYQT4" ]; then
-    foldable pip install sip 'pyqt5!=5.10'  # 5.10 exhibits QTBUG-65235
+    foldable pip install sip 'pyqt5!=5.10,<5.14'  # 5.10 exhibits QTBUG-65235
+    # PyQt >= 5.12 distributes WebEngine separately
+    foldable pip install 'pyqtwebengine<5.14'
     return $?;
 fi
 
+
 PYQT=$TRAVIS_BUILD_DIR/pyqt
 
 SIP_VERSION=4.16.9