diff options
Diffstat (limited to 'scripts/mkvenv.py')
| -rwxr-xr-x | scripts/mkvenv.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/mkvenv.py b/scripts/mkvenv.py index 625cedd1a..9e9c1f4a2 100755 --- a/scripts/mkvenv.py +++ b/scripts/mkvenv.py @@ -134,8 +134,7 @@ def pyqt_versions() -> List[str]: def _is_qt6_version(version: str) -> bool: """Check if the given version is Qt 6.""" - # FIXME:qt6 Adjust once auto = Qt 6 - return version == "6" or version.startswith("6.") + return version in ["auto", "6"] or version.startswith("6.") def run_venv( @@ -228,7 +227,7 @@ def requirements_file(name: str) -> pathlib.Path: def pyqt_requirements_file(version: str) -> pathlib.Path: """Get the filename of the requirements file for the given PyQt version.""" - name = 'pyqt' if version == 'auto' else 'pyqt-{}'.format(version) + name = 'pyqt-6' if version == 'auto' else f'pyqt-{version}' return requirements_file(name) @@ -439,7 +438,7 @@ def run_qt_smoke_test_single( def run_qt_smoke_test(venv_dir: pathlib.Path, *, pyqt_version: str) -> None: """Make sure the Qt installation works.""" # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-104415 - no_debug = pyqt_version in ("6.3", "6") and sys.platform == "darwin" + no_debug = pyqt_version == "6.3" and sys.platform == "darwin" if no_debug: try: run_qt_smoke_test_single(venv_dir, debug=False, pyqt_version=pyqt_version) @@ -505,6 +504,9 @@ def install_pyqt(venv_dir, args): install_pyqt_binary(venv_dir, args.pyqt_version) if args.pyqt_snapshot: install_pyqt_shapshot(venv_dir, args.pyqt_snapshot.split(',')) + # Workaround until pyqt 6.5.2 is released on pypi + elif args.pyqt_version in ("6.5", "6", "auto"): + install_pyqt_shapshot(venv_dir, ["PyQt6-Qt6", "PyQt6-WebEngine-Qt6"]) elif args.pyqt_type == 'source': install_pyqt_source(venv_dir, args.pyqt_version) elif args.pyqt_type == 'link': |