summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2022-06-15 09:50:01 +0200
committerFlorian Bruhin <me@the-compiler.org>2022-06-22 17:41:12 +0200
commit9ba0bba57f668cf19680e4dbe17b7d55c1866203 (patch)
tree3c01209dd51134663cab83b1884354dc393d6307
parent1a061b92076ee022aac643c326e8d37dff903fa6 (diff)
downloadqutebrowser-9ba0bba57f668cf19680e4dbe17b7d55c1866203.tar.gz
qutebrowser-9ba0bba57f668cf19680e4dbe17b7d55c1866203.zip
scripts: Adjust supported architectures for PyQt6
32-bit Windows support got dropped, macOS arm64 (M1) support added.
-rwxr-xr-xscripts/mkvenv.py20
1 files changed, 14 insertions, 6 deletions
diff --git a/scripts/mkvenv.py b/scripts/mkvenv.py
index faee6f58f..f3007deac 100755
--- a/scripts/mkvenv.py
+++ b/scripts/mkvenv.py
@@ -139,7 +139,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
+ # FIXME:qt6 Adjust once auto = Qt 6
return version == "6" or version.startswith("6.")
@@ -243,11 +243,19 @@ def install_pyqt_binary(venv_dir: pathlib.Path, version: str) -> None:
utils.print_col("No proprietary codec support will be available in "
"qutebrowser.", 'bold')
- supported_archs = {
- 'linux': {'x86_64'},
- 'win32': {'x86', 'AMD64'},
- 'darwin': {'x86_64'},
- }
+ if _is_qt6_version(version):
+ supported_archs = {
+ 'linux': {'x86_64'},
+ 'win32': {'AMD64'},
+ 'darwin': {'x86_64', 'arm64'},
+ }
+ else:
+ supported_archs = {
+ 'linux': {'x86_64'},
+ 'win32': {'x86', 'AMD64'},
+ 'darwin': {'x86_64'},
+ }
+
if sys.platform not in supported_archs:
utils.print_error(f"{sys.platform} is not a supported platform by PyQt binary "
"packages, this will most likely fail.")