python3-pydantic-core: upgrade 2.16.3 -> 2.18.1
PATCH 1/1 python3-pydantic-core: upgrade 2.16.3 -> 2.18.1
The currently available python-3-pydantic v2.7.0 requires python3-pydantic-core to be updated to v2.18.1.
Removed patch: 0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to:
The pyo3 version bump patch is dropped as the pyo3 version in python3-pydantic-core was updated to a newer one.
Added patch: 0001-Lower-MSRV-to-1.75-1316:
This patch for lowering the MSRV to 1.75 (from 1.76) is backported to fix the build (as scarthgap provides rust 1.75).
Added patch: 0001-Fix-generate_self_schema-for-Python-3.12-1299:
This patch fixes following build error for python 3.12+ (which we have):
TypeError: ForwardRef._evaluate() missing 1 required keyword-only argument: 'recursive_guard'
Updated crate dependencies:
ahash: 0.8.7 -> 0.8.10
enum_dispatch: 0.3.12 -> 0.3.13
indexmap: 2.0.0 -> 2.2.2
jiter: 0.0.6 -> 0.2.1
pyo3: 0.20.3 -> 0.21.1
regex: 1.10.2 -> 1.10.3
regex-automata: 0.4.3 -> 0.4.5
serde: 1.0.195 -> 1.0.197
serde_derive: 1.0.195 -> 1.0.197
serde_json: 1.0.109 -> 1.0.114
smallvec: 1.11.2 -> 1.13.2
speedate: 0.13.0 -> 0.14.0
uuid: 1.6.1 -> 1.7.0
Added new crate dependencies:
strum_macros: 0.26.1
Removed crate dependencies:
allocator-api2
lexical-core
lexical-write-float
lexical-write-integer
Changelog:
https://github.com/pydantic/pydantic-core/releases
---
.../python/python3-pydantic-core-crates.inc | 78 +++++------
...-github.com-pyo3-pyo3-from-0.20.2-to.patch | 126 ------------------
...ate_self_schema-for-Python-3.12-1299.patch | 32 +++++
.../0001-Lower-MSRV-to-1.75-1316.patch | 25 ++++
...6.3.bb => python3-pydantic-core_2.18.1.bb} | 7 +-
5 files changed, 98 insertions(+), 170 deletions(-)
delete mode 100644 meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch
create mode 100644 meta-python/recipes-devtools/python/python3-pydantic-core/0001-Fix-generate_self_schema-for-Python-3.12-1299.patch
create mode 100644 meta-python/recipes-devtools/python/python3-pydantic-core/0001-Lower-MSRV-to-1.75-1316.patch
rename meta-python/recipes-devtools/python/{python3-pydantic-core_2.16.3.bb => python3-pydantic-core_2.18.1.bb} (87%)meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc +36 -42
@@ -2,31 +2,27 @@ # from Cargo.lock SRC_URI += " \ - crate://crates.io/ahash/0.8.7 \ + crate://crates.io/ahash/0.8.10 \ crate://crates.io/aho-corasick/1.0.2 \ - crate://crates.io/allocator-api2/0.2.16 \ crate://crates.io/autocfg/1.1.0 \ crate://crates.io/base64/0.21.7 \ crate://crates.io/bitflags/1.3.2 \ crate://crates.io/cc/1.0.79 \ crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/enum_dispatch/0.3.12 \ + crate://crates.io/enum_dispatch/0.3.13 \ crate://crates.io/equivalent/1.0.1 \ crate://crates.io/form_urlencoded/1.2.1 \ crate://crates.io/getrandom/0.2.10 \ crate://crates.io/hashbrown/0.14.3 \ crate://crates.io/heck/0.4.1 \ crate://crates.io/idna/0.5.0 \ - crate://crates.io/indexmap/2.0.0 \ + crate://crates.io/indexmap/2.2.2 \ crate://crates.io/indoc/2.0.4 \ crate://crates.io/itoa/1.0.8 \ - crate://crates.io/jiter/0.0.6 \ - crate://crates.io/lexical-core/0.8.5 \ + crate://crates.io/jiter/0.2.1 \ crate://crates.io/lexical-parse-float/0.8.5 \ crate://crates.io/lexical-parse-integer/0.8.6 \ crate://crates.io/lexical-util/0.8.5 \ - crate://crates.io/lexical-write-float/0.8.5 \ - crate://crates.io/lexical-write-integer/0.8.5 \ crate://crates.io/libc/0.2.147 \ crate://crates.io/lock_api/0.4.10 \ crate://crates.io/memchr/2.6.3 \
@@ -40,28 +36,29 @@ SRC_URI += " \ crate://crates.io/percent-encoding/2.3.1 \ crate://crates.io/portable-atomic/1.6.0 \ crate://crates.io/proc-macro2/1.0.76 \ - crate://crates.io/pyo3/0.20.3 \ - crate://crates.io/pyo3-build-config/0.20.3 \ - crate://crates.io/pyo3-ffi/0.20.3 \ - crate://crates.io/pyo3-macros/0.20.3 \ - crate://crates.io/pyo3-macros-backend/0.20.3 \ + crate://crates.io/pyo3/0.21.1 \ + crate://crates.io/pyo3-build-config/0.21.1 \ + crate://crates.io/pyo3-ffi/0.21.1 \ + crate://crates.io/pyo3-macros/0.21.1 \ + crate://crates.io/pyo3-macros-backend/0.21.1 \ crate://crates.io/python3-dll-a/0.2.9 \ crate://crates.io/quote/1.0.35 \ crate://crates.io/redox_syscall/0.3.5 \ - crate://crates.io/regex/1.10.2 \ - crate://crates.io/regex-automata/0.4.3 \ + crate://crates.io/regex/1.10.3 \ + crate://crates.io/regex-automata/0.4.5 \ crate://crates.io/regex-syntax/0.8.2 \ crate://crates.io/rustversion/1.0.13 \ crate://crates.io/ryu/1.0.14 \ crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/serde/1.0.195 \ - crate://crates.io/serde_derive/1.0.195 \ - crate://crates.io/serde_json/1.0.109 \ - crate://crates.io/smallvec/1.11.2 \ - crate://crates.io/speedate/0.13.0 \ + crate://crates.io/serde/1.0.197 \ + crate://crates.io/serde_derive/1.0.197 \ + crate://crates.io/serde_json/1.0.114 \ + crate://crates.io/smallvec/1.13.2 \ + crate://crates.io/speedate/0.14.0 \ crate://crates.io/static_assertions/1.1.0 \ crate://crates.io/strum/0.25.0 \ crate://crates.io/strum_macros/0.25.3 \ + crate://crates.io/strum_macros/0.26.1 \ crate://crates.io/syn/2.0.48 \ crate://crates.io/target-lexicon/0.12.9 \ crate://crates.io/tinyvec/1.6.0 \
@@ -71,7 +68,7 @@ SRC_URI += " \ crate://crates.io/unicode-normalization/0.1.22 \ crate://crates.io/unindent/0.2.3 \ crate://crates.io/url/2.5.0 \ - crate://crates.io/uuid/1.6.1 \ + crate://crates.io/uuid/1.7.0 \ crate://crates.io/version_check/0.9.4 \ crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ crate://crates.io/windows-targets/0.48.1 \
@@ -86,31 +83,27 @@ SRC_URI += " \ crate://crates.io/zerocopy-derive/0.7.32 \ " -SRC_URI[ahash-0.8.7.sha256sum] = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +SRC_URI[ahash-0.8.10.sha256sum] = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" SRC_URI[aho-corasick-1.0.2.sha256sum] = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -SRC_URI[allocator-api2-0.2.16.sha256sum] = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -SRC_URI[enum_dispatch-0.3.12.sha256sum] = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +SRC_URI[enum_dispatch-0.3.13.sha256sum] = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" SRC_URI[form_urlencoded-1.2.1.sha256sum] = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" SRC_URI[getrandom-0.2.10.sha256sum] = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" SRC_URI[idna-0.5.0.sha256sum] = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -SRC_URI[indexmap-2.0.0.sha256sum] = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +SRC_URI[indexmap-2.2.2.sha256sum] = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" SRC_URI[indoc-2.0.4.sha256sum] = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" SRC_URI[itoa-1.0.8.sha256sum] = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" -SRC_URI[jiter-0.0.6.sha256sum] = "87db066a99f69382be06d02313f8ce989996b53a04a8a70cfd1a6483a56227f7" -SRC_URI[lexical-core-0.8.5.sha256sum] = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +SRC_URI[jiter-0.2.1.sha256sum] = "8e1177860adcf80c1ae7d7c1d41561f008c7530664caebbfa5ddd8a7f7316b98" SRC_URI[lexical-parse-float-0.8.5.sha256sum] = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" SRC_URI[lexical-parse-integer-0.8.6.sha256sum] = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" SRC_URI[lexical-util-0.8.5.sha256sum] = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -SRC_URI[lexical-write-float-0.8.5.sha256sum] = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -SRC_URI[lexical-write-integer-0.8.5.sha256sum] = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" SRC_URI[libc-0.2.147.sha256sum] = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" SRC_URI[lock_api-0.4.10.sha256sum] = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" SRC_URI[memchr-2.6.3.sha256sum] = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
@@ -124,28 +117,29 @@ SRC_URI[parking_lot_core-0.9.8.sha256sum] = "93f00c865fe7cabf650081affecd3871070 SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" SRC_URI[proc-macro2-1.0.76.sha256sum] = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" -SRC_URI[pyo3-0.20.3.sha256sum] = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" -SRC_URI[pyo3-build-config-0.20.3.sha256sum] = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" -SRC_URI[pyo3-ffi-0.20.3.sha256sum] = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" -SRC_URI[pyo3-macros-0.20.3.sha256sum] = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" -SRC_URI[pyo3-macros-backend-0.20.3.sha256sum] = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +SRC_URI[pyo3-0.21.1.sha256sum] = "a7a8b1990bd018761768d5e608a13df8bd1ac5f678456e0f301bb93e5f3ea16b" +SRC_URI[pyo3-build-config-0.21.1.sha256sum] = "650dca34d463b6cdbdb02b1d71bfd6eb6b6816afc708faebb3bac1380ff4aef7" +SRC_URI[pyo3-ffi-0.21.1.sha256sum] = "09a7da8fc04a8a2084909b59f29e1b8474decac98b951d77b80b26dc45f046ad" +SRC_URI[pyo3-macros-0.21.1.sha256sum] = "4b8a199fce11ebb28e3569387228836ea98110e43a804a530a9fd83ade36d513" +SRC_URI[pyo3-macros-backend-0.21.1.sha256sum] = "93fbbfd7eb553d10036513cb122b888dcd362a945a00b06c165f2ab480d4cc3b" SRC_URI[python3-dll-a-0.2.9.sha256sum] = "d5f07cd4412be8fa09a721d40007c483981bbe072cd6a21f2e83e04ec8f8343f" SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -SRC_URI[regex-1.10.2.sha256sum] = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -SRC_URI[regex-automata-0.4.3.sha256sum] = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +SRC_URI[regex-1.10.3.sha256sum] = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +SRC_URI[regex-automata-0.4.5.sha256sum] = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" SRC_URI[rustversion-1.0.13.sha256sum] = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" SRC_URI[ryu-1.0.14.sha256sum] = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -SRC_URI[serde-1.0.195.sha256sum] = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" -SRC_URI[serde_derive-1.0.195.sha256sum] = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" -SRC_URI[serde_json-1.0.109.sha256sum] = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" -SRC_URI[smallvec-1.11.2.sha256sum] = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" -SRC_URI[speedate-0.13.0.sha256sum] = "242f76c50fd18cbf098607090ade73a08d39cfd84ea835f3796a2c855223b19b" +SRC_URI[serde-1.0.197.sha256sum] = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +SRC_URI[serde_derive-1.0.197.sha256sum] = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +SRC_URI[serde_json-1.0.114.sha256sum] = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +SRC_URI[smallvec-1.13.2.sha256sum] = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +SRC_URI[speedate-0.14.0.sha256sum] = "c323c4e6fece5a5a1a2a7f726d243144cce9fbcfe3ce4d9f3c6ede726a2bc780" SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" SRC_URI[strum-0.25.0.sha256sum] = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" SRC_URI[strum_macros-0.25.3.sha256sum] = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +SRC_URI[strum_macros-0.26.1.sha256sum] = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" SRC_URI[syn-2.0.48.sha256sum] = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" SRC_URI[target-lexicon-0.12.9.sha256sum] = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
@@ -155,7 +149,7 @@ SRC_URI[unicode-ident-1.0.10.sha256sum] = "22049a19f4a68748a168c0fc439f9516686aa SRC_URI[unicode-normalization-0.1.22.sha256sum] = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" SRC_URI[url-2.5.0.sha256sum] = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -SRC_URI[uuid-1.6.1.sha256sum] = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +SRC_URI[uuid-1.7.0.sha256sum] = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" SRC_URI[windows-targets-0.48.1.sha256sum] = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch deleted +0 -126
126 lines not on this page · raw message
meta-python/recipes-devtools/python/python3-pydantic-core/0001-Fix-generate_self_schema-for-Python-3.12-1299.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jelle Zijlstra <[email protected]> +Date: Wed, 22 May 2024 07:44:10 -0700 +Subject: [PATCH] Fix generate_self_schema for Python 3.12+ (#1299) + +Upstream-Status: Backport [https://github.com/pydantic/pydantic-core/commit/a7620419383a69bd2b28ab953c9a17f6ed35bb9a] + +--- + generate_self_schema.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/generate_self_schema.py b/generate_self_schema.py +index 3aef99b..acecf19 100644 +--- a/generate_self_schema.py ++++ b/generate_self_schema.py +@@ -190,7 +190,12 @@ def all_literal_values(type_: type[core_schema.Literal]) -> list[any]: + + def eval_forward_ref(type_: Any) -> Any: + try: +- return type_._evaluate(core_schema.__dict__, None, set()) ++ try: ++ # Python 3.12+ ++ return type_._evaluate(core_schema.__dict__, None, type_params=set(), recursive_guard=set()) ++ except TypeError: ++ # Python 3.9+ ++ return type_._evaluate(core_schema.__dict__, None, set()) + except TypeError: + # for Python 3.8 + return type_._evaluate(core_schema.__dict__, None) +-- +2.43.0 +
meta-python/recipes-devtools/python/python3-pydantic-core/0001-Lower-MSRV-to-1.75-1316.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Christian Heimes <[email protected]> +Date: Wed, 5 Jun 2024 11:34:52 +0200 +Subject: [PATCH] Lower MSRV to 1.75 (#1316) + +Upstream-Status: Backport [https://github.com/pydantic/pydantic-core/commit/ebef5bdf92707f5e1739931150893ae6c7ccc531] + +Signed-off-by: Christian Heimes <[email protected]> +--- + Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 88470c5..f8170a2 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -24,7 +24,7 @@ include = [ + "!tests/.pytest_cache", + "!*.so", + ] +-rust-version = "1.76" ++rust-version = "1.75" + + [dependencies] + pyo3 = { version = "0.21.1", features = ["generate-import-lib", "num-bigint"] }
meta-python/recipes-devtools/python/python3-pydantic-core_2.18.1.bb renamed from meta-python/recipes-devtools/python/python3-pydantic-core_2.16.3.bb +5 -2
@@ -8,14 +8,17 @@ HOMEPAGE = "https://github.com/pydantic/pydantic-core" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c" -SRC_URI += "file://0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch" -SRC_URI[sha256sum] = "1cac689f80a3abab2d3c0048b29eea5751114054f032a941a32de4c852c59cad" +SRC_URI[sha256sum] = "de9d3e8717560eb05e28739d1b35e4eac2e458553a52a301e51352a7ffc86a35" DEPENDS = "python3-maturin-native python3-typing-extensions" require ${BPN}-crates.inc inherit pypi cargo-update-recipe-crates python_maturin +SRC_URI += "\ + file://0001-Lower-MSRV-to-1.75-1316.patch \ + file://0001-Fix-generate_self_schema-for-Python-3.12-1299.patch \ +" PYPI_PACKAGE = "pydantic_core"
Signature · 1 line
2.43.0
Hello Richard,
Quoted 2 lines · Richard Leitner via lists.openembedded.org
The currently available python-3-pydantic v2.7.0 requires python3-pydantic-core to be updated to v2.18.1.
I don't see the updated or later version in master? Am I missing something?
- Armin
Quoted 468 lines
Removed patch: 0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to:
The pyo3 version bump patch is dropped as the pyo3 version in python3-pydantic-core was updated to a newer one.Added patch: 0001-Lower-MSRV-to-1.75-1316:
This patch for lowering the MSRV to 1.75 (from 1.76) is backported to fix the build (as scarthgap provides rust 1.75).Added patch: 0001-Fix-generate_self_schema-for-Python-3.12-1299:
This patch fixes following build error for python 3.12+ (which we have):
TypeError:ForwardRef._evaluate()missing 1 required keyword-only argument: 'recursive_guard'Updated crate dependencies:
ahash: 0.8.7 -> 0.8.10
enum_dispatch: 0.3.12 -> 0.3.13
indexmap: 2.0.0 -> 2.2.2
jiter: 0.0.6 -> 0.2.1
pyo3: 0.20.3 -> 0.21.1
regex: 1.10.2 -> 1.10.3
regex-automata: 0.4.3 -> 0.4.5
serde: 1.0.195 -> 1.0.197
serde_derive: 1.0.195 -> 1.0.197
serde_json: 1.0.109 -> 1.0.114
smallvec: 1.11.2 -> 1.13.2
speedate: 0.13.0 -> 0.14.0
uuid: 1.6.1 -> 1.7.0Added new crate dependencies:
strum_macros: 0.26.1Removed crate dependencies:
allocator-api2
lexical-core
lexical-write-float
lexical-write-integerChangelog:
https://github.com/pydantic/pydantic-core/releasesSigned-off-by Richard Leitner <[email protected]>--- .../python/python3-pydantic-core-crates.inc | 78 +++++------ ...-github.com-pyo3-pyo3-from-0.20.2-to.patch | 126 ------------------ ...ate_self_schema-for-Python-3.12-1299.patch | 32 +++++ .../0001-Lower-MSRV-to-1.75-1316.patch | 25 ++++ ...6.3.bb => python3-pydantic-core_2.18.1.bb} | 7 +- 5 files changed, 98 insertions(+), 170 deletions(-)delete mode 100644
meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patchcreate mode 100644meta-python/recipes-devtools/python/python3-pydantic-core/0001-Fix-generate_self_schema-for-Python-3.12-1299.patchcreate mode 100644meta-python/recipes-devtools/python/python3-pydantic-core/0001-Lower-MSRV-to-1.75-1316.patchrename meta-python/recipes-devtools/python/{python3-pydantic-core_2.16.3.bb => python3-pydantic-core_2.18.1.bb} (87%)meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc +36
-42@@ -2,31 +2,27 @@ # from Cargo.lock SRC_URI += " \ - crate://crates.io/ahash/0.8.7 \ + crate://crates.io/ahash/0.8.10 \ crate://crates.io/aho-corasick/1.0.2 \ - crate://crates.io/allocator-api2/0.2.16 \ crate://crates.io/autocfg/1.1.0 \ crate://crates.io/base64/0.21.7 \ crate://crates.io/bitflags/1.3.2 \ crate://crates.io/cc/1.0.79 \ crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/enum_dispatch/0.3.12 \ + crate://crates.io/enum_dispatch/0.3.13 \ crate://crates.io/equivalent/1.0.1 \ crate://crates.io/form_urlencoded/1.2.1 \ crate://crates.io/getrandom/0.2.10 \ crate://crates.io/hashbrown/0.14.3 \ crate://crates.io/heck/0.4.1 \ crate://crates.io/idna/0.5.0 \ - crate://crates.io/indexmap/2.0.0 \ + crate://crates.io/indexmap/2.2.2 \ crate://crates.io/indoc/2.0.4 \ crate://crates.io/itoa/1.0.8 \ - crate://crates.io/jiter/0.0.6 \ - crate://crates.io/lexical-core/0.8.5 \ + crate://crates.io/jiter/0.2.1 \ crate://crates.io/lexical-parse-float/0.8.5 \ crate://crates.io/lexical-parse-integer/0.8.6 \ crate://crates.io/lexical-util/0.8.5 \ - crate://crates.io/lexical-write-float/0.8.5 \ - crate://crates.io/lexical-write-integer/0.8.5 \ crate://crates.io/libc/0.2.147 \ crate://crates.io/lock_api/0.4.10 \ crate://crates.io/memchr/2.6.3 \@@ -40,28 +36,29 @@ SRC_URI += " \ crate://crates.io/percent-encoding/2.3.1 \ crate://crates.io/portable-atomic/1.6.0 \ crate://crates.io/proc-macro2/1.0.76 \ - crate://crates.io/pyo3/0.20.3 \ - crate://crates.io/pyo3-build-config/0.20.3 \ - crate://crates.io/pyo3-ffi/0.20.3 \ - crate://crates.io/pyo3-macros/0.20.3 \ - crate://crates.io/pyo3-macros-backend/0.20.3 \ + crate://crates.io/pyo3/0.21.1 \ + crate://crates.io/pyo3-build-config/0.21.1 \ + crate://crates.io/pyo3-ffi/0.21.1 \ + crate://crates.io/pyo3-macros/0.21.1 \ + crate://crates.io/pyo3-macros-backend/0.21.1 \ crate://crates.io/python3-dll-a/0.2.9 \ crate://crates.io/quote/1.0.35 \ crate://crates.io/redox_syscall/0.3.5 \ - crate://crates.io/regex/1.10.2 \ - crate://crates.io/regex-automata/0.4.3 \ + crate://crates.io/regex/1.10.3 \ + crate://crates.io/regex-automata/0.4.5 \ crate://crates.io/regex-syntax/0.8.2 \ crate://crates.io/rustversion/1.0.13 \ crate://crates.io/ryu/1.0.14 \ crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/serde/1.0.195 \ - crate://crates.io/serde_derive/1.0.195 \ - crate://crates.io/serde_json/1.0.109 \ - crate://crates.io/smallvec/1.11.2 \ - crate://crates.io/speedate/0.13.0 \ + crate://crates.io/serde/1.0.197 \ + crate://crates.io/serde_derive/1.0.197 \ + crate://crates.io/serde_json/1.0.114 \ + crate://crates.io/smallvec/1.13.2 \ + crate://crates.io/speedate/0.14.0 \ crate://crates.io/static_assertions/1.1.0 \ crate://crates.io/strum/0.25.0 \ crate://crates.io/strum_macros/0.25.3 \ + crate://crates.io/strum_macros/0.26.1 \ crate://crates.io/syn/2.0.48 \ crate://crates.io/target-lexicon/0.12.9 \ crate://crates.io/tinyvec/1.6.0 \@@ -71,7 +68,7 @@ SRC_URI += " \ crate://crates.io/unicode-normalization/0.1.22 \ crate://crates.io/unindent/0.2.3 \ crate://crates.io/url/2.5.0 \ - crate://crates.io/uuid/1.6.1 \ + crate://crates.io/uuid/1.7.0 \ crate://crates.io/version_check/0.9.4 \ crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ crate://crates.io/windows-targets/0.48.1 \@@ -86,31 +83,27 @@ SRC_URI += " \ crate://crates.io/zerocopy-derive/0.7.32 \ " -SRC_URI[ahash-0.8.7.sha256sum] = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +SRC_URI[ahash-0.8.10.sha256sum] = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" SRC_URI[aho-corasick-1.0.2.sha256sum] = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -SRC_URI[allocator-api2-0.2.16.sha256sum] = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -SRC_URI[enum_dispatch-0.3.12.sha256sum] = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +SRC_URI[enum_dispatch-0.3.13.sha256sum] = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" SRC_URI[form_urlencoded-1.2.1.sha256sum] = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" SRC_URI[getrandom-0.2.10.sha256sum] = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" SRC_URI[idna-0.5.0.sha256sum] = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -SRC_URI[indexmap-2.0.0.sha256sum] = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +SRC_URI[indexmap-2.2.2.sha256sum] = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" SRC_URI[indoc-2.0.4.sha256sum] = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" SRC_URI[itoa-1.0.8.sha256sum] = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" -SRC_URI[jiter-0.0.6.sha256sum] = "87db066a99f69382be06d02313f8ce989996b53a04a8a70cfd1a6483a56227f7" -SRC_URI[lexical-core-0.8.5.sha256sum] = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +SRC_URI[jiter-0.2.1.sha256sum] = "8e1177860adcf80c1ae7d7c1d41561f008c7530664caebbfa5ddd8a7f7316b98" SRC_URI[lexical-parse-float-0.8.5.sha256sum] = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" SRC_URI[lexical-parse-integer-0.8.6.sha256sum] = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" SRC_URI[lexical-util-0.8.5.sha256sum] = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -SRC_URI[lexical-write-float-0.8.5.sha256sum] = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -SRC_URI[lexical-write-integer-0.8.5.sha256sum] = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" SRC_URI[libc-0.2.147.sha256sum] = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" SRC_URI[lock_api-0.4.10.sha256sum] = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" SRC_URI[memchr-2.6.3.sha256sum] = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"@@ -124,28 +117,29 @@ SRC_URI[parking_lot_core-0.9.8.sha256sum] = "93f00c865fe7cabf650081affecd3871070 SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" SRC_URI[proc-macro2-1.0.76.sha256sum] = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" -SRC_URI[pyo3-0.20.3.sha256sum] = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" -SRC_URI[pyo3-build-config-0.20.3.sha256sum] = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" -SRC_URI[pyo3-ffi-0.20.3.sha256sum] = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" -SRC_URI[pyo3-macros-0.20.3.sha256sum] = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" -SRC_URI[pyo3-macros-backend-0.20.3.sha256sum] = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +SRC_URI[pyo3-0.21.1.sha256sum] = "a7a8b1990bd018761768d5e608a13df8bd1ac5f678456e0f301bb93e5f3ea16b" +SRC_URI[pyo3-build-config-0.21.1.sha256sum] = "650dca34d463b6cdbdb02b1d71bfd6eb6b6816afc708faebb3bac1380ff4aef7" +SRC_URI[pyo3-ffi-0.21.1.sha256sum] = "09a7da8fc04a8a2084909b59f29e1b8474decac98b951d77b80b26dc45f046ad" +SRC_URI[pyo3-macros-0.21.1.sha256sum] = "4b8a199fce11ebb28e3569387228836ea98110e43a804a530a9fd83ade36d513" +SRC_URI[pyo3-macros-backend-0.21.1.sha256sum] = "93fbbfd7eb553d10036513cb122b888dcd362a945a00b06c165f2ab480d4cc3b" SRC_URI[python3-dll-a-0.2.9.sha256sum] = "d5f07cd4412be8fa09a721d40007c483981bbe072cd6a21f2e83e04ec8f8343f" SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -SRC_URI[regex-1.10.2.sha256sum] = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -SRC_URI[regex-automata-0.4.3.sha256sum] = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +SRC_URI[regex-1.10.3.sha256sum] = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +SRC_URI[regex-automata-0.4.5.sha256sum] = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" SRC_URI[rustversion-1.0.13.sha256sum] = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" SRC_URI[ryu-1.0.14.sha256sum] = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -SRC_URI[serde-1.0.195.sha256sum] = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" -SRC_URI[serde_derive-1.0.195.sha256sum] = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" -SRC_URI[serde_json-1.0.109.sha256sum] = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" -SRC_URI[smallvec-1.11.2.sha256sum] = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" -SRC_URI[speedate-0.13.0.sha256sum] = "242f76c50fd18cbf098607090ade73a08d39cfd84ea835f3796a2c855223b19b" +SRC_URI[serde-1.0.197.sha256sum] = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +SRC_URI[serde_derive-1.0.197.sha256sum] = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +SRC_URI[serde_json-1.0.114.sha256sum] = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +SRC_URI[smallvec-1.13.2.sha256sum] = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +SRC_URI[speedate-0.14.0.sha256sum] = "c323c4e6fece5a5a1a2a7f726d243144cce9fbcfe3ce4d9f3c6ede726a2bc780" SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" SRC_URI[strum-0.25.0.sha256sum] = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" SRC_URI[strum_macros-0.25.3.sha256sum] = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +SRC_URI[strum_macros-0.26.1.sha256sum] = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" SRC_URI[syn-2.0.48.sha256sum] = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" SRC_URI[target-lexicon-0.12.9.sha256sum] = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"@@ -155,7 +149,7 @@ SRC_URI[unicode-ident-1.0.10.sha256sum] = "22049a19f4a68748a168c0fc439f9516686aa SRC_URI[unicode-normalization-0.1.22.sha256sum] = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" SRC_URI[url-2.5.0.sha256sum] = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -SRC_URI[uuid-1.6.1.sha256sum] = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +SRC_URI[uuid-1.7.0.sha256sum] = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" SRC_URI[windows-targets-0.48.1.sha256sum] = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch deleted +0
-126@@ -1,126 +0,0 @@ -From a5690f973384bf8cbf4deb3b83d822b7aaefbdd8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 27 Feb 2024 11:00:46 -0800 -Subject: [PATCH] Bumps [pyo3](https://github.com/pyo3/pyo3) from 0.20.2 to - 0.20.3. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - Cargo.lock | 26 +++++++++++++++++--------- - Cargo.toml | 2 +- - 2 files changed, 18 insertions(+), 10 deletions(-) - ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -322,6 +322,12 @@ source = "registry+https://github.com/ru - checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - - [[package]] -+name = "portable-atomic" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" -+ -+[[package]] - name = "proc-macro2" - version = "1.0.76" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -357,9 +363,9 @@ dependencies = [ - - [[package]] - name = "pyo3" --version = "0.20.2" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" -+checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" - dependencies = [ - "cfg-if", - "indoc", -@@ -367,6 +373,7 @@ dependencies = [ - "memoffset", - "num-bigint", - "parking_lot", -+ "portable-atomic", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", -@@ -375,9 +382,9 @@ dependencies = [ - - [[package]] - name = "pyo3-build-config" --version = "0.20.2" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" -+checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" - dependencies = [ - "once_cell", - "python3-dll-a", -@@ -386,9 +393,9 @@ dependencies = [ - - [[package]] - name = "pyo3-ffi" --version = "0.20.2" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" -+checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" - dependencies = [ - "libc", - "pyo3-build-config", -@@ -396,9 +403,9 @@ dependencies = [ - - [[package]] - name = "pyo3-macros" --version = "0.20.2" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" -+checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" - dependencies = [ - "proc-macro2", - "pyo3-macros-backend", -@@ -408,12 +415,13 @@ dependencies = [ - - [[package]] - name = "pyo3-macros-backend" --version = "0.20.2" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" -+checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" - dependencies = [ - "heck", - "proc-macro2", -+ "pyo3-build-config", - "quote", - "syn", - ] ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -26,7 +26,7 @@ include = [ - ] - - [dependencies] --pyo3 = { version = "0.20.2", features = ["generate-import-lib", "num-bigint"] } -+pyo3 = { version = "0.20.3", features = ["generate-import-lib", "num-bigint"] } - regex = "1.10.2" - strum = { version = "0.25.0", features = ["derive"] } - strum_macros = "0.25.3" -@@ -70,12 +70,12 @@ debug = true - strip = false - - [dev-dependencies] --pyo3 = { version = "0.20.2", features = ["auto-initialize"] } -+pyo3 = { version = "0.20.3", features = ["auto-initialize"] } - - [build-dependencies] - version_check = "0.9.4" - # used where logic has to be version/distribution specific, e.g. pypy --pyo3-build-config = { version = "0.20.2" } -+pyo3-build-config = { version = "0.20.3" } - - [lints.clippy] - dbg_macro = "warn"meta-python/recipes-devtools/python/python3-pydantic-core/0001-Fix-generate_self_schema-for-Python-3.12-1299.patch new file +32
-0@@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jelle Zijlstra <[email protected]> +Date: Wed, 22 May 2024 07:44:10 -0700 +Subject: [PATCH] Fix generate_self_schema for Python 3.12+ (#1299) + +Upstream-Status: Backport [https://github.com/pydantic/pydantic-core/commit/a7620419383a69bd2b28ab953c9a17f6ed35bb9a] + +--- + generate_self_schema.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/generate_self_schema.py b/generate_self_schema.py +index 3aef99b..acecf19 100644 +--- a/generate_self_schema.py ++++ b/generate_self_schema.py +@@ -190,7 +190,12 @@ def all_literal_values(type_: type[core_schema.Literal]) -> list[any]: + + def eval_forward_ref(type_: Any) -> Any: + try: +- return type_._evaluate(core_schema.__dict__, None, set()) ++ try: ++ # Python 3.12+ ++ return type_._evaluate(core_schema.__dict__, None, type_params=set(), recursive_guard=set()) ++ except TypeError: ++ # Python 3.9+ ++ return type_._evaluate(core_schema.__dict__, None, set()) + except TypeError: + # for Python 3.8 + return type_._evaluate(core_schema.__dict__, None) +-- +2.43.0 +meta-python/recipes-devtools/python/python3-pydantic-core/0001-Lower-MSRV-to-1.75-1316.patch new file +25
-0@@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Christian Heimes <[email protected]> +Date: Wed, 5 Jun 2024 11:34:52 +0200 +Subject: [PATCH] Lower MSRV to 1.75 (#1316) + +Upstream-Status: Backport [https://github.com/pydantic/pydantic-core/commit/ebef5bdf92707f5e1739931150893ae6c7ccc531] + +Signed-off-by: Christian Heimes <[email protected]> +--- + Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 88470c5..f8170a2 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -24,7 +24,7 @@ include = [ + "!tests/.pytest_cache", + "!*.so", + ] +-rust-version = "1.76" ++rust-version = "1.75" + + [dependencies] + pyo3 = { version = "0.21.1", features = ["generate-import-lib", "num-bigint"] }meta-python/recipes-devtools/python/python3-pydantic-core_2.18.1.bb renamed from meta-python/recipes-devtools/python/python3-pydantic-core_2.16.3.bb +5
-3@@ -8,14 +8,17 @@ HOMEPAGE = "https://github.com/pydantic/pydantic-core" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c" -SRC_URI += "file://0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch" -SRC_URI[sha256sum] = "1cac689f80a3abab2d3c0048b29eea5751114054f032a941a32de4c852c59cad" +SRC_URI[sha256sum] = "de9d3e8717560eb05e28739d1b35e4eac2e458553a52a301e51352a7ffc86a35" DEPENDS = "python3-maturin-native python3-typing-extensions" require ${BPN}-crates.inc inherit pypi cargo-update-recipe-crates python_maturin +SRC_URI += "\ + file://0001-Lower-MSRV-to-1.75-1316.patch \ + file://0001-Fix-generate_self_schema-for-Python-3.12-1299.patch \ +" PYPI_PACKAGE = "pydantic_core" -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#111261): https://lists.openembedded.org/g/openembedded-devel/message/111261
Mute This Topic: https://lists.openembedded.org/mt/107073841/3616698
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Hi Armin,
Quoted 6 lines · On Tue, Jul 09, 2024 at 08:12:06AM GMT, akuster808 wrote:
Hello Richard,
Quoted 2 lines · Richard Leitner via lists.openembedded.org
The currently available python-3-pydantic v2.7.0 requires python3-pydantic-core to be updated to v2.18.1.
I don't see the updated or later version in master? Am I missing something?
I found a series from Tim [1] which updates python3-pydantic and python3-pydantic-core to 2.7.4/1.9.0 for master.
As those are newer versions I didn't send this patch for master.
Furthermore I wanted to fix the incorrect dependency first before trying to update python3-pydantic for scarthgap (and therefore backport Tims series).
So how should we proceed here? Should this patch be sent for master too? Or should the series from Tim should be followed up for master?
regards;rl
Quoted 3 lines
- Armin
[1] https://patchwork.yoctoproject.org/project/oe/list/?series=25615
Quoted 8 lines · Richard Leitner
Hi Armin,
Quoted 5 lines · On Tue, Jul 09, 2024 at 08:12:06AM GMT, akuster808 wrote:
Hello Richard,
Quoted 2 lines · Richard Leitner via lists.openembedded.org
The currently available python-3-pydantic v2.7.0 requires python3-pydantic-core to be updated to v2.18.1.
Quoted 8 lines
Quoted 1 line
I don't see the updated or later version in master? Am I missing
something?
I found a series from Tim [1] which updates python3-pydantic and python3-pydantic-core
to 2.7.4/1.9.0 for master.
As those are newer versions I didn't send this patch for master.
That series needed to be rebased, per khem. Just because it is on patchwork does not imply merging or correctness.
During the rebase I discovered missing dependencies.
Also, python3-pydantic-core has a QA warning about TMPDIR
WARNING: python3-pydantic-core-2.19.0-r0 do_package_qa: QA Issue: File/usr/lib/python3.12/site-packages/pydantic_core/_ pydantic_core.cpython-312-x86_64-linux-gnu.so in package python3-pydantic-core contains reference to TMPDIR [buildpaths]
Which seems to be RUSTFLAGS being injected into the .so for some reason (where 14 is the .rodata section):
readelf -p 14 pydantic_core/_pydantic_core.cpython-312-x86_64-linux-gnu.so
<snip>
[ f7c] i
...skipping...
model-fieldsdataclasstuplefrozensetdefinition-refdefinitionsUnknown schema
type: "2.19.0a-alphab-beta__version__profile=release pgo= -L /srv/build/ttorling/workspace-upgrades/build/tmp/work/core2-64-poky-linux/python3-pydantic-coas
[ 2ae09] kwargs
[ 2ae10] (args,
kwargs=None)ArgsKwargs(kwargssrc/argument_markers.rsCreating instances of "UndefinedType" is not supportednew()\n
<snip>
The above seems to be a backtrace from the schema generation script, but I haven't figured out yet how to troubleshoot further.
Meanwhile, upstream has updated again.
My working branch:
https://git.openembedded.org/meta-openembedded-contrib/log/?h=timo/python3-pydantic-upgrade
Quoted 15 lines
Furthermore I wanted to fix the incorrect dependency first before trying to update python3-pydantic for scarthgap (and therefore backport Tims series).
So how should we proceed here? Should this patch be sent for master too? Or should the series from Tim should be followed up for master?
regards;rl
Quoted 3 lines
- Armin
[1] https://patchwork.yoctoproject.org/project/oe/list/?series=25615
Quoted 6 lines · Tim Orling
Quoted 2 lines · Richard Leitner
Hi Armin,
Quoted 8 lines
Quoted 7 lines · On Tue, Jul 09, 2024 at 08:12:06AM GMT, akuster808 wrote:
Quoted 5 lines
Hello Richard,
Quoted 2 lines · Richard Leitner via lists.openembedded.org
The currently available python-3-pydantic v2.7.0 requires python3-pydantic-core to be updated to v2.18.1.
I don't know what we want to do with scarthgap. Part of me thinks we should revert the 2.7.0 upgrade to one which is compatible with 2.16.3 python3-pydantc-core. Part of me thinks upgrade python3-pydantic-core to 2.18.1, but we won't have that in master. Right now, it appears to me that we need new recipes (python3-tzdata) in order to build 2.19.0 (I did not look at 2.18.x). Adding new recipes sounds against stable policy to me.
Quoted 36 lines
Quoted 8 lines
I don't see the updated or later version in master? Am I missing something?
I found a series from Tim [1] which updates python3-pydantic and python3-pydantic-core
to 2.7.4/1.9.0 for master.
As those are newer versions I didn't send this patch for master.That series needed to be rebased, per khem. Just because it is on patchwork does not imply merging or correctness.
During the rebase I discovered missing dependencies.Also, python3-pydantic-core has a QA warning about TMPDIR
WARNING: python3-pydantic-core-2.19.0-r0do_package_qa: QA Issue: File/usr/lib/python3.12/site-packages/pydantic_core/_pydantic_core.cpython-312-x86_64-linux-gnu.so in package python3-pydantic-core contains reference to TMPDIR [buildpaths]Which seems to be RUSTFLAGS being injected into the .so for some reason (where 14 is the .rodata section):
readelf -p 14 pydantic_core/_pydantic_core.cpython-312-x86_64-linux-gnu.so<snip>
[ f7c] i
...skipping...model-fieldsdataclasstuplefrozensetdefinition-refdefinitionsUnknown schema
type: "2.19.0a-alphab-beta__version__profile=release pgo= -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/core2-64-poky-linux/python3-pydantic-coas
[ 2ae09] kwargs
[ 2ae10] (args,
kwargs=None)ArgsKwargs(kwargssrc/argument_markers.rsCreating instances of "UndefinedType" is not supportednew()\n
<snip>
Quoted 3 lines
The above seems to be a backtrace from the schema generation script, but I haven't figured out yet how to troubleshoot further.
Filed an issue upstream:
https://github.com/pydantic/pydantic-core/issues/1365
Quoted 6 lines
Meanwhile, upstream has updated again.
My working branch:https://git.openembedded.org/meta-openembedded-contrib/log/?h=timo/python3-pydantic-upgrade
Found more ptest RDEPENDS missing for python3-pydantic. That branch currently passes ptests for:
bitbake (-c testimage) meta-python-image-ptest-python3-pydantic-core bitbake (-c testimage) meta-python-image-ptest-python3-pydantic
Quoted 19 lines
Quoted 18 lines
Furthermore I wanted to fix the incorrect dependency first before trying to update python3-pydantic for scarthgap (and therefore backport Tims series).
So how should we proceed here? Should this patch be sent for master too? Or should the series from Tim should be followed up for master?
regards;rl
Quoted 3 lines
- Armin
[1] https://patchwork.yoctoproject.org/project/oe/list/?series=25615
Hi Tim, Hi Armin,
sorry for the late response, just came back from vacation.
Quoted 13 lines · Tim Orling
Quoted 4 lines · Tim Orling
Quoted 2 lines · Richard Leitner
Hi Armin,
Quoted 8 lines
Quoted 7 lines · On Tue, Jul 09, 2024 at 08:12:06AM GMT, akuster808 wrote:
Quoted 5 lines
Hello Richard,
Quoted 2 lines · Richard Leitner via lists.openembedded.org
The currently available python-3-pydantic v2.7.0 requires python3-pydantic-core to be updated to v2.18.1.
Quoted 6 lines
I don't know what we want to do with scarthgap. Part of me thinks we should revert the 2.7.0 upgrade to one which is compatible with 2.16.3 python3-pydantc-core. Part of me thinks upgrade python3-pydantic-core to 2.18.1, but we won't have that in master. Right now, it appears to me that we need new recipes (python3-tzdata) in order to build 2.19.0 (I did not look at 2.18.x). Adding new recipes sounds against stable policy to me.
Tbh it wasn't clear to me why the pydantic (not -core) update to 2.7.0 was accepted at all (for scarthgap) as it bumps the minor version. Is this sane/desired? ... Even after reading "Stable/LTS Patch Acceptance Policies" by YP [1] this isn't completely clear to me (does OE have a own policy on this?.
For the update (2.16.3 to 2.18.1) there isn't anythin in the pyproject.toml diff which results in dependency changes. So IMHO this should be safe.
Nonetheless applying this patch to scarthgap definitely breaks the "backport only"/"master first" principle. So maybe downgrading is the "policy friendly" approach?
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
I don't see the updated or later version in master? Am I missing something?
I found a series from Tim [1] which updates python3-pydantic and python3-pydantic-core
to 2.7.4/1.9.0 for master.
As those are newer versions I didn't send this patch for master.
Quoted 3 lines
Quoted 3 lines
That series needed to be rebased, per khem. Just because it is on patchwork does not imply merging or correctness.
During the rebase I discovered missing dependencies.
Thanks for the clarification. Next time I will follow up the already existing series first.
Quoted 35 lines
Quoted 24 lines
Also, python3-pydantic-core has a QA warning about TMPDIR
WARNING: python3-pydantic-core-2.19.0-r0do_package_qa: QA Issue: File/usr/lib/python3.12/site-packages/pydantic_core/_pydantic_core.cpython-312-x86_64-linux-gnu.so in package python3-pydantic-core contains reference to TMPDIR [buildpaths]Which seems to be RUSTFLAGS being injected into the .so for some reason (where 14 is the .rodata section):
readelf -p 14 pydantic_core/_pydantic_core.cpython-312-x86_64-linux-gnu.so<snip>
[ f7c] i
...skipping...model-fieldsdataclasstuplefrozensetdefinition-refdefinitionsUnknown schema
type: "2.19.0a-alphab-beta__version__profile=release pgo= -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/core2-64-poky-linux/python3-pydantic-coas
[ 2ae09] kwargs
[ 2ae10] (args,
kwargs=None)ArgsKwargs(kwargssrc/argument_markers.rsCreating instances of "UndefinedType" is not supportednew()\n
<snip>Quoted 3 lines
The above seems to be a backtrace from the schema generation script, but I haven't figured out yet how to troubleshoot further.
Filed an issue upstream:
https://github.com/pydantic/pydantic-core/issues/1365Quoted 4 lines
Meanwhile, upstream has updated again.
My working branch:
Quoted 8 lines
Quoted 2 lines
https://git.openembedded.org/meta-openembedded-contrib/log/?h=timo/python3-pydantic-upgrade
Found more ptest RDEPENDS missing for python3-pydantic. That branch currently passes ptests for:
bitbake (-c testimage) meta-python-image-ptest-python3-pydantic-core bitbake (-c testimage) meta-python-image-ptest-python3-pydantic
Do you got failing ptests for scarthgap (with this patch applied) too? Or did you just tested master?
[1] https://wiki.yoctoproject.org/wiki/Stable_Release_and_LTS
Thanks & regards;rl
Quoted 14 lines · Richard Leitner
Hi Tim, Hi Armin,
sorry for the late response, just came back from vacation.
Quoted 1 line · Tim Orling
On Wed, Jul 10, 2024 at 8:14 AM Tim Orling <[email protected]>
Quoted 7 lines · wrote:
Quoted 7 lines · Richard Leitner
Quoted 6 lines
Hi Armin,
Quoted 2 lines · On Tue, Jul 09, 2024 at 08:12:06AM GMT, akuster808 wrote:
Hello Richard,
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
On 7/6/24 2:08 PM, Richard Leitner via lists.openembedded.org
Quoted 2 lines · wrote:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
The currently available python-3-pydantic v2.7.0 requires python3-pydantic-core to be updated to v2.18.1.
<snip>
Do you got failing ptests for scarthgap (with this patch applied) too? Or did you just tested master?
I won't try any stable branches until I get it fully functional on master. The challenge is time and the fact that Rust is injecting TMPDIR into the .so
Given that master now makes [build-paths] QA WARNING an ERROR, we need to fix this.
I suspect, but have not proven, that it was already a problem with the original python3-pydantic-core before any of these upgrades.
Quoted 6 lines
[1] https://wiki.yoctoproject.org/wiki/Stable_Release_and_LTS
Thanks & regards;rl
Quoted 17 lines · Tim Orling
Quoted 7 lines · Richard Leitner
Quoted 1 line · Tim Orling
On Wed, Jul 10, 2024 at 8:14 AM Tim Orling <[email protected]>
Quoted 4 lines · wrote:
Quoted 4 lines · Richard Leitner
Quoted 3 lines · On Tue, Jul 09, 2024 at 08:12:06AM GMT, akuster808 wrote:
Quoted 2 lines
Hello Richard,
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
On 7/6/24 2:08 PM, Richard Leitner via lists.openembedded.org
Quoted 2 lines · wrote:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
The currently available python-3-pydantic v2.7.0 requires python3-pydantic-core to be updated to v2.18.1.
<snip>
Do you got failing ptests for scarthgap (with this patch applied) too? Or did you just tested master?
Quoted 5 lines
I won't try any stable branches until I get it fully functional on master. The challenge is time and the fact that Rust is injecting TMPDIR into the .so
Given that master now makes [build-paths] QA WARNING an ERROR, we need to fix this.
True. So will you follow up on the pydantic/core update for master as soon as there is a fix for this issue?
How to proceed with scarthgap? As we are definitely shipping non-compatible versions of pydantic/pydantic-core currently.
Quoted 3 lines
I suspect, but have not proven, that it was already a problem with the original python3-pydantic-core before any of these upgrades.
...
Quoted 20 lines · Richard Leitner
Quoted 5 lines · Tim Orling
Quoted 4 lines · Richard Leitner
Quoted 1 line · Tim Orling
On Wed, Jul 10, 2024 at 8:14 AM Tim Orling <[email protected]>
Quoted 1 line · wrote:
Quoted 1 line
On Tue, Jul 9, 2024 at 5:54 AM Richard Leitner <[email protected]>
Quoted 5 lines · wrote:
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines · On Tue, Jul 09, 2024 at 08:12:06AM GMT, akuster808 wrote:
Quoted 3 lines
Hello Richard,
On 7/6/24 2:08 PM, Richard Leitner via lists.openembedded.org
wrote:
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
The currently available python-3-pydantic v2.7.0 requires python3-pydantic-core to be updated to v2.18.1.
<snip>
Do you got failing ptests for scarthgap (with this patch applied) too? Or did you just tested master?I won't try any stable branches until I get it fully functional on
Quoted 9 lines
master.
Quoted 4 lines
The challenge is time and the fact that Rust is injecting TMPDIR into the .so
Given that master now makes [build-paths] QA WARNING an ERROR, we need to fix this.True. So will you follow up on the pydantic/core update for master as soon as there is a fix for this issue?
I am focused on master. I will not actively try to fix scarthgap. Others are already working on that (see below).
Quoted 4 lines
How to proceed with scarthgap? As we are definitely shipping non-compatible versions of pydantic/pydantic-core currently.
https://lore.kernel.org/openembedded-devel/[email protected]/T/#u
Quoted 7 lines
Quoted 4 lines
I suspect, but have not proven, that it was already a problem with the original python3-pydantic-core before any of these upgrades.
...
Hi Armin, Tim, Frank,
Quoted 43 lines · Richard Leitner
The currently available python-3-pydantic v2.7.0 requires python3-pydantic-core to be updated to v2.18.1.
Removed patch: 0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to:
The pyo3 version bump patch is dropped as the pyo3 version in python3-pydantic-core was updated to a newer one.Added patch: 0001-Lower-MSRV-to-1.75-1316:
This patch for lowering the MSRV to 1.75 (from 1.76) is backported to fix the build (as scarthgap provides rust 1.75).Added patch: 0001-Fix-generate_self_schema-for-Python-3.12-1299:
This patch fixes following build error for python 3.12+ (which we have):
TypeError:ForwardRef._evaluate()missing 1 required keyword-only argument: 'recursive_guard'Updated crate dependencies:
ahash: 0.8.7 -> 0.8.10
enum_dispatch: 0.3.12 -> 0.3.13
indexmap: 2.0.0 -> 2.2.2
jiter: 0.0.6 -> 0.2.1
pyo3: 0.20.3 -> 0.21.1
regex: 1.10.2 -> 1.10.3
regex-automata: 0.4.3 -> 0.4.5
serde: 1.0.195 -> 1.0.197
serde_derive: 1.0.195 -> 1.0.197
serde_json: 1.0.109 -> 1.0.114
smallvec: 1.11.2 -> 1.13.2
speedate: 0.13.0 -> 0.14.0
uuid: 1.6.1 -> 1.7.0Added new crate dependencies:
strum_macros: 0.26.1Removed crate dependencies:
allocator-api2
lexical-core
lexical-write-float
lexical-write-integerChangelog:
https://github.com/pydantic/pydantic-core/releasesSigned-off-by Richard Leitner <[email protected]>
Quoted 11 lines
---
.../python/python3-pydantic-core-crates.inc | 78 +++++------
...-github.com-pyo3-pyo3-from-0.20.2-to.patch | 126 ------------------
...ate_self_schema-for-Python-3.12-1299.patch | 32 +++++
.../0001-Lower-MSRV-to-1.75-1316.patch | 25 ++++
...6.3.bb => python3-pydantic-core_2.18.1.bb} | 7 +-
5 files changed, 98 insertions(+), 170 deletions(-)
delete mode 100644 meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch
create mode 100644 meta-python/recipes-devtools/python/python3-pydantic-core/0001-Fix-generate_self_schema-for-Python-3.12-1299.patch
create mode 100644 meta-python/recipes-devtools/python/python3-pydantic-core/0001-Lower-MSRV-to-1.75-1316.patch
rename meta-python/recipes-devtools/python/{python3-pydantic-core_2.16.3.bb => python3-pydantic-core_2.18.1.bb} (87%)as bee8b9bbc (python3-pydantic-core: fix incompatible version, 2024-07-26), which updates pydantic-core to 2.18.4. got merged to master here's a friendly Ping for this patch for scarthgap.
Backporting the commit from master seems not to work as pydantic 2.7.0 requires pydantic-core 2.18.1 [1].
Therefore I want to start the discussion again on how to fix this for scarthgap:
a) Revert the pydantic update to 2.7.0
b) Update pydantic-core to 2.18.4 to match pydantic 2.7.0
c) Update pydantic-core and pydantic to current master's state
d) any other ideas?
Please see also the past discussion at [2] and the original patch at [3].
Thanks and regards; rl
[1] https://github.com/pydantic/pydantic/blob/v2.7.0/pyproject.toml#L51
[2] https://lore.kernel.org/openembedded-devel/[email protected]/
[3] https://lore.kernel.org/openembedded-devel/[email protected]/
I was unaware of this discussion when I created the fix for master. Note that I've silenced the TMPDIR QA message, this still needs a proper fix in master as well.
This indeed needs to be fixed in scarthgap as well, since the incompatible versions do break some code. My two cents for the available options:
- Revert pydantic upgrade (from 2.7.0 back to 2.6.4)
- Update pydantic-core to 2.18.1
- Use master (pydantic 2.7.3 and pydantic-core 2.18.4)
Would only downgrade if this is the *only* allowed option according to the LTS branch policy. Version 2.7.x includes new features compared to 2.6.4. Removing these with a downgrade would violate the LTS patch policy of not merging "ABI/API breakage".
Option 2 or 3 are my preferred choices and they fall within the "fixes for bugs" category of the LTS patch policy. Option 2 is the smallest change to fix the problem, but option 3 includes some additional upstream fixes with the update from 2.7.0 to 2.7.3.
Regards,
Frank
Quoted 8 lines · Frank de Brabander
I was unaware of this discussion when I created the fix for master. Note that I've silenced the TMPDIR QA message, this still needs a proper fix in master as well.
This indeed needs to be fixed in scarthgap as well, since the incompatible versions do break some code. My two cents for the available options:
Quoted 8 lines
- Revert pydantic upgrade (from 2.7.0 back to 2.6.4)
- Update pydantic-core to 2.18.1
- Use master (pydantic 2.7.3 and pydantic-core 2.18.4)Would only downgrade if this is the *only* allowed option according to the LTS branch policy. Version 2.7.x includes new features compared to 2.6.4. Removing these with a downgrade would violate the LTS patch policy of not merging "ABI/API breakage".
We have had this type of situation with a pkg (A) update in master and then new lts was branched. We found out other later additional pkgs needed to updated to work with pkg (A). pydantic update was in Master before scarthgap was branched.
Quoted 5 lines
Option 2 or 3 are my preferred choices and they fall within the "fixes for bugs" category of the LTS patch policy. Option 2 is the smallest change to fix the problem, but option 3 includes some additional upstream fixes with the update from 2.7.0 to 2.7.3.
Master should be failing so if Master gets a revert of pydantic back to 2.6.4, then Scarthgap will follow. Is this an option? - Armin
Quoted 4 lines
Regards,
Frank
Quoted 24 lines
Op 3 aug 2024 om 18:51 heeft akuster808 <[email protected]> het volgende geschreven:
Quoted 9 lines · Frank de Brabander
I was unaware of this discussion when I created the fix for master. Note that I've silenced the TMPDIR QA message, this still needs a proper fix in master as well.
This indeed needs to be fixed in scarthgap as well, since the incompatible versions do break some code. My two cents for the available options:
Quoted 8 lines
- Revert pydantic upgrade (from 2.7.0 back to 2.6.4)
- Update pydantic-core to 2.18.1
- Use master (pydantic 2.7.3 and pydantic-core 2.18.4)Would only downgrade if this is the *only* allowed option according to the LTS branch policy. Version 2.7.x includes new features compared to 2.6.4. Removing these with a downgrade would violate the LTS patch policy of not merging "ABI/API breakage".
Quoted 8 lines
We have had this type of situation with a pkg (A) update in master and then new lts was branched. We found out other later additional pkgs needed to updated to work with pkg (A). pydantic update was in Master before scarthgap was branched.
Quoted 5 lines
Option 2 or 3 are my preferred choices and they fall within the "fixes for bugs" category of the LTS patch policy. Option 2 is the smallest change to fix the problem, but option 3 includes some additional upstream fixes with the update from 2.7.0 to 2.7.3.
Master should be failing so if Master gets a revert of pydantic back to 2.6.4, then Scarthgap will follow. Is this an option? - Armin
As far as I know master works now, so a revert would make no sense in that case.
Quoted 5 lines
Quoted 4 lines
Regards,
Frank
Quoted 27 lines · Frank de Brabander via lists.openembedded.org
Quoted 27 lines
Op 3 aug 2024 om 18:51 heeft akuster808 <[email protected]> het volgende geschreven:
Quoted 9 lines · Frank de Brabander
I was unaware of this discussion when I created the fix for master. Note that I've silenced the TMPDIR QA message, this still needs a proper fix in master as well.
This indeed needs to be fixed in scarthgap as well, since the incompatible versions do break some code. My two cents for the available options:
Quoted 8 lines
- Revert pydantic upgrade (from 2.7.0 back to 2.6.4)
- Update pydantic-core to 2.18.1
- Use master (pydantic 2.7.3 and pydantic-core 2.18.4)Would only downgrade if this is the *only* allowed option according to the LTS branch policy. Version 2.7.x includes new features compared to 2.6.4. Removing these with a downgrade would violate the LTS patch policy of not merging "ABI/API breakage".
We have had this type of situation with a pkg (A) update in master and then new lts was branched. We found out other later additional pkgs needed to updated to work with pkg (A). pydantic update was in Master before scarthgap was branched.
Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Option 2 or 3 are my preferred choices and they fall within the "fixes for bugs" category of the LTS patch policy. Option 2 is the smallest change to fix the problem, but option 3 includes some additional upstream fixes with the update from 2.7.0 to 2.7.3.
Master should be failing so if Master gets a revert of pydantic back to 2.6.4, then Scarthgap will follow. Is this an option? - Armin
As far as I know master works now, so a revert would make no sense in that case.
Hi Armin
scarthgap is relatively new and I think I would be in favor of making an exception for this one case.
Quoted 15 lines
Quoted 6 lines
Quoted 5 lines
Regards,
Frank-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#111509): https://lists.openembedded.org/g/openembedded-devel/message/111509
Mute This Topic: https://lists.openembedded.org/mt/107073841/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 35 lines · Khem Raj
Quoted 32 lines · Frank de Brabander via lists.openembedded.org
Quoted 32 lines
Op 3 aug 2024 om 18:51 heeft akuster808 <[email protected]> het volgende geschreven:
Quoted 9 lines · Frank de Brabander
I was unaware of this discussion when I created the fix for master. Note that I've silenced the TMPDIR QA message, this still needs a proper fix in master as well.
This indeed needs to be fixed in scarthgap as well, since the incompatible versions do break some code. My two cents for the available options:
Quoted 8 lines
- Revert pydantic upgrade (from 2.7.0 back to 2.6.4)
- Update pydantic-core to 2.18.1
- Use master (pydantic 2.7.3 and pydantic-core 2.18.4)Would only downgrade if this is the *only* allowed option according to the LTS branch policy. Version 2.7.x includes new features compared to 2.6.4. Removing these with a downgrade would violate the LTS patch policy of not merging "ABI/API breakage".
We have had this type of situation with a pkg (A) update in master and then new lts was branched. We found out other later additional pkgs needed to updated to work with pkg (A). pydantic update was in Master before scarthgap was branched.
Quoted 5 lines
Option 2 or 3 are my preferred choices and they fall within the "fixes for bugs" category of the LTS patch policy. Option 2 is the smallest change to fix the problem, but option 3 includes some additional upstream fixes with the update from 2.7.0 to 2.7.3.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Master should be failing so if Master gets a revert of pydantic back to 2.6.4, then Scarthgap will follow. Is this an option? - Armin
As far as I know master works now, so a revert would make no sense in that case.
Hi Armin
scarthgap is relatively new and I think I would be in favor of making an exception for this one case.
Hi Khem,
thanks. Sounds good to me.
Do you prefer going to the same pydantic{,-core} version as master, or stick with 2.7.0 and update only pydantic-core to 2.18.1?.
regards;rl
Quoted 54 lines · Richard Leitner
Quoted 7 lines · Khem Raj
Quoted 4 lines · Frank de Brabander via lists.openembedded.org
Quoted 4 lines
Op 3 aug 2024 om 18:51 heeft akuster808 <[email protected]> het
volgende geschreven:
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 7 lines · Frank de Brabander
I was unaware of this discussion when I created the fix for master. Note that I've silenced the TMPDIR QA message, this still needs a proper fix in master as well.
This indeed needs to be fixed in scarthgap as well, since the incompatible versions do break some code. My two cents for the
available
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
options:
- Revert pydantic upgrade (from 2.7.0 back to 2.6.4)
- Update pydantic-core to 2.18.1
- Use master (pydantic 2.7.3 and pydantic-core 2.18.4)Would only downgrade if this is the *only* allowed option according
to
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
the LTS branch policy. Version 2.7.x includes new features compared
to
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
2.6.4. Removing these with a downgrade would violate the LTS patch
policy
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
of not merging "ABI/API breakage".
We have had this type of situation with a pkg (A) update in master
and then new lts was branched. We found out other later additional pkgs needed to updated to work with pkg (A). pydantic update was in Master before scarthgap was branched.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Option 2 or 3 are my preferred choices and they fall within the "fixes for bugs" category of the LTS patch policy. Option 2 is the
smallest
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
change to fix the problem, but option 3 includes some additional
upstream
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
fixes with the update from 2.7.0 to 2.7.3.
Master should be failing so if Master gets a revert of pydantic back
to 2.6.4, then Scarthgap will follow. Is this an option? - Armin
Quoted 2 lines
Quoted 2 lines
As far as I know master works now, so a revert would make no sense in
that case.
Quoted 3 lines
Hi Armin
Quoted 9 lines
Quoted 2 lines
scarthgap is relatively new and I think I would be in favor of making an exception for this one case.
Hi Khem,
thanks. Sounds good to me.Do you prefer going to the same pydantic{,-core} version as master, or stick with 2.7.0 and update only pydantic-core to 2.18.1?.
Best is to use the one that will work in tandem well if that would be newer one from master than we might have to bring that too
Quoted 3 lines
regards;rl
I will prepare a series to fix this once and for all in scarthgap. Please hold on for a day or so.
Thank you to everyone that has been trying to work on this unfortunate situation.
Quoted 86 lines · Khem Raj via lists.openembedded.org
Quoted 54 lines · Richard Leitner
Quoted 7 lines · Khem Raj
Quoted 4 lines · Frank de Brabander via lists.openembedded.org
Quoted 4 lines
Op 3 aug 2024 om 18:51 heeft akuster808 <[email protected]> het
volgende geschreven:
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 7 lines · Frank de Brabander
I was unaware of this discussion when I created the fix for master. Note that I've silenced the TMPDIR QA message, this still needs a proper fix in master as well.
This indeed needs to be fixed in scarthgap as well, since the incompatible versions do break some code. My two cents for the
available
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
options:
- Revert pydantic upgrade (from 2.7.0 back to 2.6.4)
- Update pydantic-core to 2.18.1
- Use master (pydantic 2.7.3 and pydantic-core 2.18.4)Would only downgrade if this is the *only* allowed option
according to
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
the LTS branch policy. Version 2.7.x includes new features
compared to
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
2.6.4. Removing these with a downgrade would violate the LTS patch
policy
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
of not merging "ABI/API breakage".
We have had this type of situation with a pkg (A) update in master
and then new lts was branched. We found out other later additional pkgs needed to updated to work with pkg (A). pydantic update was in Master before scarthgap was branched.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Option 2 or 3 are my preferred choices and they fall within the "fixes for bugs" category of the LTS patch policy. Option 2 is the
smallest
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
change to fix the problem, but option 3 includes some additional
upstream
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
fixes with the update from 2.7.0 to 2.7.3.
Master should be failing so if Master gets a revert of pydantic
back to 2.6.4, then Scarthgap will follow. Is this an option? - Armin
Quoted 2 lines
Quoted 2 lines
As far as I know master works now, so a revert would make no sense in
that case.
Quoted 3 lines
Hi Armin
Quoted 9 lines
Quoted 2 lines
scarthgap is relatively new and I think I would be in favor of making an exception for this one case.
Hi Khem,
thanks. Sounds good to me.Do you prefer going to the same pydantic{,-core} version as master, or stick with 2.7.0 and update only pydantic-core to 2.18.1?.
Best is to use the one that will work in tandem well if that would be newer one from master than we might have to bring that too
Quoted 3 lines
regards;rl
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#111677):
https://lists.openembedded.org/g/openembedded-devel/message/111677
Mute This Topic: https://lists.openembedded.org/mt/107073841/924729
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 31 lines · Khem Raj
Quoted 28 lines · Frank de Brabander via lists.openembedded.org
Quoted 28 lines
Op 3 aug 2024 om 18:51 heeft akuster808 <[email protected]> het volgende geschreven:
Quoted 9 lines · Frank de Brabander
I was unaware of this discussion when I created the fix for master. Note that I've silenced the TMPDIR QA message, this still needs a proper fix in master as well.
This indeed needs to be fixed in scarthgap as well, since the incompatible versions do break some code. My two cents for the available options:
Quoted 8 lines
- Revert pydantic upgrade (from 2.7.0 back to 2.6.4)
- Update pydantic-core to 2.18.1
- Use master (pydantic 2.7.3 and pydantic-core 2.18.4)Would only downgrade if this is the *only* allowed option according to the LTS branch policy. Version 2.7.x includes new features compared to 2.6.4. Removing these with a downgrade would violate the LTS patch policy of not merging "ABI/API breakage".
We have had this type of situation with a pkg (A) update in master and then new lts was branched. We found out other later additional pkgs needed to updated to work with pkg (A). pydantic update was in Master before scarthgap was branched.
Quoted 4 lines
Option 2 or 3 are my preferred choices and they fall within the "fixes for bugs" category of the LTS patch policy. Option 2 is the smallest change to fix the problem, but option 3 includes some additional upstream fixes with the update from 2.7.0 to 2.7.3.
Quoted 6 lines
Quoted 2 lines
Quoted 1 line
Master should be failing so if Master gets a revert of pydantic back to 2.6.4, then Scarthgap will follow. Is this an option? - Armin
As far as I know master works now, so a revert would make no sense in that case.
Hi Armin
scarthgap is relatively new and I think I would be in favor of making an exception for this one case.
Well since scarthgap got the pydantic update before release, updating pydantic-core is reasonable. I see Tim is working on the update and will wait for him to request a merge. BR, Armin
Quoted 12 lines
Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
Regards,
Frank-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#111509): https://lists.openembedded.org/g/openembedded-devel/message/111509
Mute This Topic: https://lists.openembedded.org/mt/107073841/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 46 lines · Armin Kuster via lists.openembedded.org
Quoted 6 lines · Khem Raj
Quoted 3 lines · Frank de Brabander via lists.openembedded.org
Quoted 3 lines
Op 3 aug 2024 om 18:51 heeft akuster808 <[email protected]> het
volgende geschreven:
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 7 lines · Frank de Brabander
I was unaware of this discussion when I created the fix for master. Note that I've silenced the TMPDIR QA message, this still needs a proper fix in master as well.
This indeed needs to be fixed in scarthgap as well, since the incompatible versions do break some code. My two cents for the
available
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
options:
- Revert pydantic upgrade (from 2.7.0 back to 2.6.4)
- Update pydantic-core to 2.18.1
- Use master (pydantic 2.7.3 and pydantic-core 2.18.4)Would only downgrade if this is the *only* allowed option according to the LTS branch policy. Version 2.7.x includes new features compared to 2.6.4. Removing these with a downgrade would violate the LTS patch
policy
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
of not merging "ABI/API breakage".
We have had this type of situation with a pkg (A) update in master and
then new lts was branched. We found out other later additional pkgs needed to updated to work with pkg (A). pydantic update was in Master before scarthgap was branched.
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Option 2 or 3 are my preferred choices and they fall within the "fixes for bugs" category of the LTS patch policy. Option 2 is the
smallest
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
change to fix the problem, but option 3 includes some additional
upstream
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
fixes with the update from 2.7.0 to 2.7.3.
Master should be failing so if Master gets a revert of pydantic back
to 2.6.4, then Scarthgap will follow. Is this an option? - Armin
Quoted 1 line
Quoted 1 line
As far as I know master works now, so a revert would make no sense in
that case.
Quoted 9 lines
Quoted 4 lines
Hi Armin
scarthgap is relatively new and I think I would be in favor of making an exception for this one case.
Well since scarthgap got the pydantic update before release, updating pydantic-core is reasonable. I see Tim is working on the update and will wait for him to request a merge. BR, Armin
I nearly took this version, but there were several complications in applying patches. I opted for cherry-picking as much as possible from master since that is a more typical pattern. This patch was superseded by:
https://lore.kernel.org/openembedded-devel/eac1c83ac65b72f3469a3f875cd0cf1b9a2a5d6d.1723432397.git.tim.orling@konsulko.com/
Given we were in a completely non-functional, broken situation, and 2.18.1 was never merged to master, I opted for taking 2.18.4 and that drove the upgrade of python3-pydantic itself beyond this version.
Thank you for all the work on this unfortunate situation.
--Tim
Quoted 19 lines
Quoted 6 lines
Quoted 6 lines
Quoted 4 lines
Quoted 4 lines
Regards,
Frank-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#111736):
https://lists.openembedded.org/g/openembedded-devel/message/111736
Mute This Topic: https://lists.openembedded.org/mt/107073841/924729
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
So now that master is updated, what are the ideas for fixing the incompatibility issues with pydantic amd pydantic-core for the scarthgap branch?
Regards,
Frank
Quoted 5 lines · Frank de Brabander
So now that master is updated, what are the ideas for fixing the incompatibility issues with pydantic amd pydantic-core for the scarthgap branch?
I submitted the series which is the plan:
https://lore.kernel.org/openembedded-devel/[email protected]/T/#t
and Armin has it staged:
https://git.openembedded.org/meta-openembedded-contrib/log/?h=stable/scarthgap-nut
So folks can comment on the patch series, but ultimately it is in Armin's hands to determine his "stable/scarthgap-nut" branch is ready and then he will ask Khem to merge it. This is the normal process for stable branches under the meta-openembedded umbrella.
Quoted 2 lines
Regards,
Frank