Merge branch 'develop' of github.com:RBVI/ChimeraX into develop

Author: elainecmeng

prereqs/PyQt/Makefile

@@ -10,8 +10,8 @@ PYQT_LICENSE = gpl
 
 USE_QT6 = true
 
-BASE_VERSION = 6.7
-QT_MINOR_VERSION = 3
+BASE_VERSION = 6.8
+QT_MINOR_VERSION = 2
 PYQT_MINOR_VERSION = 1
 PYQTWE_MINOR_VERSION = 0
 

prereqs/PyQt/Makefile.wheel.qt6

@@ -9,8 +9,8 @@ REMOTE_HOST = plato.cgl.ucsf.edu:
 REMOTE_DIR = $(REMOTE_HOST)/usr/local/src/PyQt6
 
 # QT_VERSION is overriden by Makefile
-BASE_VERSION = 6.7
-QT_MINOR_VERSION = 3
+BASE_VERSION = 6.8
+QT_MINOR_VERSION = 2
 PYQT_MINOR_VERSION = 1
 ifeq ($(OS),Linux)
 PYQT_REVISION = 1
@@ -33,33 +33,18 @@ PYQTWE_VERSION = $(BASE_VERSION).$(PYQTWE_MINOR_VERSION)
 endif
 SIP_VERSION = 13.8.0
 
-ifeq (0, $(shell sort -CV <<< "$(PYQT_VERSION)"$$'\n'"6.6.0" && echo $$?))
-# PyQt version <= 6.6.0
-PYTHON_TAGS = cp37
-else
-PYTHON_TAGS = cp38
-endif
-ifeq (0, $(shell sort -CV <<< "$(PYQTWE_VERSION)"$$'\n'"6.6.0" && echo $$?))
-# PyQt WebEngine version <= 6.6.0
-WE_PYTHON_TAGS = cp37
-else
-WE_PYTHON_TAGS = cp38
-endif
+PYTHON_TAGS = cp39
+WE_PYTHON_TAGS = cp39
 WHEEL_ABI = abi3
 
 ifeq ($(OS),Darwin)
 BIN_PLATFORM = macos
-WHEEL_PLATFORM = macosx_11_0_universal2
+WHEEL_PLATFORM = macosx_10_14_universal2
 WE_WHEEL_PLATFORM = macosx_10_14_universal2
 MISSING_QTWEBENGINE_DICT = PyQt6/Qt6/lib/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/qtwebengine_dictionaries
 else ifeq ($(OS),Linux)
 BIN_PLATFORM = linux
-ifeq (0, $(shell sort -CV <<< "$(PYQT_VERSION)"$$'\n'"6.3.99" && echo $$?))
-# For PyQt version < 6.4
-WHEEL_PLATFORM = manylinux1_x86_64
-else
 WHEEL_PLATFORM = manylinux_2_28_x86_64
-endif
 WE_WHEEL_PLATFORM = $(WHEEL_PLATFORM)
 MISSING_QTWEBENGINE_DICT = PyQt6/Qt6/libexec/qtwebengine_dictionaries
 else ifeq ($(OS),Windows)