Fixed an issue in the install script caused by the new PyQt naming scheme. 6_1_x

Sun, 27 Mar 2016 20:01:17 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 27 Mar 2016 20:01:17 +0200
branch
6_1_x
changeset 4890
314deb5a1316
parent 4888
41a9707c9a5f
child 4893
6756ba35675b

Fixed an issue in the install script caused by the new PyQt naming scheme.
(grafted from 10cec9d5aa919aa3447cef1792e484e67be2b485)

install.py file | annotate | diff | comparison | revisions
--- a/install.py	Sun Mar 27 19:51:47 2016 +0200
+++ b/install.py	Sun Mar 27 20:01:17 2016 +0200
@@ -1166,8 +1166,8 @@
         import sip
         sipVersion = sip.SIP_VERSION_STR
         print("sip Version:", sipVersion.strip())
-        # always assume, that snapshots are new enough
-        if "snapshot" not in sipVersion:
+        # always assume, that snapshots or dev versions are new enough
+        if "snapshot" not in sipVersion and "dev" not in sipVersion:
             while sipVersion.count('.') < 2:
                 sipVersion += '.0'
             (maj, min, pat) = sipVersion.split('.')
@@ -1197,8 +1197,8 @@
         from PyQt5.QtCore import PYQT_VERSION_STR
     pyqtVersion = PYQT_VERSION_STR
     print("PyQt Version:", pyqtVersion.strip())
-    # always assume, that snapshots are new enough
-    if "snapshot" not in pyqtVersion:
+    # always assume, that snapshots or dev versions are new enough
+    if "snapshot" not in pyqtVersion and "dev" not in pyqtVersion:
         while pyqtVersion.count('.') < 2:
             pyqtVersion += '.0'
         (maj, min, pat) = pyqtVersion.split('.')
@@ -1227,8 +1227,8 @@
         from PyQt5.Qsci import QSCINTILLA_VERSION_STR
     scintillaVersion = QSCINTILLA_VERSION_STR
     print("QScintilla Version:", QSCINTILLA_VERSION_STR.strip())
-    # always assume, that snapshots are new enough
-    if "snapshot" not in scintillaVersion:
+    # always assume, that snapshots or dev versions are new enough
+    if "snapshot" not in scintillaVersion and "dev" not in scintillaVersion:
         while scintillaVersion.count('.') < 2:
             scintillaVersion += '.0'
         (maj, min, pat) = scintillaVersion.split('.')

eric ide

mercurial