Skip to content

Commit

Permalink
Revert "Use PyQt/Qt 6.8"
Browse files Browse the repository at this point in the history
This reverts commit 526dcfc.
PyQt 6.8 doesn't work on Red Hat 8 nor 9.
  • Loading branch information
gregcouch committed Dec 20, 2024
1 parent 94a9985 commit 40e373b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 18 deletions.
6 changes: 3 additions & 3 deletions prereqs/PyQt/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ PYQT_LICENSE = gpl

USE_QT6 = true

BASE_VERSION = 6.8
QT_MINOR_VERSION = 1
PYQT_MINOR_VERSION = 0
BASE_VERSION = 6.7
QT_MINOR_VERSION = 3
PYQT_MINOR_VERSION = 1
PYQTWE_MINOR_VERSION = 0

MAKE_ARGS = -f Makefile.$(METHOD) BASE_VERSION=$(BASE_VERSION) PYQT_MINOR_VERSION=$(PYQT_MINOR_VERSION) QT_MINOR_VERSION=$(QT_MINOR_VERSION) PYQTWE_MINOR_VERSION=$(PYQTWE_MINOR_VERSION) PYQT_LICENSE=$(PYQT_LICENSE)
Expand Down
22 changes: 7 additions & 15 deletions prereqs/PyQt/Makefile.wheel.qt6
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ REMOTE_HOST = plato.cgl.ucsf.edu:
REMOTE_DIR = $(REMOTE_HOST)/usr/local/src/PyQt6

# QT_VERSION is overriden by Makefile
BASE_VERSION = 6.8
QT_MINOR_VERSION = 1
PYQT_MINOR_VERSION = 0
BASE_VERSION = 6.7
QT_MINOR_VERSION = 3
PYQT_MINOR_VERSION = 1
ifeq ($(OS),Linux)
PYQT_REVISION =
PYQT_REVISION = 1
else
PYQT_REVISION =
endif
Expand All @@ -36,19 +36,14 @@ 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 ifeq (0, $(shell sort -CV <<< "$(PYQT_VERSION)"$$'\n'"6.7.99" && echo $$?))
# PyQt version < 6.8
PYTHON_TAGS = cp38
else
PYTHON_TAGS = cp39
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 ifeq (0, $(shell sort -CV <<< "$(PYQT_VERSION)"$$'\n'"6.7.99" && echo $$?))
WE_PYTHON_TAGS = cp38
else
WE_PYTHON_TAGS = cp39
WE_PYTHON_TAGS = cp38
endif
WHEEL_ABI = abi3

Expand All @@ -62,11 +57,8 @@ 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 ifeq (0, $(shell sort -CV <<< "$(PYQT_VERSION)"$$'\n'"6.7.99" && echo $$?))
# For PyQt version < 6.4
WHEEL_PLATFORM = manylinux_2_28_x86_64
else
WHEEL_PLATFORM = manylinux_2_35_x86_64
WHEEL_PLATFORM = manylinux_2_28_x86_64
endif
WE_WHEEL_PLATFORM = $(WHEEL_PLATFORM)
MISSING_QTWEBENGINE_DICT = PyQt6/Qt6/libexec/qtwebengine_dictionaries
Expand Down

0 comments on commit 40e373b

Please sign in to comment.