Skip to content

Instantly share code, notes, and snippets.

@krmanik

krmanik/android.patch Secret

Created January 20, 2023 15:28
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save krmanik/1230b138ce4308e93c512265006b6a8a to your computer and use it in GitHub Desktop.
Save krmanik/1230b138ce4308e93c512265006b6a8a to your computer and use it in GitHub Desktop.
Download ZIP
Patch for building anki on Termux using packages provided by termux
Raw
android.patch
diff --git a/build/configure/src/proto.rs b/build/configure/src/proto.rs
index 47590af32..bd7822158 100644
--- a/build/configure/src/proto.rs
+++ b/build/configure/src/proto.rs
@@ -3,6 +3,7 @@
use ninja_gen::archives::download_and_extract;
use ninja_gen::archives::with_exe;
+use ninja_gen::copy::CopyFile;
use ninja_gen::glob;
use ninja_gen::hashmap;
use ninja_gen::inputs;
@@ -20,6 +21,12 @@ pub fn download_protoc(build: &mut Build) -> Result<()> {
"bin" => [with_exe("bin/protoc")]
},
)?;
+
+ CopyFile {
+ input: "/data/data/com.termux/files/usr/bin/protoc".into(),
+ output: "out/extracted/protoc/bin/protoc",
+ };
+
Ok(())
}
diff --git a/build/configure/src/python.rs b/build/configure/src/python.rs
index 6dd329b6c..6339e781f 100644
--- a/build/configure/src/python.rs
+++ b/build/configure/src/python.rs
@@ -54,6 +54,12 @@ fn python_archive(platform: Platform) -> OnlineArchive {
sha256: "80370f232fd63d5cb3ff9418121acb87276228b0dafbeee3c57af143aca11f89",
}
}
+ Platform::AndroidArm => {
+ OnlineArchive {
+ url: "https://github.com/ankitects/python-build-standalone/releases/download/anki-2022-02-18/cpython-3.9.10-aarch64-unknown-linux-gnu-install_only-20220218T1329.tar.gz",
+ sha256: "39070f9b9492dce3085c8c98916940434bb65663e6665b2c87bef86025532c1a",
+ }
+ }
}
}
@@ -93,6 +99,8 @@ pub fn setup_venv(build: &mut Build, python_binary: &BuildInput) -> Result<()> {
]
} else if cfg!(all(target_os = "linux", target_arch = "aarch64")) {
inputs!["python/requirements.dev.txt"]
+ } else if cfg!(all(target_os = "android", target_arch = "aarch64")) {
+ inputs!["python/requirements.dev.txt"]
} else {
inputs![
"python/requirements.dev.txt",
@@ -213,6 +221,7 @@ impl BuildAction for BuildWheel {
Platform::MacX64 => "macosx_10_13_x86_64",
Platform::MacArm => "macosx_11_0_arm64",
Platform::WindowsX64 => "win_amd64",
+ Platform::AndroidArm => "linux_aarch64",
};
format!("cp39-abi3-{platform}")
} else {
diff --git a/build/ninja_gen/src/archives.rs b/build/ninja_gen/src/archives.rs
index 50815b75f..233cf8d4d 100644
--- a/build/ninja_gen/src/archives.rs
+++ b/build/ninja_gen/src/archives.rs
@@ -29,6 +29,7 @@ pub enum Platform {
MacX64,
MacArm,
WindowsX64,
+ AndroidArm,
}
impl Platform {
@@ -43,6 +44,7 @@ impl Platform {
("linux", "aarch64") => Self::LinuxArm,
("macos", "x86_64") => Self::MacX64,
("macos", "aarch64") => Self::MacArm,
+ ("android", "aarch64") => Self::AndroidArm,
_ => panic!("unsupported os/arch {os} {arch} - PR welcome!"),
}
}
diff --git a/build/ninja_gen/src/node.rs b/build/ninja_gen/src/node.rs
index 9e2c43a30..d977c4462 100644
--- a/build/ninja_gen/src/node.rs
+++ b/build/ninja_gen/src/node.rs
@@ -9,6 +9,7 @@ use crate::action::BuildAction;
use crate::archives::download_and_extract;
use crate::archives::OnlineArchive;
use crate::archives::Platform;
+use crate::copy::CopyFile;
use crate::hash::simple_hash;
use crate::input::space_separated;
use crate::input::BuildInput;
@@ -35,6 +36,10 @@ pub fn node_archive(platform: Platform) -> OnlineArchive {
url: "https://nodejs.org/dist/v18.12.1/node-v18.12.1-win-x64.zip",
sha256: "5478a5a2dce2803ae22327a9f8ae8494c1dec4a4beca5bbf897027380aecf4c7",
},
+ Platform::AndroidArm => OnlineArchive {
+ url: "https://nodejs.org/dist/v18.12.1/node-v18.12.1-linux-arm64.tar.xz",
+ sha256: "3904869935b7ecc51130b4b86486d2356539a174d11c9181180cab649f32cd2a",
+ },
}
}
@@ -114,6 +119,12 @@ pub fn setup_node(
"npm" => vec![if cfg!(windows) { "npm.cmd " } else { "bin/npm" }]
},
)?;
+
+ CopyFile {
+ input: "/data/data/com.termux/files/usr/bin/node".into(),
+ output: "out/extracted/node/bin/node",
+ };
+
build.add("yarn", YarnSetup {})?;
for binary in binary_exports {
diff --git a/build/ninja_gen/src/protobuf.rs b/build/ninja_gen/src/protobuf.rs
index fe2d09401..053ffa1c4 100644
--- a/build/ninja_gen/src/protobuf.rs
+++ b/build/ninja_gen/src/protobuf.rs
@@ -38,6 +38,12 @@ pub fn protoc_archive(platform: Platform) -> OnlineArchive {
sha256: "3657053024faa439ff5f8c1dd2ee06bac0f9b9a3d660e99944f015a7451e87ec",
}
}
+ Platform::AndroidArm => {
+ OnlineArchive {
+ url: "https://github.com/protocolbuffers/protobuf/releases/download/v21.8/protoc-21.8-linux-aarch_64.zip",
+ sha256: "f3d8eb5839d6186392d8c7b54fbeabbb6fcdd90618a500b77cb2e24faa245cad",
+ }
+ }
}
}
@@ -68,6 +74,13 @@ fn clang_format_archive(platform: Platform) -> OnlineArchive {
sha256: "7d9f6915e3f0fb72407830f0fc37141308d2e6915daba72987a52f309fbeaccc",
}
}
+ Platform::AndroidArm => {
+ // todo: replace with arm64 binary
+ OnlineArchive {
+ url: "https://github.com/ankitects/clang-format-binaries/releases/download/anki-2021-01-09/clang-format_linux_x86_64.zip",
+ sha256: "64060bc4dbca30d0d96aab9344e2783008b16e1cae019a2532f1126ca5ec5449",
+ }
+ }
}
}
pub struct ClangFormat {
diff --git a/python/requirements.anki.in b/python/requirements.anki.in
index 001a5a7d5..1a81c1809 100644
--- a/python/requirements.anki.in
+++ b/python/requirements.anki.in
@@ -1,7 +1,7 @@
beautifulsoup4
decorator
markdown
-orjson
+orjson==3.8.5
protobuf>=4.21
requests[socks]
distro; sys_platform != "darwin" and sys_platform != "win32"
diff --git a/python/requirements.bundle.txt b/python/requirements.bundle.txt
index 9be29ee35..ce5e2b196 100644
--- a/python/requirements.bundle.txt
+++ b/python/requirements.bundle.txt
@@ -123,56 +123,51 @@ markupsafe==2.1.1 \
# via
# jinja2
# werkzeug
-orjson==3.8.1 \
- --hash=sha256:03389e3750c521a7f3d4837de23cfd21a7f24574b4b3985c9498f440d21adb03 \
- --hash=sha256:07c42de52dfef56cdcaf2278f58e837b26f5b5af5f1fd133a68c4af203851fc7 \
- --hash=sha256:0b4e3857dd2416b479f700e9bdf4fcec8c690d2716622397d2b7e848f9833e50 \
- --hash=sha256:0bd5b4e539db8a9635776bdf9a25c3db84e37165e65d45c8ca90437adc46d6d8 \
- --hash=sha256:0f21eed14697083c01f7e00a87e21056fc8fb5851e8a7bca98345189abcdb4d4 \
- --hash=sha256:124207d2cd04e845eaf2a6171933cde40aebcb8c2d7d3b081e01be066d3014b6 \
- --hash=sha256:21efb87b168066201a120b0f54a2381f6f51ff3727e07b3908993732412b314a \
- --hash=sha256:231c30958ed99c23128a21993c5ac0a70e1e568e6a898a47f70d5d37461ca47c \
- --hash=sha256:395d02fd6be45f960da014372e7ecefc9e5f8df57a0558b7111a5fa8423c0669 \
- --hash=sha256:3fd5472020042482d7da4c26a0ee65dbd931f691e1c838c6cf4232823179ecc1 \
- --hash=sha256:4449e70b98f3ad3e43958360e4be1189c549865c0a128e8629ec96ce92d251c3 \
- --hash=sha256:45357eea9114bd41ef19280066591e9069bb4f6f5bffd533e9bfc12a439d735f \
- --hash=sha256:45c1914795ffedb2970bfcd3ed83daf49124c7c37943ed0a7368971c6ea5e278 \
- --hash=sha256:4f5a9bc5bc4d730153529cb0584c63ff286d50663ccd48c9435423660b1bb12d \
- --hash=sha256:59b4baf71c9f39125d7e535974b146cc180926462969f6d8821b4c5e975e11b3 \
- --hash=sha256:5a9e324213220578d324e0858baeab47808a13d3c3fbc6ba55a3f4f069d757cf \
- --hash=sha256:5ded261268d5dfd307078fe3370295e5eb15bdde838bbb882acf8538e061c451 \
- --hash=sha256:5e3db6496463c3000d15b7a712da5a9601c6c43682f23f81862fe1d2a338f295 \
- --hash=sha256:6071bcf51f0ae4d53b9d3e9164f7138164df4291c484a7b14562075aaa7a2b7b \
- --hash=sha256:6802edf98f6918e89df355f56be6e7db369b31eed64ff2496324febb8b0aa43b \
- --hash=sha256:69097c50c3ccbcc61292192b045927f1688ca57ce80525dc5d120e0b91e19bb0 \
- --hash=sha256:6956cf7a1ac97523e96f75b11534ff851df99a6474a561ad836b6e82004acbb8 \
- --hash=sha256:6a7b76d4b44bca418f7797b1e157907b56b7d31caa9091db4e99ebee51c16933 \
- --hash=sha256:7adaac93678ac61f5dc070f615b18639d16ee66f6a946d5221dbf315e8b74bec \
- --hash=sha256:8623ac25fa0850a44ac845e9333c4da9ae5707b7cec8ac87cbe9d4e41137180f \
- --hash=sha256:8f672f3987f6424f60ab2e86ea7ed76dd2806b8e9b506a373fc8499aed85ddb5 \
- --hash=sha256:97839a6abbebb06099294e6057d5b3061721ada08b76ae792e7041b6cb54c97f \
- --hash=sha256:a4244f4199a160717f0027e434abb886e322093ceadb2f790ff0c73ed3e17662 \
- --hash=sha256:a70aaa2e56356e58c6e1b49f7b7f069df5b15e55db002a74db3ff3f7af67c7ff \
- --hash=sha256:a806aca6b80fa1d996aa16593e4995a71126a085ee1a59fff19ccad29a4e47fd \
- --hash=sha256:b0c1750f73658906b82cabbf4be2f74300644c17cb037fbc8b48d746c3b90c76 \
- --hash=sha256:b0f9d9b5c6692097de07dd0b2d5ff20fd135bacd1b2fb7ea383ee717a4150c93 \
- --hash=sha256:b9abc49c014def1b832fcd53bdc670474b6fe41f373d16f40409882c0d0eccba \
- --hash=sha256:c15e7d691cee75b5192fc1fa8487bf541d463246dc25c926b9b40f5b6ab56770 \
- --hash=sha256:c2c9ef10b6344465fd5ac002be2d34f818211274dd79b44c75b2c14a979f84f3 \
- --hash=sha256:caff3c1e964cfee044a03a46244ecf6373f3c56142ad16458a1446ac6d69824a \
- --hash=sha256:d45db052d01d0ab7579470141d5c3592f4402d43cfacb67f023bc1210a67b7bc \
- --hash=sha256:d67a0bd0283a3b17ac43c5ab8e4a7e9d3aa758d6ec5d51c232343c408825a5ad \
- --hash=sha256:d89ef8a4444d83e0a5171d14f2ab4895936ab1773165b020f97d29cf289a2d88 \
- --hash=sha256:d8ed77098c2e22181fce971f49a34204c38b79ca91c01d515d07015339ae8165 \
- --hash=sha256:da6306e1f03e7085fe0db61d4a3377f70c6fd865118d0afe17f80ae9a8f6f124 \
- --hash=sha256:e073338e422f518c1d4d80efc713cd17f3ed6d37c8c7459af04a95459f3206d1 \
- --hash=sha256:e2aae92398c0023ac26a6cd026375f765ef5afe127eccabf563c78af7b572d59 \
- --hash=sha256:e399ed1b0d6f8089b9b6ff2cb3e71ba63a56d8ea88e1d95467949795cc74adfd \
- --hash=sha256:e7822cba140f7ca48ed0256229f422dbae69e3a3475176185db0c0538cfadb57 \
- --hash=sha256:f532c2cbe8c140faffaebcfb34d43c9946599ea8138971f181a399bec7d6b123 \
- --hash=sha256:f850489d89ea12be486492e68f0fd63e402fa28e426d4f0b5fc1eec0595e6109 \
- --hash=sha256:f8873e490dea0f9cd975d66f84618b6fb57b1ba45ecb218313707a71173d764f \
- --hash=sha256:fe25f50dc3d45364428baa0dbe3f613a5171c64eb0286eb775136b74e61ba58a
+orjson==3.8.5 \
+ --hash=sha256:09f40add3c2d208e20f8bf185df38f992bf5092202d2d30eced8f6959963f1d5 \
+ --hash=sha256:0b57bf72902d818506906e49c677a791f90dbd7f0997d60b14bc6c1ce4ce4cf9 \
+ --hash=sha256:0e28330cc6d51741cad0edd1b57caf6c5531aff30afe41402acde0a03246b8ed \
+ --hash=sha256:0e9a1c2e649cbaed410c882cedc8f3b993d8f1426d9327f31762d3f46fe7cc88 \
+ --hash=sha256:143639b9898b094883481fac37733231da1c2ae3aec78a1dd8d3b58c9c9fceef \
+ --hash=sha256:155954d725627b5480e6cc1ca488afb4fa685099a4ace5f5bf21a182fabf6706 \
+ --hash=sha256:1848e3b4cc09cc82a67262ae56e2a772b0548bb5a6f9dcaee10dcaaf0a5177b7 \
+ --hash=sha256:232ec1df0d708f74e0dd1fccac1e9a7008cd120d48fe695e8f0c9d80771da430 \
+ --hash=sha256:2544cd0d089faa862f5a39f508ee667419e3f9e11f119a6b1505cfce0eb26601 \
+ --hash=sha256:2eee64c028adf6378dd714c8debc96d5b92b6bb4862debb65ca868e59bac6c63 \
+ --hash=sha256:31f43e63e0d94784c55e86bd376df3f80b574bea8c0bc5ecd8041009fa8ec78a \
+ --hash=sha256:38480031bc8add58effe802291e4abf7042ef72ae1a4302efe9a36c8f8bfbfcc \
+ --hash=sha256:47a7ca236b25a138a74b2cb5169adcdc5b2b8abdf661de438ba65967a2cde9dc \
+ --hash=sha256:4f1427952b3bd92bfb63a61b7ffc33a9f54ec6de296fa8d924cbeba089866acb \
+ --hash=sha256:544f1240b295083697027a5093ec66763218ff16f03521d5020e7a436d2e417b \
+ --hash=sha256:6535d527aa1e4a757a6ce9b61f3dd74edc762e7d2c6991643aae7c560c8440bd \
+ --hash=sha256:68cb4a8501a463771d55bb22fc72795ec7e21d71ab083e000a2c3b651b6fb2af \
+ --hash=sha256:6ccc9f52cf46bd353c6ae1153eaf9d18257ddc110d135198b0cd8718474685ce \
+ --hash=sha256:6f58d1f0702332496bc1e2d267c7326c851991b62cf6395370d59c47f9890007 \
+ --hash=sha256:758238364142fcbeca34c968beefc0875ffa10aa2f797c82f51cfb1d22d0934e \
+ --hash=sha256:77a3b2bd0c4ef7723ea09081e3329dac568a62463aed127c1501441b07ffc64b \
+ --hash=sha256:79aa3e47cbbd4eedbbde4f988f766d6cf38ccb51d52cfabfeb6b8d1b58654d25 \
+ --hash=sha256:85e22c358cab170c8604e9edfffcc45dd7b0027ce57ed6bcacb556e8bfbbb704 \
+ --hash=sha256:8fba3e7aede3e88a01e94e6fe63d4580162b212e6da27ae85af50a1787e41416 \
+ --hash=sha256:933f4ab98362f46a59a6d0535986e1f0cae2f6b42435e24a55922b4bc872af0c \
+ --hash=sha256:93ae9832a11c6a9efa8c14224e5caf6e35046efd781de14e59eb69ab4e561cf3 \
+ --hash=sha256:9bae7347764e7be6dada980fd071e865544c98317ab61af575c9cc5e1dc7e3fe \
+ --hash=sha256:a9bab11611d5452efe4ae5315f5eb806f66104c08a089fb84c648d2e8e00f106 \
+ --hash=sha256:b573ca942c626fcf8a86be4f180b86b2498b18ae180f37b4180c2aced5808710 \
+ --hash=sha256:bf298b55b371c2772420c5ace4d47b0a3ea1253667e20ded3c363160fd0575f6 \
+ --hash=sha256:c0a9f329468c8eb000742455b83546849bcd69495d6baa6e171c7ee8600a47bd \
+ --hash=sha256:c67f6f6e9d26a06b63126112a7bc8d8529df048d31df2a257a8484b76adf3e5d \
+ --hash=sha256:c802ea6d4a0d40f096aceb5e7ef0a26c23d276cb9334e1cadcf256bb090b6426 \
+ --hash=sha256:c85c9c6bab97a831e7741089057347d99901b4db2451a076ca8adedc7d96297f \
+ --hash=sha256:cc7579240fb88a626956a6cb4a181a11b62afbc409ce239a7b866568a2412fa2 \
+ --hash=sha256:d48c182c7ff4ea0787806de8a2f9298ca44fd0068ecd5f23a4b2d8e03c745cb6 \
+ --hash=sha256:daaaef15a41e9e8cadc7677cefe00065ae10bce914eefe8da1cd26b3d063970b \
+ --hash=sha256:df3287dc304c8c4556dc85c4ab89eb333307759c1863f95e72e555c0cfce3e01 \
+ --hash=sha256:ec0b0b6cd0b84f03537f22b719aca705b876c54ab5cf3471d551c9644127284f \
+ --hash=sha256:ece1b6ef9312df5d5274ca6786e613b7da7de816356e36bcad9ea8a73d15ab71 \
+ --hash=sha256:eeab1d8247507a75926adf3ca995c74e91f5db1f168815bf3e774f992ba52b50 \
+ --hash=sha256:eee2f5f6476617d01ca166266d70fd5605d3397a41f067022ce04a2e1ced4c8d \
+ --hash=sha256:f2be0025ca7e460bcacb250aba8ce0239be62957d58cf34045834cc9302611d3 \
+ --hash=sha256:f5745ff473dd5c6718bf8c8d5bc183f638b4f3e03c7163ffcda4d4ef453f42ff
# via -r requirements.anki.in
packaging==21.3 \
--hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
diff --git a/python/requirements.dev.txt b/python/requirements.dev.txt
index 085ba1878..b196e7317 100644
--- a/python/requirements.dev.txt
+++ b/python/requirements.dev.txt
@@ -266,56 +266,51 @@ mypy-protobuf==3.4.0 \
--hash=sha256:7d75a079651b105076776a35a5405e3fa773b8a167118f1b712e443e9a6c18a2 \
--hash=sha256:da33dfde7547ff57e5ba5564126cbfa114f14413b2fa50759b1fa5de1e4ab511
# via -r requirements.dev.in
-orjson==3.8.1 \
- --hash=sha256:03389e3750c521a7f3d4837de23cfd21a7f24574b4b3985c9498f440d21adb03 \
- --hash=sha256:07c42de52dfef56cdcaf2278f58e837b26f5b5af5f1fd133a68c4af203851fc7 \
- --hash=sha256:0b4e3857dd2416b479f700e9bdf4fcec8c690d2716622397d2b7e848f9833e50 \
- --hash=sha256:0bd5b4e539db8a9635776bdf9a25c3db84e37165e65d45c8ca90437adc46d6d8 \
- --hash=sha256:0f21eed14697083c01f7e00a87e21056fc8fb5851e8a7bca98345189abcdb4d4 \
- --hash=sha256:124207d2cd04e845eaf2a6171933cde40aebcb8c2d7d3b081e01be066d3014b6 \
- --hash=sha256:21efb87b168066201a120b0f54a2381f6f51ff3727e07b3908993732412b314a \
- --hash=sha256:231c30958ed99c23128a21993c5ac0a70e1e568e6a898a47f70d5d37461ca47c \
- --hash=sha256:395d02fd6be45f960da014372e7ecefc9e5f8df57a0558b7111a5fa8423c0669 \
- --hash=sha256:3fd5472020042482d7da4c26a0ee65dbd931f691e1c838c6cf4232823179ecc1 \
- --hash=sha256:4449e70b98f3ad3e43958360e4be1189c549865c0a128e8629ec96ce92d251c3 \
- --hash=sha256:45357eea9114bd41ef19280066591e9069bb4f6f5bffd533e9bfc12a439d735f \
- --hash=sha256:45c1914795ffedb2970bfcd3ed83daf49124c7c37943ed0a7368971c6ea5e278 \
- --hash=sha256:4f5a9bc5bc4d730153529cb0584c63ff286d50663ccd48c9435423660b1bb12d \
- --hash=sha256:59b4baf71c9f39125d7e535974b146cc180926462969f6d8821b4c5e975e11b3 \
- --hash=sha256:5a9e324213220578d324e0858baeab47808a13d3c3fbc6ba55a3f4f069d757cf \
- --hash=sha256:5ded261268d5dfd307078fe3370295e5eb15bdde838bbb882acf8538e061c451 \
- --hash=sha256:5e3db6496463c3000d15b7a712da5a9601c6c43682f23f81862fe1d2a338f295 \
- --hash=sha256:6071bcf51f0ae4d53b9d3e9164f7138164df4291c484a7b14562075aaa7a2b7b \
- --hash=sha256:6802edf98f6918e89df355f56be6e7db369b31eed64ff2496324febb8b0aa43b \
- --hash=sha256:69097c50c3ccbcc61292192b045927f1688ca57ce80525dc5d120e0b91e19bb0 \
- --hash=sha256:6956cf7a1ac97523e96f75b11534ff851df99a6474a561ad836b6e82004acbb8 \
- --hash=sha256:6a7b76d4b44bca418f7797b1e157907b56b7d31caa9091db4e99ebee51c16933 \
- --hash=sha256:7adaac93678ac61f5dc070f615b18639d16ee66f6a946d5221dbf315e8b74bec \
- --hash=sha256:8623ac25fa0850a44ac845e9333c4da9ae5707b7cec8ac87cbe9d4e41137180f \
- --hash=sha256:8f672f3987f6424f60ab2e86ea7ed76dd2806b8e9b506a373fc8499aed85ddb5 \
- --hash=sha256:97839a6abbebb06099294e6057d5b3061721ada08b76ae792e7041b6cb54c97f \
- --hash=sha256:a4244f4199a160717f0027e434abb886e322093ceadb2f790ff0c73ed3e17662 \
- --hash=sha256:a70aaa2e56356e58c6e1b49f7b7f069df5b15e55db002a74db3ff3f7af67c7ff \
- --hash=sha256:a806aca6b80fa1d996aa16593e4995a71126a085ee1a59fff19ccad29a4e47fd \
- --hash=sha256:b0c1750f73658906b82cabbf4be2f74300644c17cb037fbc8b48d746c3b90c76 \
- --hash=sha256:b0f9d9b5c6692097de07dd0b2d5ff20fd135bacd1b2fb7ea383ee717a4150c93 \
- --hash=sha256:b9abc49c014def1b832fcd53bdc670474b6fe41f373d16f40409882c0d0eccba \
- --hash=sha256:c15e7d691cee75b5192fc1fa8487bf541d463246dc25c926b9b40f5b6ab56770 \
- --hash=sha256:c2c9ef10b6344465fd5ac002be2d34f818211274dd79b44c75b2c14a979f84f3 \
- --hash=sha256:caff3c1e964cfee044a03a46244ecf6373f3c56142ad16458a1446ac6d69824a \
- --hash=sha256:d45db052d01d0ab7579470141d5c3592f4402d43cfacb67f023bc1210a67b7bc \
- --hash=sha256:d67a0bd0283a3b17ac43c5ab8e4a7e9d3aa758d6ec5d51c232343c408825a5ad \
- --hash=sha256:d89ef8a4444d83e0a5171d14f2ab4895936ab1773165b020f97d29cf289a2d88 \
- --hash=sha256:d8ed77098c2e22181fce971f49a34204c38b79ca91c01d515d07015339ae8165 \
- --hash=sha256:da6306e1f03e7085fe0db61d4a3377f70c6fd865118d0afe17f80ae9a8f6f124 \
- --hash=sha256:e073338e422f518c1d4d80efc713cd17f3ed6d37c8c7459af04a95459f3206d1 \
- --hash=sha256:e2aae92398c0023ac26a6cd026375f765ef5afe127eccabf563c78af7b572d59 \
- --hash=sha256:e399ed1b0d6f8089b9b6ff2cb3e71ba63a56d8ea88e1d95467949795cc74adfd \
- --hash=sha256:e7822cba140f7ca48ed0256229f422dbae69e3a3475176185db0c0538cfadb57 \
- --hash=sha256:f532c2cbe8c140faffaebcfb34d43c9946599ea8138971f181a399bec7d6b123 \
- --hash=sha256:f850489d89ea12be486492e68f0fd63e402fa28e426d4f0b5fc1eec0595e6109 \
- --hash=sha256:f8873e490dea0f9cd975d66f84618b6fb57b1ba45ecb218313707a71173d764f \
- --hash=sha256:fe25f50dc3d45364428baa0dbe3f613a5171c64eb0286eb775136b74e61ba58a
+orjson==3.8.5 \
+ --hash=sha256:09f40add3c2d208e20f8bf185df38f992bf5092202d2d30eced8f6959963f1d5 \
+ --hash=sha256:0b57bf72902d818506906e49c677a791f90dbd7f0997d60b14bc6c1ce4ce4cf9 \
+ --hash=sha256:0e28330cc6d51741cad0edd1b57caf6c5531aff30afe41402acde0a03246b8ed \
+ --hash=sha256:0e9a1c2e649cbaed410c882cedc8f3b993d8f1426d9327f31762d3f46fe7cc88 \
+ --hash=sha256:143639b9898b094883481fac37733231da1c2ae3aec78a1dd8d3b58c9c9fceef \
+ --hash=sha256:155954d725627b5480e6cc1ca488afb4fa685099a4ace5f5bf21a182fabf6706 \
+ --hash=sha256:1848e3b4cc09cc82a67262ae56e2a772b0548bb5a6f9dcaee10dcaaf0a5177b7 \
+ --hash=sha256:232ec1df0d708f74e0dd1fccac1e9a7008cd120d48fe695e8f0c9d80771da430 \
+ --hash=sha256:2544cd0d089faa862f5a39f508ee667419e3f9e11f119a6b1505cfce0eb26601 \
+ --hash=sha256:2eee64c028adf6378dd714c8debc96d5b92b6bb4862debb65ca868e59bac6c63 \
+ --hash=sha256:31f43e63e0d94784c55e86bd376df3f80b574bea8c0bc5ecd8041009fa8ec78a \
+ --hash=sha256:38480031bc8add58effe802291e4abf7042ef72ae1a4302efe9a36c8f8bfbfcc \
+ --hash=sha256:47a7ca236b25a138a74b2cb5169adcdc5b2b8abdf661de438ba65967a2cde9dc \
+ --hash=sha256:4f1427952b3bd92bfb63a61b7ffc33a9f54ec6de296fa8d924cbeba089866acb \
+ --hash=sha256:544f1240b295083697027a5093ec66763218ff16f03521d5020e7a436d2e417b \
+ --hash=sha256:6535d527aa1e4a757a6ce9b61f3dd74edc762e7d2c6991643aae7c560c8440bd \
+ --hash=sha256:68cb4a8501a463771d55bb22fc72795ec7e21d71ab083e000a2c3b651b6fb2af \
+ --hash=sha256:6ccc9f52cf46bd353c6ae1153eaf9d18257ddc110d135198b0cd8718474685ce \
+ --hash=sha256:6f58d1f0702332496bc1e2d267c7326c851991b62cf6395370d59c47f9890007 \
+ --hash=sha256:758238364142fcbeca34c968beefc0875ffa10aa2f797c82f51cfb1d22d0934e \
+ --hash=sha256:77a3b2bd0c4ef7723ea09081e3329dac568a62463aed127c1501441b07ffc64b \
+ --hash=sha256:79aa3e47cbbd4eedbbde4f988f766d6cf38ccb51d52cfabfeb6b8d1b58654d25 \
+ --hash=sha256:85e22c358cab170c8604e9edfffcc45dd7b0027ce57ed6bcacb556e8bfbbb704 \
+ --hash=sha256:8fba3e7aede3e88a01e94e6fe63d4580162b212e6da27ae85af50a1787e41416 \
+ --hash=sha256:933f4ab98362f46a59a6d0535986e1f0cae2f6b42435e24a55922b4bc872af0c \
+ --hash=sha256:93ae9832a11c6a9efa8c14224e5caf6e35046efd781de14e59eb69ab4e561cf3 \
+ --hash=sha256:9bae7347764e7be6dada980fd071e865544c98317ab61af575c9cc5e1dc7e3fe \
+ --hash=sha256:a9bab11611d5452efe4ae5315f5eb806f66104c08a089fb84c648d2e8e00f106 \
+ --hash=sha256:b573ca942c626fcf8a86be4f180b86b2498b18ae180f37b4180c2aced5808710 \
+ --hash=sha256:bf298b55b371c2772420c5ace4d47b0a3ea1253667e20ded3c363160fd0575f6 \
+ --hash=sha256:c0a9f329468c8eb000742455b83546849bcd69495d6baa6e171c7ee8600a47bd \
+ --hash=sha256:c67f6f6e9d26a06b63126112a7bc8d8529df048d31df2a257a8484b76adf3e5d \
+ --hash=sha256:c802ea6d4a0d40f096aceb5e7ef0a26c23d276cb9334e1cadcf256bb090b6426 \
+ --hash=sha256:c85c9c6bab97a831e7741089057347d99901b4db2451a076ca8adedc7d96297f \
+ --hash=sha256:cc7579240fb88a626956a6cb4a181a11b62afbc409ce239a7b866568a2412fa2 \
+ --hash=sha256:d48c182c7ff4ea0787806de8a2f9298ca44fd0068ecd5f23a4b2d8e03c745cb6 \
+ --hash=sha256:daaaef15a41e9e8cadc7677cefe00065ae10bce914eefe8da1cd26b3d063970b \
+ --hash=sha256:df3287dc304c8c4556dc85c4ab89eb333307759c1863f95e72e555c0cfce3e01 \
+ --hash=sha256:ec0b0b6cd0b84f03537f22b719aca705b876c54ab5cf3471d551c9644127284f \
+ --hash=sha256:ece1b6ef9312df5d5274ca6786e613b7da7de816356e36bcad9ea8a73d15ab71 \
+ --hash=sha256:eeab1d8247507a75926adf3ca995c74e91f5db1f168815bf3e774f992ba52b50 \
+ --hash=sha256:eee2f5f6476617d01ca166266d70fd5605d3397a41f067022ce04a2e1ced4c8d \
+ --hash=sha256:f2be0025ca7e460bcacb250aba8ce0239be62957d58cf34045834cc9302611d3 \
+ --hash=sha256:f5745ff473dd5c6718bf8c8d5bc183f638b4f3e03c7163ffcda4d4ef453f42ff
# via -r requirements.bundle.txt
packaging==21.3 \
--hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
diff --git a/python/requirements.qt5_15.in b/python/requirements.qt5_15.in
index 66642166f..2548cba7c 100644
--- a/python/requirements.qt5_15.in
+++ b/python/requirements.qt5_15.in
@@ -1,3 +1,3 @@
-pyqt5==5.15.5
-pyqtwebengine==5.15.5
-pyqt5_sip==12.9.0
+pyqt5==5.15.7
+pyqtwebengine==5.15.6
+pyqt5_sip==12.11.0
diff --git a/python/requirements.qt5_15.txt b/python/requirements.qt5_15.txt
index 8ac1e2225..44f23ff6b 100644
--- a/python/requirements.qt5_15.txt
+++ b/python/requirements.qt5_15.txt
@@ -1,11 +1,11 @@
-pyqt5==5.15.5 \
- --hash=sha256:521130eea1eaac55cc6867b1dc627d292b6468fb8e525ce2a015cdf39028d6e8 \
- --hash=sha256:5966fb291f316f8e35bc8775dda63acf1bb9855baeb5af3e33d3e7c4f1cd98d4 \
- --hash=sha256:85e76b7a96995b9da12083850bf2a9f4f0aeba2b0b99461b3337ad7e44f428c3 \
- --hash=sha256:b411b7a8fa03901c9feb1dcbac7ea1fc3ce20b9ae682762b777cd5398749ca2b \
- --hash=sha256:b8e23c1a3fe1b7749c9106f36fba0bd4676dc77bcacca95304c6b840b782e24d
+pyqt5==5.15.7 \
+ --hash=sha256:08694f0a4c7d4f3d36b2311b1920e6283240ad3b7c09b515e08262e195dcdf37 \
+ --hash=sha256:1a793748c60d5aff3850b7abf84d47c1d41edb11231b7d7c16bef602c36be643 \
+ --hash=sha256:232fe5b135a095cbd024cf341d928fc672c963f88e6a52b0c605be8177c2fdb5 \
+ --hash=sha256:755121a52b3a08cb07275c10ebb96576d36e320e572591db16cfdbc558101594 \
+ --hash=sha256:e319c9d8639e0729235c1b09c99afdadad96fa3dbd8392ab561b5ab5946ee6ef
# via
- # -r requirements.in
+ # -r requirements.qt5_15.in
# pyqtwebengine
pyqt5-qt5==5.15.2 \
--hash=sha256:1988f364ec8caf87a6ee5d5a3a5210d57539988bf8e84714c7d60972692e2f4a \
@@ -13,39 +13,39 @@ pyqt5-qt5==5.15.2 \
--hash=sha256:76980cd3d7ae87e3c7a33bfebfaee84448fd650bad6840471d6cae199b56e154 \
--hash=sha256:9cc7a768b1921f4b982ebc00a318ccb38578e44e45316c7a4a850e953e1dd327
# via pyqt5
-pyqt5-sip==12.9.0 \
- --hash=sha256:055581c6fed44ba4302b70eeb82e979ff70400037358908f251cd85cbb3dbd93 \
- --hash=sha256:0fc9aefacf502696710b36cdc9fa2a61487f55ee883dbcf2c2a6477e261546f7 \
- --hash=sha256:42274a501ab4806d2c31659170db14c282b8313d2255458064666d9e70d96206 \
- --hash=sha256:4347bd81d30c8e3181e553b3734f91658cfbdd8f1a19f254777f906870974e6d \
- --hash=sha256:485972daff2fb0311013f471998f8ec8262ea381bded244f9d14edaad5f54271 \
- --hash=sha256:4f8e05fe01d54275877c59018d8e82dcdd0bc5696053a8b830eecea3ce806121 \
- --hash=sha256:69a3ad4259172e2b1aa9060de211efac39ddd734a517b1924d9c6c0cc4f55f96 \
- --hash=sha256:6a8701892a01a5a2a4720872361197cc80fdd5f49c8482d488ddf38c9c84f055 \
- --hash=sha256:6d5bca2fc222d58e8093ee8a81a6e3437067bb22bc3f86d06ec8be721e15e90a \
- --hash=sha256:83c3220b1ca36eb8623ba2eb3766637b19eb0ce9f42336ad8253656d32750c0a \
- --hash=sha256:a25b9843c7da6a1608f310879c38e6434331aab1dc2fe6cb65c14f1ecf33780e \
- --hash=sha256:ac57d796c78117eb39edd1d1d1aea90354651efac9d3590aac67fa4983f99f1f \
- --hash=sha256:b09f4cd36a4831229fb77c424d89635fa937d97765ec90685e2f257e56a2685a \
- --hash=sha256:c446971c360a0a1030282a69375a08c78e8a61d568bfd6dab3dcc5cf8817f644 \
- --hash=sha256:c5216403d4d8d857ec4a61f631d3945e44fa248aa2415e9ee9369ab7c8a4d0c7 \
- --hash=sha256:d3e4489d7c2b0ece9d203ae66e573939f7f60d4d29e089c9f11daa17cfeaae32 \
- --hash=sha256:d59af63120d1475b2bf94fe8062610720a9be1e8940ea146c7f42bb449d49067 \
- --hash=sha256:d85002238b5180bce4b245c13d6face848faa1a7a9e5c6e292025004f2fd619a \
- --hash=sha256:d8b2bdff7bbf45bc975c113a03b14fd669dc0c73e1327f02706666a7dd51a197 \
- --hash=sha256:dd05c768c2b55ffe56a9d49ce6cc77cdf3d53dbfad935258a9e347cbfd9a5850 \
- --hash=sha256:fc43f2d7c438517ee33e929e8ae77132749c15909afab6aeece5fcf4147ffdb5
+pyqt5-sip==12.11.0 \
+ --hash=sha256:0f77655c62ec91d47c2c99143f248624d44dd2d8a12d016e7c020508ad418aca \
+ --hash=sha256:205f3e1b3eea3597d8e878936c1a06e04bd23a59e8b179ee806465d72eea3071 \
+ --hash=sha256:3126c84568ab341c12e46ded2230f62a9a78752a70fdab13713f89a71cd44f73 \
+ --hash=sha256:4031547dfb679be309094bfa79254f5badc5ddbe66b9ad38e319d84a7d612443 \
+ --hash=sha256:42320e7a94b1085ed85d49794ed4ccfe86f1cae80b44a894db908a8aba2bc60e \
+ --hash=sha256:43dfe6dd409e713edeb67019b85419a7a0dc9923bfc451d6cf3778471c122532 \
+ --hash=sha256:4e5c1559311515291ea0ab0635529f14536954e3b973a7c7890ab7e4de1c2c23 \
+ --hash=sha256:51e377789d59196213eddf458e6927f33ba9d217b614d17d20df16c9a8b2c41c \
+ --hash=sha256:686071be054e5be6ca5aaaef7960931d4ba917277e839e2e978c7cbe3f43bb6e \
+ --hash=sha256:9356260d4feb60dbac0ab66f8a791a0d2cda1bf98c9dec8e575904a045fbf7c5 \
+ --hash=sha256:9bca450c5306890cb002fe36bbca18f979dd9e5b810b766dce8e3ce5e66ba795 \
+ --hash=sha256:ad21ca0ee8cae2a41b61fc04949dccfab6fe008749627d94e8c7078cb7a73af1 \
+ --hash=sha256:afa4ffffc54e306669bf2b66ea37abbc56c5cdda4f3f474d20324e3634302b12 \
+ --hash=sha256:b4710fd85b57edef716cc55fae45bfd5bfac6fc7ba91036f1dcc3f331ca0eb39 \
+ --hash=sha256:b69a1911f768b489846335e31e49eb34795c6b5a038ca24d894d751e3b0b44da \
+ --hash=sha256:bd733667098cac70e89279d9c239106d543fb480def62a44e6366ccb8f68510b \
+ --hash=sha256:d12b81c3a08abf7657a2ebc7d3649852a1f327eb2146ebadf45930486d32e920 \
+ --hash=sha256:ec1d8ce50be76c5c1d1c86c6dc0ccacc2446172dde98b663a17871f532f9bd44 \
+ --hash=sha256:ec5e9ef78852e1f96f86d7e15c9215878422b83dde36d44f1539a3062942f19c \
+ --hash=sha256:f1f9e312ff8284d6dfebc5366f6f7d103f84eec23a4da0be0482403933e68660 \
+ --hash=sha256:f6b72035da4e8fecbb0bc4a972e30a5674a9ad5608dbddaa517e983782dbf3bf
# via
- # -r requirements.in
+ # -r requirements.qt5_15.in
# pyqt5
# pyqtwebengine
-pyqtwebengine==5.15.5 \
- --hash=sha256:30cebf455406990d5a0b859eac261ba6b45c32ce18956271733e0e96dbdca9b7 \
- --hash=sha256:5c77f71d88d871bc7400c68ef6433fadc5bd57b86d1a9c4d8094cea42f3607f1 \
- --hash=sha256:782aeee6bc8699bc029fe5c169a045c2bc9533d781cf3f5e9fb424b85a204e68 \
- --hash=sha256:ab47608dccf2b5e4b950d5a3cc704b17711af035024d07a9b71ad29fc103b941 \
- --hash=sha256:b827ad7ba0a65d5cd176797478f0ec8f599df6746b06c548649ff5674482a022
- # via -r requirements.in
+pyqtwebengine==5.15.6 \
+ --hash=sha256:67110bc9d5b7e633dcc242b8228cc54b1532abc039fdf534b383ac40a60b7ba3 \
+ --hash=sha256:8c2fce2458e7b781d2cc3070b336f67d39a717c5eef2f823cae501d5d9f200de \
+ --hash=sha256:a90c945606683a53c9b264a7509943fd835d50366d535c22ddde952f23d35748 \
+ --hash=sha256:ae241ef2a61c782939c58b52c2aea53ad99b30f3934c8358d5e0a6ebb3fd0721 \
+ --hash=sha256:dbd1a768877040050d3159270f5ab95758af4954c4cb4e54195bd3cad519d5b6
+ # via -r requirements.qt5_15.in
pyqtwebengine-qt5==5.15.2 \
--hash=sha256:24231f19e1595018779977de6722b5c69f3d03f34a5f7574ff21cd1e764ef76d \
--hash=sha256:9e80b408d8de09d4e708d5d84c3ceaf3603292ff8f5e566ae44bb0320fa59c33 \
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment