From 3d13d259bbab715a42a7eb7b817a3572777272a7 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 25 Jan 2025 21:59:31 +1100 Subject: [PATCH] Use Qt 6.8 on ARM Linux; add tools/run-qt6.8 Prior to this change, ./run fails out of the box on ARM systems, as Qt wasn't available on PyPI until the 6.8 release. Also added a script in tools/ for testing Qt6.8 issues on other platforms. --- build/configure/src/python.rs | 28 +++++--- ...ments.qt6_lin.in => requirements.qt6_6.in} | 0 ...nts.qt6_lin.txt => requirements.qt6_6.txt} | 10 +-- python/requirements.qt6_8.in | 5 ++ python/requirements.qt6_8.txt | 71 +++++++++++++++++++ python/requirements.qt6_mac.in | 5 -- python/requirements.qt6_mac.txt | 56 --------------- python/requirements.qt6_win.in | 5 -- python/requirements.qt6_win.txt | 56 --------------- python/update_python_deps.sh | 5 +- tools/run-qt6.8 | 11 +++ 11 files changed, 113 insertions(+), 139 deletions(-) rename python/{requirements.qt6_lin.in => requirements.qt6_6.in} (100%) rename python/{requirements.qt6_lin.txt => requirements.qt6_6.txt} (95%) create mode 100644 python/requirements.qt6_8.in create mode 100644 python/requirements.qt6_8.txt delete mode 100644 python/requirements.qt6_mac.in delete mode 100644 python/requirements.qt6_mac.txt delete mode 100644 python/requirements.qt6_win.in delete mode 100644 python/requirements.qt6_win.txt create mode 100755 tools/run-qt6.8 diff --git a/build/configure/src/python.rs b/build/configure/src/python.rs index 3755110fe..e577f5f43 100644 --- a/build/configure/src/python.rs +++ b/build/configure/src/python.rs @@ -23,17 +23,18 @@ use ninja_gen::Build; pub fn setup_venv(build: &mut Build) -> Result<()> { let platform_deps = if cfg!(windows) { inputs![ - "python/requirements.qt6_win.txt", + "python/requirements.qt6_6.txt", "python/requirements.win.txt", ] } else if cfg!(target_os = "macos") { - inputs!["python/requirements.qt6_mac.txt",] + inputs!["python/requirements.qt6_6.txt",] } else if std::env::var("PYTHONPATH").is_ok() { // assume we have a system-provided Qt inputs![] + } else if cfg!(target_arch = "aarch64") { + inputs!["python/requirements.qt6_8.txt"] } else { - // normal linux - inputs!["python/requirements.qt6_lin.txt"] + inputs!["python/requirements.qt6_6.txt"] }; let requirements_txt = inputs!["python/requirements.dev.txt", platform_deps]; build.add_action( @@ -55,18 +56,27 @@ pub fn setup_venv(build: &mut Build) -> Result<()> { }, )?; - // optional venvs for testing with Qt5 - let mut reqs_qt5 = inputs!["python/requirements.bundle.txt"]; + // optional venvs for testing other Qt versions + let mut venv_reqs = inputs!["python/requirements.bundle.txt"]; if cfg!(windows) { - reqs_qt5 = inputs![reqs_qt5, "python/requirements.win.txt"]; + venv_reqs = inputs![venv_reqs, "python/requirements.win.txt"]; } + build.add_action( + "pyenv-qt6.8", + PythonEnvironment { + folder: "pyenv-qt6.8", + base_requirements_txt: inputs!["python/requirements.base.txt"], + requirements_txt: inputs![&venv_reqs, "python/requirements.qt6_8.txt"], + extra_binary_exports: &[], + }, + )?; build.add_action( "pyenv-qt5.15", PythonEnvironment { folder: "pyenv-qt5.15", base_requirements_txt: inputs!["python/requirements.base.txt"], - requirements_txt: inputs![&reqs_qt5, "python/requirements.qt5_15.txt"], + requirements_txt: inputs![&venv_reqs, "python/requirements.qt5_15.txt"], extra_binary_exports: &[], }, )?; @@ -75,7 +85,7 @@ pub fn setup_venv(build: &mut Build) -> Result<()> { PythonEnvironment { folder: "pyenv-qt5.14", base_requirements_txt: inputs!["python/requirements.base.txt"], - requirements_txt: inputs![reqs_qt5, "python/requirements.qt5_14.txt"], + requirements_txt: inputs![venv_reqs, "python/requirements.qt5_14.txt"], extra_binary_exports: &[], }, )?; diff --git a/python/requirements.qt6_lin.in b/python/requirements.qt6_6.in similarity index 100% rename from python/requirements.qt6_lin.in rename to python/requirements.qt6_6.in diff --git a/python/requirements.qt6_lin.txt b/python/requirements.qt6_6.txt similarity index 95% rename from python/requirements.qt6_lin.txt rename to python/requirements.qt6_6.txt index faa48a360..5b1a3ba9b 100644 --- a/python/requirements.qt6_lin.txt +++ b/python/requirements.qt6_6.txt @@ -4,7 +4,7 @@ pyqt6==6.6.1 \ --hash=sha256:6b43878d0bbbcf8b7de165d305ec0cb87113c8930c92de748a11c473a6db5085 \ --hash=sha256:9f158aa29d205142c56f0f35d07784b8df0be28378d20a97bcda8bd64ffd0379 # via - # -r requirements.qt6_lin.in + # -r requirements.qt6_6.in # pyqt6-webengine pyqt6-qt6==6.6.2 \ --hash=sha256:5a41fe9d53b9e29e9ec5c23f3c5949dba160f90ca313ee8b96b8ffe6a5059387 \ @@ -12,7 +12,7 @@ pyqt6-qt6==6.6.2 \ --hash=sha256:8d7f674a4ec43ca00191e14945ca4129acbe37a2172ed9d08214ad58b170bc11 \ --hash=sha256:b8363d88623342a72ac17da9127dc12f259bb3148796ea029762aa2d499778d9 # via - # -r requirements.qt6_lin.in + # -r requirements.qt6_6.in # pyqt6 pyqt6-sip==13.6.0 \ --hash=sha256:0dfd22cfedd87e96f9d51e0778ca2ba3dc0be83e424e9e0f98f6994d8d9c90f0 \ @@ -37,7 +37,7 @@ pyqt6-sip==13.6.0 \ --hash=sha256:fa759b6339ff7e25f9afe2a6b651b775f0a36bcb3f5fa85e81a90d3b033c83f4 \ --hash=sha256:fa7b10af7488efc5e53b41dd42c0f421bde6c2865a107af7ae259aff9d841da9 # via - # -r requirements.qt6_lin.in + # -r requirements.qt6_6.in # pyqt6 # pyqt6-webengine pyqt6-webengine==6.6.0 \ @@ -45,12 +45,12 @@ pyqt6-webengine==6.6.0 \ --hash=sha256:cb7793f06525ca054fcc6039afd93e23b82228b880d0b1301ce635f7f3ed2edf \ --hash=sha256:d50b984c3f85e409e692b156132721522d4e8cf9b6c25e0cf927eea2dfb39487 \ --hash=sha256:fded35fba636c4916fec84aa7c6840ad2e75d211462feb3e966f9545a59d56e6 - # via -r requirements.qt6_lin.in + # via -r requirements.qt6_6.in pyqt6-webengine-qt6==6.6.2 \ --hash=sha256:27b1b6a6f4ea115b3dd300d2df906d542009d9eb0e62b05e6b7cb85dfe68e9c3 \ --hash=sha256:3da4db9ddd984b647d0b79fa10fc6cf65364dfe283cd702b12cb7164be2307cd \ --hash=sha256:5d6f3ae521115cee77fea22b0248e7b219995390b951b51e4d519aef9c304ca8 \ --hash=sha256:f2364dfa3a6e751ead71b7ba759081be677fcf1c6bbd8a2a2a250eb5f06432e8 # via - # -r requirements.qt6_lin.in + # -r requirements.qt6_6.in # pyqt6-webengine diff --git a/python/requirements.qt6_8.in b/python/requirements.qt6_8.in new file mode 100644 index 000000000..e16ae92e8 --- /dev/null +++ b/python/requirements.qt6_8.in @@ -0,0 +1,5 @@ +pyqt6==6.8.0 +pyqt6-qt6==6.8.1 +pyqt6-webengine==6.8.0 +pyqt6-webengine-qt6==6.8.1 +pyqt6_sip==13.9.1 diff --git a/python/requirements.qt6_8.txt b/python/requirements.qt6_8.txt new file mode 100644 index 000000000..21b567ff7 --- /dev/null +++ b/python/requirements.qt6_8.txt @@ -0,0 +1,71 @@ +pyqt6==6.8.0 \ + --hash=sha256:3a4354816f11e812b727206a9ea6e79ff3774f1bb7228ad4b9318442d2c64ff9 \ + --hash=sha256:452bae5840077bf0f146c798d7777f70d7bdd0c7dcfa9ee7a415c1daf2d10038 \ + --hash=sha256:48bace7b87676bba5e6114482f3a20ca20be90c7f261b5d340464313f5f2bf5e \ + --hash=sha256:6d8628de4c2a050f0b74462e4c9cb97f839bf6ffabbca91711722ffb281570d9 \ + --hash=sha256:8c5c05f5fdff31a5887dbc29b27615b09df467631238d7b449283809ffca6228 \ + --hash=sha256:a9913d479f1ffee804bf7f232079baea4fb4b221a8f4890117588917a54ea30d \ + --hash=sha256:cf7123caea14e7ecf10bd12cae48e8d9970ef7caf627bc7d7988b0baa209adb3 + # via + # -r requirements.qt6_8.in + # pyqt6-webengine +pyqt6-qt6==6.8.1 \ + --hash=sha256:006d786693d0511fbcf184a862edbd339c6ed1bb3bd9de363d73a19ed4b23dff \ + --hash=sha256:08065d595f1e6fc2dde9f4450eeff89082f4bad26f600a8e9b9cc5966716bfcf \ + --hash=sha256:1eb8460a1fdb38d0b2458c2974c01d471c1e59e4eb19ea63fc447aaba3ad530e \ + --hash=sha256:20843cb86bd94942d1cd99e39bf1aeabb875b241a35a8ab273e4bbbfa63776db \ + --hash=sha256:2f4b8b55b1414b93f340f22e8c88d25550efcdebc4b65a3927dd947b73bd4358 \ + --hash=sha256:98aa99fe38ae68c5318284cd28f3479ba538c40bf6ece293980abae0925c1b24 \ + --hash=sha256:9f3790c4ce4dc576e48b8718d55fb8743057e6cbd53a6ca1dd253ffbac9b7287 \ + --hash=sha256:a8bc2ed4ee5e7c6ff4dd1c7db0b27705d151fee5dc232bbd1bf17618f937f515 \ + --hash=sha256:d6ca5d2b9d2ec0ee4a814b2175f641a5c4299cb80b45e0f5f8356632663f89b3 + # via + # -r requirements.qt6_8.in + # pyqt6 +pyqt6-sip==13.9.1 \ + --hash=sha256:14f95c6352e3b85dc26bf59cfbf77a470ecbd5fcdcf00af4b648f0e1b9eefb9e \ + --hash=sha256:15be741d1ae8c82bb7afe9a61f3cf8c50457f7d61229a1c39c24cd6e8f4d86dc \ + --hash=sha256:1d322ded1d1fea339cc6ac65b768e72c69c486eebb7db6ccde061b5786d74cc5 \ + --hash=sha256:1ec52e962f54137a19208b6e95b6bd9f7a403eb25d7237768a99306cd9db26d1 \ + --hash=sha256:1fb405615970e85b622b13b4cad140ff1e4182eb8334a0b27a4698e6217b89b0 \ + --hash=sha256:22d66256b800f552ade51a463510bf905f3cb318aae00ff4288fae4de5d0e600 \ + --hash=sha256:2ab85aaf155828331399c59ebdd4d3b0358e42c08250e86b43d56d9873df148a \ + --hash=sha256:3c269052c770c09b61fce2f2f9ea934a67dfc65f443d59629b4ccc8f89751890 \ + --hash=sha256:5004514b08b045ad76425cf3618187091a668d972b017677b1b4b193379ef553 \ + --hash=sha256:552ff8fdc41f5769d3eccc661f022ed496f55f6e0a214c20aaf56e56385d61b6 \ + --hash=sha256:5643c92424fe62cb0b33378fef3d28c1525f91ada79e8a15bd9a05414a09503d \ + --hash=sha256:56ce0afb19cd8a8c63ff93ae506dffb74f844b88adaa6673ebc0dec43af48a76 \ + --hash=sha256:57b5312ef13c1766bdf69b317041140b184eb24a51e1e23ce8fc5386ba8dffb2 \ + --hash=sha256:5d7726556d1ca7a7ed78e19ba53285b64a2a8f6ad7ff4cb18a1832efca1a3102 \ + --hash=sha256:69a879cfc94f4984d180321b76f52923861cd5bf4969aa885eef7591ee932517 \ + --hash=sha256:6e6c1e2592187934f4e790c0c099d0033e986dcef7bdd3c06e3895ffa995e9fc \ + --hash=sha256:8b2ac36d6e04db6099614b9c1178a2f87788c7ffc3826571fb63d36ddb4c401d \ + --hash=sha256:8c207528992d59b0801458aa6fcff118e5c099608ef0fc6ff8bccbdc23f29c04 \ + --hash=sha256:976c7758f668806d4df7a8853f390ac123d5d1f73591ed368bdb8963574ff589 \ + --hash=sha256:accab6974b2758296400120fdcc9d1f37785b2ea2591f00656e1776f058ded6c \ + --hash=sha256:c1942e107b0243ced9e510d507e0f27aeea9d6b13e0a1b7c06fd52a62e0d41f7 \ + --hash=sha256:c800db3464481e87b1d2b84523b075df1e8fc7856c6f9623dc243f89be1cb604 \ + --hash=sha256:e996d320744ca8342cad6f9454345330d4f06bce129812d032bda3bad6967c5c \ + --hash=sha256:fa27b51ae4c7013b3700cf0ecf46907d1333ae396fc6511311920485cbce094b + # via + # -r requirements.qt6_8.in + # pyqt6 + # pyqt6-webengine +pyqt6-webengine==6.8.0 \ + --hash=sha256:5b5090dcc71dd36172ca8370db7dcaadfa0a022a8e58f6e172301289036c666b \ + --hash=sha256:5b9231b58014965b72504e49f39a6dbc3ecd05d4d725af011d75e6c8a7e2d5f7 \ + --hash=sha256:64045ea622b6a41882c2b18f55ae9714b8660acff06a54e910eb72822c2f3ff2 \ + --hash=sha256:c549f0f72c285eeea94000f6764dfaebf6bb3b13224580c7169a409bf1bf1bb7 \ + --hash=sha256:c7a5731923112acf23fbf93efad91f7b1545221063572106273e34c15a029fe7 \ + --hash=sha256:d7366809d681bcc096fa565f2a81d0ab040f7da5bb4f12f78e834a2b173c87d1 + # via -r requirements.qt6_8.in +pyqt6-webengine-qt6==6.8.1 \ + --hash=sha256:0405b6ce35f406affb27547c6c3608dc82405568af71505fefae4081c8b4ac39 \ + --hash=sha256:0ced2a10433da2571cfa29ed882698e0e164184d54068d17ba73799c45af5f0f \ + --hash=sha256:79f67a459ecb452f865e04f19122a1d6f30c83d9a1ffd06e7e6f0d652204083a \ + --hash=sha256:8059118591641cc9da6616343d893c77fbd065bef3e0764679543345e2c75123 \ + --hash=sha256:a375dbb34e03707b0ab4830b61e4d77a31dc3ef880421c8936472f2af34a3f80 \ + --hash=sha256:e36574aa55b30633a12aa000835f01e488a0f0c13513fd9a0d50c2281e0a9068 + # via + # -r requirements.qt6_8.in + # pyqt6-webengine diff --git a/python/requirements.qt6_mac.in b/python/requirements.qt6_mac.in deleted file mode 100644 index af94affd8..000000000 --- a/python/requirements.qt6_mac.in +++ /dev/null @@ -1,5 +0,0 @@ -pyqt6==6.6.1 -pyqt6-qt6==6.6.2 -pyqt6-webengine==6.6.0 -pyqt6-webengine-qt6==6.6.2 -pyqt6_sip==13.6.0 diff --git a/python/requirements.qt6_mac.txt b/python/requirements.qt6_mac.txt deleted file mode 100644 index 6dc37e9e1..000000000 --- a/python/requirements.qt6_mac.txt +++ /dev/null @@ -1,56 +0,0 @@ -pyqt6==6.6.1 \ - --hash=sha256:03a656d5dc5ac31b6a9ad200f7f4f7ef49fa00ad7ce7a991b9bb691617141d12 \ - --hash=sha256:5aa0e833cb5a79b93813f8181d9f145517dd5a46f4374544bcd1e93a8beec537 \ - --hash=sha256:6b43878d0bbbcf8b7de165d305ec0cb87113c8930c92de748a11c473a6db5085 \ - --hash=sha256:9f158aa29d205142c56f0f35d07784b8df0be28378d20a97bcda8bd64ffd0379 - # via - # -r requirements.qt6_mac.in - # pyqt6-webengine -pyqt6-qt6==6.6.2 \ - --hash=sha256:5a41fe9d53b9e29e9ec5c23f3c5949dba160f90ca313ee8b96b8ffe6a5059387 \ - --hash=sha256:7ef446d3ffc678a8586ff6dc9f0d27caf4dff05dea02c353540d2f614386faf9 \ - --hash=sha256:8d7f674a4ec43ca00191e14945ca4129acbe37a2172ed9d08214ad58b170bc11 \ - --hash=sha256:b8363d88623342a72ac17da9127dc12f259bb3148796ea029762aa2d499778d9 - # via - # -r requirements.qt6_mac.in - # pyqt6 -pyqt6-sip==13.6.0 \ - --hash=sha256:0dfd22cfedd87e96f9d51e0778ca2ba3dc0be83e424e9e0f98f6994d8d9c90f0 \ - --hash=sha256:13885361ca2cb2f5085d50359ba61b3fabd41b139fb58f37332acbe631ef2357 \ - --hash=sha256:24441032a29791e82beb7dfd76878339058def0e97fdb7c1cea517f3a0e6e96b \ - --hash=sha256:2486e1588071943d4f6657ba09096dc9fffd2322ad2c30041e78ea3f037b5778 \ - --hash=sha256:3075d8b325382750829e6cde6971c943352309d35768a4d4da0587459606d562 \ - --hash=sha256:33ea771fe777eb0d1a2c3ef35bcc3f7a286eb3ff09cd5b2fdd3d87d1f392d7e8 \ - --hash=sha256:39854dba35f8e5a4288da26ecb5f40b4c5ec1932efffb3f49d5ea435a7f37fb3 \ - --hash=sha256:3bf03e130fbfd75c9c06e687b86ba375410c7a9e835e4e03285889e61dd4b0c4 \ - --hash=sha256:43fb8551796030aae3d66d6e35e277494071ec6172cd182c9569ab7db268a2f5 \ - --hash=sha256:58f68a48400e0b3d1ccb18090090299bad26e3aed7ccb7057c65887b79b8aeea \ - --hash=sha256:5b9c6b6f9cfccb48cbb78a59603145a698fb4ffd176764d7083e5bf47631d8df \ - --hash=sha256:747f6ca44af81777a2c696bd501bc4815a53ec6fc94d4e25830e10bc1391f8ab \ - --hash=sha256:86a7b67c64436e32bffa9c28c9f21bf14a9faa54991520b12c3f6f435f24df7f \ - --hash=sha256:8c282062125eea5baf830c6998587d98c50be7c3a817a057fb95fef647184012 \ - --hash=sha256:8f9df9f7ccd8a9f0f1d36948c686f03ce1a1281543a3e636b7b7d5e086e1a436 \ - --hash=sha256:98bf954103b087162fa63b3a78f30b0b63da22fd6450b610ec1b851dbb798228 \ - --hash=sha256:9adf672f9114687533a74d5c2d4c03a9a929ad5ad9c3e88098a7da1a440ab916 \ - --hash=sha256:a6ce80bc24618d8a41be8ca51ad9f10e8bc4296dd90ab2809573df30a23ae0e5 \ - --hash=sha256:d6b5f699aaed0ac1fcd23e8fbca70d8a77965831b7c1ce474b81b1678817a49d \ - --hash=sha256:fa759b6339ff7e25f9afe2a6b651b775f0a36bcb3f5fa85e81a90d3b033c83f4 \ - --hash=sha256:fa7b10af7488efc5e53b41dd42c0f421bde6c2865a107af7ae259aff9d841da9 - # via - # -r requirements.qt6_mac.in - # pyqt6 - # pyqt6-webengine -pyqt6-webengine==6.6.0 \ - --hash=sha256:9d542738ed6e11c1978ce59035c07627def7c63eef0f59581d327f01209141bc \ - --hash=sha256:cb7793f06525ca054fcc6039afd93e23b82228b880d0b1301ce635f7f3ed2edf \ - --hash=sha256:d50b984c3f85e409e692b156132721522d4e8cf9b6c25e0cf927eea2dfb39487 \ - --hash=sha256:fded35fba636c4916fec84aa7c6840ad2e75d211462feb3e966f9545a59d56e6 - # via -r requirements.qt6_mac.in -pyqt6-webengine-qt6==6.6.2 \ - --hash=sha256:27b1b6a6f4ea115b3dd300d2df906d542009d9eb0e62b05e6b7cb85dfe68e9c3 \ - --hash=sha256:3da4db9ddd984b647d0b79fa10fc6cf65364dfe283cd702b12cb7164be2307cd \ - --hash=sha256:5d6f3ae521115cee77fea22b0248e7b219995390b951b51e4d519aef9c304ca8 \ - --hash=sha256:f2364dfa3a6e751ead71b7ba759081be677fcf1c6bbd8a2a2a250eb5f06432e8 - # via - # -r requirements.qt6_mac.in - # pyqt6-webengine diff --git a/python/requirements.qt6_win.in b/python/requirements.qt6_win.in deleted file mode 100644 index af94affd8..000000000 --- a/python/requirements.qt6_win.in +++ /dev/null @@ -1,5 +0,0 @@ -pyqt6==6.6.1 -pyqt6-qt6==6.6.2 -pyqt6-webengine==6.6.0 -pyqt6-webengine-qt6==6.6.2 -pyqt6_sip==13.6.0 diff --git a/python/requirements.qt6_win.txt b/python/requirements.qt6_win.txt deleted file mode 100644 index 5bc3ac7f4..000000000 --- a/python/requirements.qt6_win.txt +++ /dev/null @@ -1,56 +0,0 @@ -pyqt6==6.6.1 \ - --hash=sha256:03a656d5dc5ac31b6a9ad200f7f4f7ef49fa00ad7ce7a991b9bb691617141d12 \ - --hash=sha256:5aa0e833cb5a79b93813f8181d9f145517dd5a46f4374544bcd1e93a8beec537 \ - --hash=sha256:6b43878d0bbbcf8b7de165d305ec0cb87113c8930c92de748a11c473a6db5085 \ - --hash=sha256:9f158aa29d205142c56f0f35d07784b8df0be28378d20a97bcda8bd64ffd0379 - # via - # -r requirements.qt6_win.in - # pyqt6-webengine -pyqt6-qt6==6.6.2 \ - --hash=sha256:5a41fe9d53b9e29e9ec5c23f3c5949dba160f90ca313ee8b96b8ffe6a5059387 \ - --hash=sha256:7ef446d3ffc678a8586ff6dc9f0d27caf4dff05dea02c353540d2f614386faf9 \ - --hash=sha256:8d7f674a4ec43ca00191e14945ca4129acbe37a2172ed9d08214ad58b170bc11 \ - --hash=sha256:b8363d88623342a72ac17da9127dc12f259bb3148796ea029762aa2d499778d9 - # via - # -r requirements.qt6_win.in - # pyqt6 -pyqt6-sip==13.6.0 \ - --hash=sha256:0dfd22cfedd87e96f9d51e0778ca2ba3dc0be83e424e9e0f98f6994d8d9c90f0 \ - --hash=sha256:13885361ca2cb2f5085d50359ba61b3fabd41b139fb58f37332acbe631ef2357 \ - --hash=sha256:24441032a29791e82beb7dfd76878339058def0e97fdb7c1cea517f3a0e6e96b \ - --hash=sha256:2486e1588071943d4f6657ba09096dc9fffd2322ad2c30041e78ea3f037b5778 \ - --hash=sha256:3075d8b325382750829e6cde6971c943352309d35768a4d4da0587459606d562 \ - --hash=sha256:33ea771fe777eb0d1a2c3ef35bcc3f7a286eb3ff09cd5b2fdd3d87d1f392d7e8 \ - --hash=sha256:39854dba35f8e5a4288da26ecb5f40b4c5ec1932efffb3f49d5ea435a7f37fb3 \ - --hash=sha256:3bf03e130fbfd75c9c06e687b86ba375410c7a9e835e4e03285889e61dd4b0c4 \ - --hash=sha256:43fb8551796030aae3d66d6e35e277494071ec6172cd182c9569ab7db268a2f5 \ - --hash=sha256:58f68a48400e0b3d1ccb18090090299bad26e3aed7ccb7057c65887b79b8aeea \ - --hash=sha256:5b9c6b6f9cfccb48cbb78a59603145a698fb4ffd176764d7083e5bf47631d8df \ - --hash=sha256:747f6ca44af81777a2c696bd501bc4815a53ec6fc94d4e25830e10bc1391f8ab \ - --hash=sha256:86a7b67c64436e32bffa9c28c9f21bf14a9faa54991520b12c3f6f435f24df7f \ - --hash=sha256:8c282062125eea5baf830c6998587d98c50be7c3a817a057fb95fef647184012 \ - --hash=sha256:8f9df9f7ccd8a9f0f1d36948c686f03ce1a1281543a3e636b7b7d5e086e1a436 \ - --hash=sha256:98bf954103b087162fa63b3a78f30b0b63da22fd6450b610ec1b851dbb798228 \ - --hash=sha256:9adf672f9114687533a74d5c2d4c03a9a929ad5ad9c3e88098a7da1a440ab916 \ - --hash=sha256:a6ce80bc24618d8a41be8ca51ad9f10e8bc4296dd90ab2809573df30a23ae0e5 \ - --hash=sha256:d6b5f699aaed0ac1fcd23e8fbca70d8a77965831b7c1ce474b81b1678817a49d \ - --hash=sha256:fa759b6339ff7e25f9afe2a6b651b775f0a36bcb3f5fa85e81a90d3b033c83f4 \ - --hash=sha256:fa7b10af7488efc5e53b41dd42c0f421bde6c2865a107af7ae259aff9d841da9 - # via - # -r requirements.qt6_win.in - # pyqt6 - # pyqt6-webengine -pyqt6-webengine==6.6.0 \ - --hash=sha256:9d542738ed6e11c1978ce59035c07627def7c63eef0f59581d327f01209141bc \ - --hash=sha256:cb7793f06525ca054fcc6039afd93e23b82228b880d0b1301ce635f7f3ed2edf \ - --hash=sha256:d50b984c3f85e409e692b156132721522d4e8cf9b6c25e0cf927eea2dfb39487 \ - --hash=sha256:fded35fba636c4916fec84aa7c6840ad2e75d211462feb3e966f9545a59d56e6 - # via -r requirements.qt6_win.in -pyqt6-webengine-qt6==6.6.2 \ - --hash=sha256:27b1b6a6f4ea115b3dd300d2df906d542009d9eb0e62b05e6b7cb85dfe68e9c3 \ - --hash=sha256:3da4db9ddd984b647d0b79fa10fc6cf65364dfe283cd702b12cb7164be2307cd \ - --hash=sha256:5d6f3ae521115cee77fea22b0248e7b219995390b951b51e4d519aef9c304ca8 \ - --hash=sha256:f2364dfa3a6e751ead71b7ba759081be677fcf1c6bbd8a2a2a250eb5f06432e8 - # via - # -r requirements.qt6_win.in - # pyqt6-webengine diff --git a/python/update_python_deps.sh b/python/update_python_deps.sh index 8bfe55b54..9040e3456 100755 --- a/python/update_python_deps.sh +++ b/python/update_python_deps.sh @@ -20,7 +20,6 @@ args="--resolver=backtracking --allow-unsafe --no-header --strip-extras --genera # during bundle ../out/pyenv/bin/pip-compile $args $upgrade requirements.bundle.in -../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6_win.in -../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6_lin.in -../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6_mac.in +for i in requirements.{bundle,qt6*}.in; do ../out/pyenv/bin/pip-compile $args $upgrade $i; done + diff --git a/tools/run-qt6.8 b/tools/run-qt6.8 new file mode 100755 index 000000000..9083f343e --- /dev/null +++ b/tools/run-qt6.8 @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +export PYTHONWARNINGS=default +export PYTHONPYCACHEPREFIX=out/pycache +export ANKIDEV=${ANKIDEV-1} +export QTWEBENGINE_REMOTE_DEBUGGING=${QTWEBENGINE_REMOTE_DEBUGGING-8080} +export QTWEBENGINE_CHROMIUM_FLAGS=${QTWEBENGINE_CHROMIUM_FLAGS---remote-allow-origins=http://localhost:$QTWEBENGINE_REMOTE_DEBUGGING} +./ninja pylib qt pyenv-qt6.8 +./out/pyenv-qt6.8/bin/python tools/run.py $*