From 5f50b4500ce0cfded460fc6832ee8cef883cfb8d Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Fri, 21 Jul 2023 10:22:03 -0400 Subject: [PATCH 01/20] Target MUSL when building Rust projects on CentOS 6 --- omnibus/config/software/datadog-agent-integrations-py2.rb | 5 +++++ omnibus/config/software/datadog-agent-integrations-py3.rb | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/omnibus/config/software/datadog-agent-integrations-py2.rb b/omnibus/config/software/datadog-agent-integrations-py2.rb index e619567a7c205..4c09f92645c27 100644 --- a/omnibus/config/software/datadog-agent-integrations-py2.rb +++ b/omnibus/config/software/datadog-agent-integrations-py2.rb @@ -172,6 +172,11 @@ "aerospike" => nix_build_env.merge({"EXT_CFLAGS" => nix_build_env["CFLAGS"] + " -std=gnu99"}), } + # RPM builds are done on CentOS 6 which is based on glibc v2.12 however newer libraries require v2.17, see: + # https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html + if redhat? + nix_build_env["CARGO_BUILD_TARGET"] = "x86_64-unknown-linux-musl" + end # On Linux & Windows, specify the C99 standard explicitly to avoid issues while building some # wheels (eg. ddtrace). diff --git a/omnibus/config/software/datadog-agent-integrations-py3.rb b/omnibus/config/software/datadog-agent-integrations-py3.rb index f76553ec18215..a908313c2fe9e 100644 --- a/omnibus/config/software/datadog-agent-integrations-py3.rb +++ b/omnibus/config/software/datadog-agent-integrations-py3.rb @@ -181,6 +181,12 @@ "aerospike" => nix_build_env.merge({"EXT_CFLAGS" => nix_build_env["CFLAGS"] + " -std=gnu99"}), } + # RPM builds are done on CentOS 6 which is based on glibc v2.12 however newer libraries require v2.17, see: + # https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html + if redhat? + nix_build_env["CARGO_BUILD_TARGET"] = "x86_64-unknown-linux-musl" + end + # On Linux & Windows, specify the C99 standard explicitly to avoid issues while building some # wheels (eg. ddtrace). # Not explicitly setting that option has caused us problems in the past on SUSE, where the ddtrace From 092f8f3cf73e8ac3f0f2adf516288dadbe99b906 Mon Sep 17 00:00:00 2001 From: Florent Clarret Date: Mon, 24 Jul 2023 11:29:22 +0200 Subject: [PATCH 02/20] update -core branch --- release.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release.json b/release.json index a055fc8fe7201..d403f2f12bdd1 100644 --- a/release.json +++ b/release.json @@ -5,7 +5,7 @@ "7": "7.46.0" }, "nightly": { - "INTEGRATIONS_CORE_VERSION": "master", + "INTEGRATIONS_CORE_VERSION": "florentclarret/pydantic", "OMNIBUS_SOFTWARE_VERSION": "master", "OMNIBUS_RUBY_VERSION": "datadog-5.5.0", "JMXFETCH_VERSION": "0.47.9", @@ -17,7 +17,7 @@ "SECURITY_AGENT_POLICIES_VERSION": "master" }, "nightly-a7": { - "INTEGRATIONS_CORE_VERSION": "master", + "INTEGRATIONS_CORE_VERSION": "florentclarret/pydantic", "OMNIBUS_SOFTWARE_VERSION": "master", "OMNIBUS_RUBY_VERSION": "datadog-5.5.0", "JMXFETCH_VERSION": "0.47.9", @@ -82,4 +82,4 @@ "dca-1.9.0": { "SECURITY_AGENT_POLICIES_VERSION": "v0.3" } -} \ No newline at end of file +} From b0e6bf053dda60b7443e45024065a47f53f1d268 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Mon, 24 Jul 2023 11:42:07 -0400 Subject: [PATCH 03/20] build pydantic-core from source --- .../pydantic-core-build-for-manylinux1.patch | 32 +++++++++++++++++++ .../datadog-agent-integrations-py2.rb | 6 ---- .../datadog-agent-integrations-py3.rb | 12 ++++--- omnibus/config/software/pydantic-core-py3.rb | 29 +++++++++++++++++ 4 files changed, 68 insertions(+), 11 deletions(-) create mode 100644 omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch create mode 100644 omnibus/config/software/pydantic-core-py3.rb diff --git a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch new file mode 100644 index 0000000000000..cfbcf9b0664e8 --- /dev/null +++ b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch @@ -0,0 +1,32 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 20130ab..0c8f467 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -50,7 +50,6 @@ crate-type = ["cdylib", "rlib"] + [features] + # must be enabled when building with `cargo build`, maturin enables this automatically + extension-module = ["pyo3/extension-module"] +-default = ["mimalloc"] + + [profile.release] + lto = "fat" +diff --git a/pyproject.toml b/pyproject.toml +index 44f074a..a233ce8 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,6 +1,6 @@ + [build-system] + requires = [ +- 'maturin>=1,<2', ++ 'maturin[zig]>=1,<2', + 'typing-extensions >=4.6.0; platform_python_implementation != "PyPy"', + 'typing-extensions >=4.6.0,<4.7.0; platform_python_implementation == "PyPy"' + ] +@@ -53,6 +53,7 @@ python-source = "python" + module-name = "pydantic_core._pydantic_core" + bindings = 'pyo3' + features = ["pyo3/extension-module"] ++compatibility = "manylinux1" + + [tool.ruff] + line-length = 120 diff --git a/omnibus/config/software/datadog-agent-integrations-py2.rb b/omnibus/config/software/datadog-agent-integrations-py2.rb index 4c09f92645c27..68984963c6f19 100644 --- a/omnibus/config/software/datadog-agent-integrations-py2.rb +++ b/omnibus/config/software/datadog-agent-integrations-py2.rb @@ -172,12 +172,6 @@ "aerospike" => nix_build_env.merge({"EXT_CFLAGS" => nix_build_env["CFLAGS"] + " -std=gnu99"}), } - # RPM builds are done on CentOS 6 which is based on glibc v2.12 however newer libraries require v2.17, see: - # https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html - if redhat? - nix_build_env["CARGO_BUILD_TARGET"] = "x86_64-unknown-linux-musl" - end - # On Linux & Windows, specify the C99 standard explicitly to avoid issues while building some # wheels (eg. ddtrace). # Not explicitly setting that option has caused us problems in the past on SUSE, where the ddtrace diff --git a/omnibus/config/software/datadog-agent-integrations-py3.rb b/omnibus/config/software/datadog-agent-integrations-py3.rb index a908313c2fe9e..b2580e2bfc215 100644 --- a/omnibus/config/software/datadog-agent-integrations-py3.rb +++ b/omnibus/config/software/datadog-agent-integrations-py3.rb @@ -99,6 +99,13 @@ blacklist_packages.push(/^pymqi==/) end +if redhat? + # RPM builds are done on CentOS 6 which is based on glibc v2.12 however newer libraries require v2.17, see: + # https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html + dependency 'pydantic-core-py3' + blacklist_packages.push(/^pydantic-core==/) +end + # _64_bit checks the kernel arch. On windows, the builder is 64 bit # even when doing a 32 bit build. Do a specific check for the 32 bit # build @@ -181,11 +188,6 @@ "aerospike" => nix_build_env.merge({"EXT_CFLAGS" => nix_build_env["CFLAGS"] + " -std=gnu99"}), } - # RPM builds are done on CentOS 6 which is based on glibc v2.12 however newer libraries require v2.17, see: - # https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html - if redhat? - nix_build_env["CARGO_BUILD_TARGET"] = "x86_64-unknown-linux-musl" - end # On Linux & Windows, specify the C99 standard explicitly to avoid issues while building some # wheels (eg. ddtrace). diff --git a/omnibus/config/software/pydantic-core-py3.rb b/omnibus/config/software/pydantic-core-py3.rb new file mode 100644 index 0000000000000..aaa2500bee3a2 --- /dev/null +++ b/omnibus/config/software/pydantic-core-py3.rb @@ -0,0 +1,29 @@ +# We need to build the pydantic-core wheel separately because this is the only way to build +# it on CentOS 6. +# manylinux2014 wheels (min. requirement: glibc 2.17) do not support CentOS 6 (glibc 2.12). + +name "pydantic-core-py3" +default_version "2.0.1" + +dependency "pip3" + +source :url => "https://github.com/pydantic/pydantic-core/archive/refs/tags/v#{version}.tar.gz", + :sha256 => "2595fb6e4554af6c4cdf7712b10fb2f1be254955d34fd449038a7d246f6cf1f4", + :extract => :seven_zip + +relative_path "pydantic-core-#{version}" + +build do + license "MIT" + license_file "./LICENSE" + + patch :source => "pydantic-core-build-for-manylinux1.patch" + + if windows? + pip = "#{windows_safe_path(python_3_embedded)}\\Scripts\\pip.exe" + else + pip = "#{install_dir}/embedded/bin/pip3" + end + + command "#{pip} install --no-deps ." +end From 4213c7040947160b5dad61c667a5e96e9f7b4e22 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Tue, 25 Jul 2023 13:11:55 -0400 Subject: [PATCH 04/20] trigger --- omnibus/config/software/datadog-agent-integrations-py2.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/omnibus/config/software/datadog-agent-integrations-py2.rb b/omnibus/config/software/datadog-agent-integrations-py2.rb index 68984963c6f19..e619567a7c205 100644 --- a/omnibus/config/software/datadog-agent-integrations-py2.rb +++ b/omnibus/config/software/datadog-agent-integrations-py2.rb @@ -172,6 +172,7 @@ "aerospike" => nix_build_env.merge({"EXT_CFLAGS" => nix_build_env["CFLAGS"] + " -std=gnu99"}), } + # On Linux & Windows, specify the C99 standard explicitly to avoid issues while building some # wheels (eg. ddtrace). # Not explicitly setting that option has caused us problems in the past on SUSE, where the ddtrace From aa9bdcc4d920d39610252cbf0447ef2d89910ff9 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 26 Jul 2023 09:45:01 -0400 Subject: [PATCH 05/20] Update pydantic-core-build-for-manylinux1.patch --- .../pydantic-core-build-for-manylinux1.patch | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch index cfbcf9b0664e8..f611015d247aa 100644 --- a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch +++ b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch @@ -1,3 +1,14 @@ +diff --git a/.cargo/config.toml b/.cargo/config.toml +index f0ba8af..4d1bdb0 100644 +--- a/.cargo/config.toml ++++ b/.cargo/config.toml +@@ -13,3 +13,6 @@ rustflags = [ + "-C", "link-arg=-undefined", + "-C", "link-arg=dynamic_lookup", + ] ++ ++[patch.crates-io] ++speedate = { git = 'https://github.com/DataDog/speedate.git', branch = 'support-old-nightly' } diff --git a/Cargo.toml b/Cargo.toml index 20130ab..0c8f467 100644 --- a/Cargo.toml @@ -7,7 +18,7 @@ index 20130ab..0c8f467 100644 # must be enabled when building with `cargo build`, maturin enables this automatically extension-module = ["pyo3/extension-module"] -default = ["mimalloc"] - + [profile.release] lto = "fat" diff --git a/pyproject.toml b/pyproject.toml @@ -27,6 +38,6 @@ index 44f074a..a233ce8 100644 bindings = 'pyo3' features = ["pyo3/extension-module"] +compatibility = "manylinux1" - + [tool.ruff] line-length = 120 From ad50ea0d57204071a0cbaedc07eb0da929bfcd03 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 26 Jul 2023 10:52:33 -0400 Subject: [PATCH 06/20] upgrade --- .../pydantic-core-build-for-manylinux1.patch | 17 +++++++++-------- omnibus/config/software/pydantic-core-py3.rb | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch index f611015d247aa..4d94a3e61f23d 100644 --- a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch +++ b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch @@ -1,19 +1,20 @@ diff --git a/.cargo/config.toml b/.cargo/config.toml -index f0ba8af..4d1bdb0 100644 +index f0ba8af..f0601ff 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml -@@ -13,3 +13,6 @@ rustflags = [ +@@ -13,3 +13,7 @@ rustflags = [ "-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup", ] + +[patch.crates-io] +speedate = { git = 'https://github.com/DataDog/speedate.git', branch = 'support-old-nightly' } ++pyo3 = { git = 'https://github.com/DataDog/pyo3.git', branch = 'support-old-nightly' } diff --git a/Cargo.toml b/Cargo.toml -index 20130ab..0c8f467 100644 +index 1cfdba5..058325c 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -50,7 +50,6 @@ crate-type = ["cdylib", "rlib"] +@@ -52,7 +52,6 @@ crate-type = ["cdylib", "rlib"] [features] # must be enabled when building with `cargo build`, maturin enables this automatically extension-module = ["pyo3/extension-module"] @@ -22,7 +23,7 @@ index 20130ab..0c8f467 100644 [profile.release] lto = "fat" diff --git a/pyproject.toml b/pyproject.toml -index 44f074a..a233ce8 100644 +index 1602e32..0278c38 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ @@ -30,10 +31,10 @@ index 44f074a..a233ce8 100644 requires = [ - 'maturin>=1,<2', + 'maturin[zig]>=1,<2', - 'typing-extensions >=4.6.0; platform_python_implementation != "PyPy"', - 'typing-extensions >=4.6.0,<4.7.0; platform_python_implementation == "PyPy"' + 'typing-extensions >=4.6.0,!=4.7.0' ] -@@ -53,6 +53,7 @@ python-source = "python" + build-backend = 'maturin' +@@ -52,6 +52,7 @@ python-source = "python" module-name = "pydantic_core._pydantic_core" bindings = 'pyo3' features = ["pyo3/extension-module"] diff --git a/omnibus/config/software/pydantic-core-py3.rb b/omnibus/config/software/pydantic-core-py3.rb index aaa2500bee3a2..0552462707a29 100644 --- a/omnibus/config/software/pydantic-core-py3.rb +++ b/omnibus/config/software/pydantic-core-py3.rb @@ -3,12 +3,12 @@ # manylinux2014 wheels (min. requirement: glibc 2.17) do not support CentOS 6 (glibc 2.12). name "pydantic-core-py3" -default_version "2.0.1" +default_version "2.4.0" dependency "pip3" source :url => "https://github.com/pydantic/pydantic-core/archive/refs/tags/v#{version}.tar.gz", - :sha256 => "2595fb6e4554af6c4cdf7712b10fb2f1be254955d34fd449038a7d246f6cf1f4", + :sha256 => "94b4ef19df7e0ea5e9f32590afc3673dab0d9855ed786d3dc95513124d842874", :extract => :seven_zip relative_path "pydantic-core-#{version}" From 86018e5411b3b7a10f9b217e64f0a81399b781a2 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 26 Jul 2023 11:49:03 -0400 Subject: [PATCH 07/20] Update pydantic-core-build-for-manylinux1.patch --- .../pydantic-core-build-for-manylinux1.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch index 4d94a3e61f23d..e7c9dd338b905 100644 --- a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch +++ b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch @@ -1,8 +1,8 @@ diff --git a/.cargo/config.toml b/.cargo/config.toml -index f0ba8af..f0601ff 100644 +index f0ba8af..5e5b3a0 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml -@@ -13,3 +13,7 @@ rustflags = [ +@@ -13,3 +13,8 @@ rustflags = [ "-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup", ] @@ -10,6 +10,7 @@ index f0ba8af..f0601ff 100644 +[patch.crates-io] +speedate = { git = 'https://github.com/DataDog/speedate.git', branch = 'support-old-nightly' } +pyo3 = { git = 'https://github.com/DataDog/pyo3.git', branch = 'support-old-nightly' } ++hashbrown = { git = 'https://github.com/DataDog/hashbrown.git', branch = 'support-old-nightly' } diff --git a/Cargo.toml b/Cargo.toml index 1cfdba5..058325c 100644 --- a/Cargo.toml From ce06bc99c23a3459a4be201a95ee1d86dc0a7ad7 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 26 Jul 2023 12:34:31 -0400 Subject: [PATCH 08/20] Update pydantic-core-build-for-manylinux1.patch --- .../pydantic-core-build-for-manylinux1.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch index e7c9dd338b905..f42c86d42b595 100644 --- a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch +++ b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch @@ -1,8 +1,8 @@ diff --git a/.cargo/config.toml b/.cargo/config.toml -index f0ba8af..5e5b3a0 100644 +index f0ba8af..75f0cfc 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml -@@ -13,3 +13,8 @@ rustflags = [ +@@ -13,3 +13,9 @@ rustflags = [ "-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup", ] @@ -11,6 +11,7 @@ index f0ba8af..5e5b3a0 100644 +speedate = { git = 'https://github.com/DataDog/speedate.git', branch = 'support-old-nightly' } +pyo3 = { git = 'https://github.com/DataDog/pyo3.git', branch = 'support-old-nightly' } +hashbrown = { git = 'https://github.com/DataDog/hashbrown.git', branch = 'support-old-nightly' } ++indexmap = { git = 'https://github.com/DataDog/indexmap.git', branch = 'support-old-nightly' } diff --git a/Cargo.toml b/Cargo.toml index 1cfdba5..058325c 100644 --- a/Cargo.toml From 7e7ca13dc3f496dc2fefd12c260215d083848804 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 26 Jul 2023 13:22:08 -0400 Subject: [PATCH 09/20] Update pydantic-core-build-for-manylinux1.patch --- .../pydantic-core-build-for-manylinux1.patch | 652 ++++++++++++++++++ 1 file changed, 652 insertions(+) diff --git a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch index f42c86d42b595..9d2dafc4b12fc 100644 --- a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch +++ b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch @@ -12,6 +12,658 @@ index f0ba8af..75f0cfc 100644 +pyo3 = { git = 'https://github.com/DataDog/pyo3.git', branch = 'support-old-nightly' } +hashbrown = { git = 'https://github.com/DataDog/hashbrown.git', branch = 'support-old-nightly' } +indexmap = { git = 'https://github.com/DataDog/indexmap.git', branch = 'support-old-nightly' } +diff --git a/Cargo.lock b/Cargo.lock +deleted file mode 100644 +index 3f685e6..0000000 +--- a/Cargo.lock ++++ /dev/null +@@ -1,646 +0,0 @@ +-# This file is automatically @generated by Cargo. +-# It is not intended for manual editing. +-version = 3 +- +-[[package]] +-name = "ahash" +-version = "0.8.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +-dependencies = [ +- "cfg-if", +- "getrandom", +- "once_cell", +- "version_check", +-] +- +-[[package]] +-name = "aho-corasick" +-version = "1.0.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +-dependencies = [ +- "memchr", +-] +- +-[[package]] +-name = "autocfg" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +- +-[[package]] +-name = "base64" +-version = "0.21.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +- +-[[package]] +-name = "bitflags" +-version = "1.3.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +- +-[[package]] +-name = "cc" +-version = "1.0.79" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +- +-[[package]] +-name = "cfg-if" +-version = "1.0.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +- +-[[package]] +-name = "enum_dispatch" +-version = "0.3.12" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +-dependencies = [ +- "once_cell", +- "proc-macro2", +- "quote", +- "syn 2.0.25", +-] +- +-[[package]] +-name = "equivalent" +-version = "1.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +- +-[[package]] +-name = "form_urlencoded" +-version = "1.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +-dependencies = [ +- "percent-encoding", +-] +- +-[[package]] +-name = "getrandom" +-version = "0.2.10" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +-dependencies = [ +- "cfg-if", +- "libc", +- "wasi", +-] +- +-[[package]] +-name = "hashbrown" +-version = "0.14.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +- +-[[package]] +-name = "heck" +-version = "0.4.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +- +-[[package]] +-name = "idna" +-version = "0.4.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +-dependencies = [ +- "unicode-bidi", +- "unicode-normalization", +-] +- +-[[package]] +-name = "indexmap" +-version = "2.0.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +-dependencies = [ +- "equivalent", +- "hashbrown", +-] +- +-[[package]] +-name = "indoc" +-version = "1.0.9" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +- +-[[package]] +-name = "itoa" +-version = "1.0.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +- +-[[package]] +-name = "libc" +-version = "0.2.147" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +- +-[[package]] +-name = "libmimalloc-sys" +-version = "0.1.33" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" +-dependencies = [ +- "cc", +- "libc", +-] +- +-[[package]] +-name = "lock_api" +-version = "0.4.10" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +-dependencies = [ +- "autocfg", +- "scopeguard", +-] +- +-[[package]] +-name = "memchr" +-version = "2.5.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +- +-[[package]] +-name = "memoffset" +-version = "0.9.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +-dependencies = [ +- "autocfg", +-] +- +-[[package]] +-name = "mimalloc" +-version = "0.1.37" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" +-dependencies = [ +- "libmimalloc-sys", +-] +- +-[[package]] +-name = "num-bigint" +-version = "0.4.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +-dependencies = [ +- "autocfg", +- "num-integer", +- "num-traits", +-] +- +-[[package]] +-name = "num-integer" +-version = "0.1.45" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +-dependencies = [ +- "autocfg", +- "num-traits", +-] +- +-[[package]] +-name = "num-traits" +-version = "0.2.15" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +-dependencies = [ +- "autocfg", +-] +- +-[[package]] +-name = "once_cell" +-version = "1.18.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +- +-[[package]] +-name = "parking_lot" +-version = "0.12.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +-dependencies = [ +- "lock_api", +- "parking_lot_core", +-] +- +-[[package]] +-name = "parking_lot_core" +-version = "0.9.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +-dependencies = [ +- "cfg-if", +- "libc", +- "redox_syscall", +- "smallvec", +- "windows-targets", +-] +- +-[[package]] +-name = "percent-encoding" +-version = "2.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +- +-[[package]] +-name = "proc-macro2" +-version = "1.0.64" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +-dependencies = [ +- "unicode-ident", +-] +- +-[[package]] +-name = "pydantic-core" +-version = "2.4.0" +-dependencies = [ +- "ahash", +- "base64", +- "enum_dispatch", +- "idna", +- "mimalloc", +- "num-bigint", +- "pyo3", +- "pyo3-build-config", +- "python3-dll-a", +- "regex", +- "serde", +- "serde_json", +- "speedate", +- "strum", +- "strum_macros", +- "url", +- "uuid", +- "version_check", +-] +- +-[[package]] +-name = "pyo3" +-version = "0.19.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59" +-dependencies = [ +- "cfg-if", +- "indoc", +- "libc", +- "memoffset", +- "num-bigint", +- "parking_lot", +- "pyo3-build-config", +- "pyo3-ffi", +- "pyo3-macros", +- "unindent", +-] +- +-[[package]] +-name = "pyo3-build-config" +-version = "0.19.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" +-dependencies = [ +- "once_cell", +- "python3-dll-a", +- "target-lexicon", +-] +- +-[[package]] +-name = "pyo3-ffi" +-version = "0.19.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4" +-dependencies = [ +- "libc", +- "pyo3-build-config", +-] +- +-[[package]] +-name = "pyo3-macros" +-version = "0.19.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2" +-dependencies = [ +- "proc-macro2", +- "pyo3-macros-backend", +- "quote", +- "syn 1.0.109", +-] +- +-[[package]] +-name = "pyo3-macros-backend" +-version = "0.19.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn 1.0.109", +-] +- +-[[package]] +-name = "python3-dll-a" +-version = "0.2.9" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d5f07cd4412be8fa09a721d40007c483981bbe072cd6a21f2e83e04ec8f8343f" +-dependencies = [ +- "cc", +-] +- +-[[package]] +-name = "quote" +-version = "1.0.29" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +-dependencies = [ +- "proc-macro2", +-] +- +-[[package]] +-name = "redox_syscall" +-version = "0.3.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +-dependencies = [ +- "bitflags", +-] +- +-[[package]] +-name = "regex" +-version = "1.9.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +-dependencies = [ +- "aho-corasick", +- "memchr", +- "regex-automata", +- "regex-syntax", +-] +- +-[[package]] +-name = "regex-automata" +-version = "0.3.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" +-dependencies = [ +- "aho-corasick", +- "memchr", +- "regex-syntax", +-] +- +-[[package]] +-name = "regex-syntax" +-version = "0.7.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +- +-[[package]] +-name = "rustversion" +-version = "1.0.13" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +- +-[[package]] +-name = "ryu" +-version = "1.0.14" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +- +-[[package]] +-name = "scopeguard" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +- +-[[package]] +-name = "serde" +-version = "1.0.175" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" +-dependencies = [ +- "serde_derive", +-] +- +-[[package]] +-name = "serde_derive" +-version = "1.0.175" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn 2.0.25", +-] +- +-[[package]] +-name = "serde_json" +-version = "1.0.103" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +-dependencies = [ +- "indexmap", +- "itoa", +- "ryu", +- "serde", +-] +- +-[[package]] +-name = "smallvec" +-version = "1.11.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +- +-[[package]] +-name = "speedate" +-version = "0.11.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e54e4ea42510cf6cb46223f6974670faf58ef49e82040e924a295aa3f0c8eaa2" +-dependencies = [ +- "strum", +- "strum_macros", +-] +- +-[[package]] +-name = "strum" +-version = "0.25.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +-dependencies = [ +- "strum_macros", +-] +- +-[[package]] +-name = "strum_macros" +-version = "0.25.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" +-dependencies = [ +- "heck", +- "proc-macro2", +- "quote", +- "rustversion", +- "syn 2.0.25", +-] +- +-[[package]] +-name = "syn" +-version = "1.0.109" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +-dependencies = [ +- "proc-macro2", +- "quote", +- "unicode-ident", +-] +- +-[[package]] +-name = "syn" +-version = "2.0.25" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" +-dependencies = [ +- "proc-macro2", +- "quote", +- "unicode-ident", +-] +- +-[[package]] +-name = "target-lexicon" +-version = "0.12.9" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" +- +-[[package]] +-name = "tinyvec" +-version = "1.6.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +-dependencies = [ +- "tinyvec_macros", +-] +- +-[[package]] +-name = "tinyvec_macros" +-version = "0.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +- +-[[package]] +-name = "unicode-bidi" +-version = "0.3.13" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +- +-[[package]] +-name = "unicode-ident" +-version = "1.0.10" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +- +-[[package]] +-name = "unicode-normalization" +-version = "0.1.22" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +-dependencies = [ +- "tinyvec", +-] +- +-[[package]] +-name = "unindent" +-version = "0.1.11" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +- +-[[package]] +-name = "url" +-version = "2.4.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +-dependencies = [ +- "form_urlencoded", +- "idna", +- "percent-encoding", +-] +- +-[[package]] +-name = "uuid" +-version = "1.4.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +- +-[[package]] +-name = "version_check" +-version = "0.9.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +- +-[[package]] +-name = "wasi" +-version = "0.11.0+wasi-snapshot-preview1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +- +-[[package]] +-name = "windows-targets" +-version = "0.48.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +-dependencies = [ +- "windows_aarch64_gnullvm", +- "windows_aarch64_msvc", +- "windows_i686_gnu", +- "windows_i686_msvc", +- "windows_x86_64_gnu", +- "windows_x86_64_gnullvm", +- "windows_x86_64_msvc", +-] +- +-[[package]] +-name = "windows_aarch64_gnullvm" +-version = "0.48.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +- +-[[package]] +-name = "windows_aarch64_msvc" +-version = "0.48.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +- +-[[package]] +-name = "windows_i686_gnu" +-version = "0.48.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +- +-[[package]] +-name = "windows_i686_msvc" +-version = "0.48.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +- +-[[package]] +-name = "windows_x86_64_gnu" +-version = "0.48.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +- +-[[package]] +-name = "windows_x86_64_gnullvm" +-version = "0.48.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +- +-[[package]] +-name = "windows_x86_64_msvc" +-version = "0.48.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/Cargo.toml b/Cargo.toml index 1cfdba5..058325c 100644 --- a/Cargo.toml From 82f9ddb2fa2f418be08bfe037a49425113ad8ee9 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 26 Jul 2023 14:47:18 -0400 Subject: [PATCH 10/20] Update pydantic-core-build-for-manylinux1.patch --- .../pydantic-core-build-for-manylinux1.patch | 825 +++++------------- 1 file changed, 219 insertions(+), 606 deletions(-) diff --git a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch index 9d2dafc4b12fc..a97431e900fc3 100644 --- a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch +++ b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch @@ -13,657 +13,270 @@ index f0ba8af..75f0cfc 100644 +hashbrown = { git = 'https://github.com/DataDog/hashbrown.git', branch = 'support-old-nightly' } +indexmap = { git = 'https://github.com/DataDog/indexmap.git', branch = 'support-old-nightly' } diff --git a/Cargo.lock b/Cargo.lock -deleted file mode 100644 -index 3f685e6..0000000 +index 3f685e6..23b85a6 100644 --- a/Cargo.lock -+++ /dev/null -@@ -1,646 +0,0 @@ --# This file is automatically @generated by Cargo. --# It is not intended for manual editing. --version = 3 -- --[[package]] --name = "ahash" --version = "0.8.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" --dependencies = [ -- "cfg-if", -- "getrandom", -- "once_cell", -- "version_check", --] -- --[[package]] --name = "aho-corasick" --version = "1.0.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" --dependencies = [ -- "memchr", --] -- --[[package]] --name = "autocfg" --version = "1.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -- --[[package]] --name = "base64" --version = "0.21.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" -- --[[package]] --name = "bitflags" --version = "1.3.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -- --[[package]] --name = "cc" --version = "1.0.79" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -- --[[package]] --name = "cfg-if" --version = "1.0.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -- --[[package]] --name = "enum_dispatch" --version = "0.3.12" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" --dependencies = [ -- "once_cell", -- "proc-macro2", -- "quote", ++++ b/Cargo.lock +@@ -62,7 +62,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", - "syn 2.0.25", --] -- --[[package]] --name = "equivalent" --version = "1.0.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -- --[[package]] --name = "form_urlencoded" --version = "1.2.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" --dependencies = [ -- "percent-encoding", --] -- --[[package]] --name = "getrandom" --version = "0.2.10" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" --dependencies = [ -- "cfg-if", -- "libc", -- "wasi", --] -- --[[package]] --name = "hashbrown" ++ "syn 2.0.27", + ] + + [[package]] +@@ -93,9 +93,8 @@ dependencies = [ + + [[package]] + name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" -- --[[package]] --name = "heck" --version = "0.4.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -- --[[package]] --name = "idna" --version = "0.4.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" --dependencies = [ -- "unicode-bidi", -- "unicode-normalization", --] -- --[[package]] --name = "indexmap" ++version = "0.13.2" ++source = "git+https://github.com/DataDog/hashbrown.git?branch=support-old-nightly#dcb854f861849e9ef23749601497242bdae276b5" + + [[package]] + name = "heck" +@@ -115,9 +114,8 @@ dependencies = [ + + [[package]] + name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" --dependencies = [ -- "equivalent", -- "hashbrown", --] -- --[[package]] --name = "indoc" --version = "1.0.9" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" -- --[[package]] --name = "itoa" ++version = "1.9.3" ++source = "git+https://github.com/DataDog/indexmap.git?branch=support-old-nightly#861fad73de14b7f08d2dc56ed83607aef621b42e" + dependencies = [ + "equivalent", + "hashbrown", +@@ -131,9 +129,9 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" + + [[package]] + name = "itoa" -version = "1.0.8" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "1.0.9" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" -- --[[package]] --name = "libc" --version = "0.2.147" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" -- --[[package]] --name = "libmimalloc-sys" --version = "0.1.33" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" --dependencies = [ -- "cc", -- "libc", --] -- --[[package]] --name = "lock_api" --version = "0.4.10" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" --dependencies = [ -- "autocfg", -- "scopeguard", --] -- --[[package]] --name = "memchr" --version = "2.5.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -- --[[package]] --name = "memoffset" --version = "0.9.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" --dependencies = [ -- "autocfg", --] -- --[[package]] --name = "mimalloc" --version = "0.1.37" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" --dependencies = [ -- "libmimalloc-sys", --] -- --[[package]] --name = "num-bigint" --version = "0.4.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" --dependencies = [ -- "autocfg", -- "num-integer", -- "num-traits", --] -- --[[package]] --name = "num-integer" --version = "0.1.45" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" --dependencies = [ -- "autocfg", -- "num-traits", --] -- --[[package]] --name = "num-traits" ++checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + + [[package]] + name = "libc" +@@ -208,9 +206,9 @@ dependencies = [ + + [[package]] + name = "num-traits" -version = "0.2.15" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "0.2.16" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" --dependencies = [ -- "autocfg", --] -- --[[package]] --name = "once_cell" --version = "1.18.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -- --[[package]] --name = "parking_lot" --version = "0.12.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" --dependencies = [ -- "lock_api", -- "parking_lot_core", --] -- --[[package]] --name = "parking_lot_core" --version = "0.9.8" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" --dependencies = [ -- "cfg-if", -- "libc", -- "redox_syscall", -- "smallvec", -- "windows-targets", --] -- --[[package]] --name = "percent-encoding" --version = "2.3.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" -- --[[package]] --name = "proc-macro2" ++checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" + dependencies = [ + "autocfg", + ] +@@ -252,9 +250,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + + [[package]] + name = "proc-macro2" -version = "1.0.64" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "1.0.66" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" --dependencies = [ -- "unicode-ident", --] -- --[[package]] --name = "pydantic-core" --version = "2.4.0" --dependencies = [ -- "ahash", -- "base64", -- "enum_dispatch", -- "idna", -- "mimalloc", -- "num-bigint", -- "pyo3", ++checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" + dependencies = [ + "unicode-ident", + ] +@@ -270,7 +268,7 @@ dependencies = [ + "mimalloc", + "num-bigint", + "pyo3", - "pyo3-build-config", -- "python3-dll-a", -- "regex", -- "serde", -- "serde_json", -- "speedate", -- "strum", -- "strum_macros", -- "url", -- "uuid", -- "version_check", --] -- --[[package]] --name = "pyo3" --version = "0.19.1" ++ "pyo3-build-config 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", + "python3-dll-a", + "regex", + "serde", +@@ -286,8 +284,7 @@ dependencies = [ + [[package]] + name = "pyo3" + version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59" --dependencies = [ -- "cfg-if", -- "indoc", -- "libc", -- "memoffset", -- "num-bigint", -- "parking_lot", ++source = "git+https://github.com/DataDog/pyo3.git?branch=support-old-nightly#782dcfa95ce95ef6306cd9c777ca3aee86b79fcc" + dependencies = [ + "cfg-if", + "indoc", +@@ -295,7 +292,7 @@ dependencies = [ + "memoffset", + "num-bigint", + "parking_lot", - "pyo3-build-config", -- "pyo3-ffi", -- "pyo3-macros", -- "unindent", --] -- --[[package]] --name = "pyo3-build-config" --version = "0.19.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" --dependencies = [ -- "once_cell", -- "python3-dll-a", -- "target-lexicon", --] -- --[[package]] --name = "pyo3-ffi" --version = "0.19.1" ++ "pyo3-build-config 0.19.1 (git+https://github.com/DataDog/pyo3.git?branch=support-old-nightly)", + "pyo3-ffi", + "pyo3-macros", + "unindent", +@@ -306,6 +303,15 @@ name = "pyo3-build-config" + version = "0.19.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" ++dependencies = [ ++ "once_cell", ++ "target-lexicon", ++] ++ ++[[package]] ++name = "pyo3-build-config" ++version = "0.19.1" ++source = "git+https://github.com/DataDog/pyo3.git?branch=support-old-nightly#782dcfa95ce95ef6306cd9c777ca3aee86b79fcc" + dependencies = [ + "once_cell", + "python3-dll-a", +@@ -315,18 +321,16 @@ dependencies = [ + [[package]] + name = "pyo3-ffi" + version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4" --dependencies = [ -- "libc", ++source = "git+https://github.com/DataDog/pyo3.git?branch=support-old-nightly#782dcfa95ce95ef6306cd9c777ca3aee86b79fcc" + dependencies = [ + "libc", - "pyo3-build-config", --] -- --[[package]] --name = "pyo3-macros" --version = "0.19.1" ++ "pyo3-build-config 0.19.1 (git+https://github.com/DataDog/pyo3.git?branch=support-old-nightly)", + ] + + [[package]] + name = "pyo3-macros" + version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2" --dependencies = [ -- "proc-macro2", -- "pyo3-macros-backend", -- "quote", -- "syn 1.0.109", --] -- --[[package]] --name = "pyo3-macros-backend" --version = "0.19.1" ++source = "git+https://github.com/DataDog/pyo3.git?branch=support-old-nightly#782dcfa95ce95ef6306cd9c777ca3aee86b79fcc" + dependencies = [ + "proc-macro2", + "pyo3-macros-backend", +@@ -337,8 +341,7 @@ dependencies = [ + [[package]] + name = "pyo3-macros-backend" + version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b" --dependencies = [ -- "proc-macro2", -- "quote", -- "syn 1.0.109", --] -- --[[package]] --name = "python3-dll-a" --version = "0.2.9" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d5f07cd4412be8fa09a721d40007c483981bbe072cd6a21f2e83e04ec8f8343f" --dependencies = [ -- "cc", --] -- --[[package]] --name = "quote" ++source = "git+https://github.com/DataDog/pyo3.git?branch=support-old-nightly#782dcfa95ce95ef6306cd9c777ca3aee86b79fcc" + dependencies = [ + "proc-macro2", + "quote", +@@ -356,9 +359,9 @@ dependencies = [ + + [[package]] + name = "quote" -version = "1.0.29" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "1.0.32" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" --dependencies = [ -- "proc-macro2", --] -- --[[package]] --name = "redox_syscall" --version = "0.3.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" --dependencies = [ -- "bitflags", --] -- --[[package]] --name = "regex" --version = "1.9.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" --dependencies = [ -- "aho-corasick", -- "memchr", -- "regex-automata", -- "regex-syntax", --] -- --[[package]] --name = "regex-automata" ++checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" + dependencies = [ + "proc-macro2", + ] +@@ -386,9 +389,9 @@ dependencies = [ + + [[package]] + name = "regex-automata" -version = "0.3.2" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" --dependencies = [ -- "aho-corasick", -- "memchr", -- "regex-syntax", --] -- --[[package]] --name = "regex-syntax" --version = "0.7.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" -- --[[package]] --name = "rustversion" ++checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" + dependencies = [ + "aho-corasick", + "memchr", +@@ -403,21 +406,21 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + + [[package]] + name = "rustversion" -version = "1.0.13" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "1.0.14" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" -- --[[package]] --name = "ryu" ++checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + + [[package]] + name = "ryu" -version = "1.0.14" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "1.0.15" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" -- --[[package]] --name = "scopeguard" ++checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + + [[package]] + name = "scopeguard" -version = "1.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -- --[[package]] --name = "serde" --version = "1.0.175" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" --dependencies = [ -- "serde_derive", --] -- --[[package]] --name = "serde_derive" --version = "1.0.175" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" --dependencies = [ -- "proc-macro2", -- "quote", ++checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + + [[package]] + name = "serde" +@@ -436,7 +439,7 @@ checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" + dependencies = [ + "proc-macro2", + "quote", - "syn 2.0.25", --] -- --[[package]] --name = "serde_json" --version = "1.0.103" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" --dependencies = [ -- "indexmap", -- "itoa", -- "ryu", -- "serde", --] -- --[[package]] --name = "smallvec" --version = "1.11.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" -- --[[package]] --name = "speedate" --version = "0.11.0" ++ "syn 2.0.27", + ] + + [[package]] +@@ -460,8 +463,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + [[package]] + name = "speedate" + version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54e4ea42510cf6cb46223f6974670faf58ef49e82040e924a295aa3f0c8eaa2" --dependencies = [ -- "strum", -- "strum_macros", --] -- --[[package]] --name = "strum" --version = "0.25.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" --dependencies = [ -- "strum_macros", --] -- --[[package]] --name = "strum_macros" --version = "0.25.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" --dependencies = [ -- "heck", -- "proc-macro2", -- "quote", -- "rustversion", ++source = "git+https://github.com/DataDog/speedate.git?branch=support-old-nightly#bc24aa838c684a6b092b128dac20a085c79d2d8e" + dependencies = [ + "strum", + "strum_macros", +@@ -486,7 +488,7 @@ dependencies = [ + "proc-macro2", + "quote", + "rustversion", - "syn 2.0.25", --] -- --[[package]] --name = "syn" --version = "1.0.109" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" --dependencies = [ -- "proc-macro2", -- "quote", -- "unicode-ident", --] -- --[[package]] --name = "syn" ++ "syn 2.0.27", + ] + + [[package]] +@@ -502,9 +504,9 @@ dependencies = [ + + [[package]] + name = "syn" -version = "2.0.25" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "2.0.27" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" --dependencies = [ -- "proc-macro2", -- "quote", -- "unicode-ident", --] -- --[[package]] --name = "target-lexicon" ++checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" + dependencies = [ + "proc-macro2", + "quote", +@@ -513,9 +515,9 @@ dependencies = [ + + [[package]] + name = "target-lexicon" -version = "0.12.9" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "0.12.10" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" -- --[[package]] --name = "tinyvec" --version = "1.6.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" --dependencies = [ -- "tinyvec_macros", --] -- --[[package]] --name = "tinyvec_macros" --version = "0.1.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -- --[[package]] --name = "unicode-bidi" --version = "0.3.13" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" -- --[[package]] --name = "unicode-ident" ++checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" + + [[package]] + name = "tinyvec" +@@ -540,9 +542,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + + [[package]] + name = "unicode-ident" -version = "1.0.10" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" -- --[[package]] --name = "unicode-normalization" --version = "0.1.22" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" --dependencies = [ -- "tinyvec", --] -- --[[package]] --name = "unindent" --version = "0.1.11" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" -- --[[package]] --name = "url" --version = "2.4.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" --dependencies = [ -- "form_urlencoded", -- "idna", -- "percent-encoding", --] -- --[[package]] --name = "uuid" --version = "1.4.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" -- --[[package]] --name = "version_check" --version = "0.9.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -- --[[package]] --name = "wasi" --version = "0.11.0+wasi-snapshot-preview1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -- --[[package]] --name = "windows-targets" --version = "0.48.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" --dependencies = [ -- "windows_aarch64_gnullvm", -- "windows_aarch64_msvc", -- "windows_i686_gnu", -- "windows_i686_msvc", -- "windows_x86_64_gnu", -- "windows_x86_64_gnullvm", -- "windows_x86_64_msvc", --] -- --[[package]] --name = "windows_aarch64_gnullvm" --version = "0.48.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -- --[[package]] --name = "windows_aarch64_msvc" --version = "0.48.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -- --[[package]] --name = "windows_i686_gnu" --version = "0.48.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" -- --[[package]] --name = "windows_i686_msvc" --version = "0.48.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -- --[[package]] --name = "windows_x86_64_gnu" --version = "0.48.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" -- --[[package]] --name = "windows_x86_64_gnullvm" --version = "0.48.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -- --[[package]] --name = "windows_x86_64_msvc" --version = "0.48.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" ++checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + + [[package]] + name = "unicode-normalization" diff --git a/Cargo.toml b/Cargo.toml index 1cfdba5..058325c 100644 --- a/Cargo.toml From 0e5d26c16a5b7dc4bf775899a9ceab03fcd436b7 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 26 Jul 2023 15:53:38 -0400 Subject: [PATCH 11/20] Update pydantic-core-build-for-manylinux1.patch --- .../pydantic-core-build-for-manylinux1.patch | 88 ++++++++++++------- 1 file changed, 58 insertions(+), 30 deletions(-) diff --git a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch index a97431e900fc3..d0bff7d2b59c1 100644 --- a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch +++ b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch @@ -1,8 +1,8 @@ diff --git a/.cargo/config.toml b/.cargo/config.toml -index f0ba8af..75f0cfc 100644 +index f0ba8af..274db88 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml -@@ -13,3 +13,9 @@ rustflags = [ +@@ -13,3 +13,8 @@ rustflags = [ "-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup", ] @@ -10,13 +10,12 @@ index f0ba8af..75f0cfc 100644 +[patch.crates-io] +speedate = { git = 'https://github.com/DataDog/speedate.git', branch = 'support-old-nightly' } +pyo3 = { git = 'https://github.com/DataDog/pyo3.git', branch = 'support-old-nightly' } -+hashbrown = { git = 'https://github.com/DataDog/hashbrown.git', branch = 'support-old-nightly' } +indexmap = { git = 'https://github.com/DataDog/indexmap.git', branch = 'support-old-nightly' } diff --git a/Cargo.lock b/Cargo.lock -index 3f685e6..23b85a6 100644 +index 3f685e6..e1ebadb 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -62,7 +62,7 @@ dependencies = [ +@@ -62,15 +62,9 @@ dependencies = [ "once_cell", "proc-macro2", "quote", @@ -24,20 +23,28 @@ index 3f685e6..23b85a6 100644 + "syn 2.0.27", ] +-[[package]] +-name = "equivalent" +-version = "1.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +- [[package]] -@@ -93,9 +93,8 @@ dependencies = [ + name = "form_urlencoded" + version = "1.2.0" +@@ -93,9 +87,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "0.12.3" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" -+version = "0.13.2" -+source = "git+https://github.com/DataDog/hashbrown.git?branch=support-old-nightly#dcb854f861849e9ef23749601497242bdae276b5" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "heck" -@@ -115,9 +114,8 @@ dependencies = [ +@@ -115,11 +109,10 @@ dependencies = [ [[package]] name = "indexmap" @@ -47,9 +54,12 @@ index 3f685e6..23b85a6 100644 +version = "1.9.3" +source = "git+https://github.com/DataDog/indexmap.git?branch=support-old-nightly#861fad73de14b7f08d2dc56ed83607aef621b42e" dependencies = [ - "equivalent", +- "equivalent", ++ "autocfg", "hashbrown", -@@ -131,9 +129,9 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" + ] + +@@ -131,9 +124,9 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "itoa" @@ -61,7 +71,7 @@ index 3f685e6..23b85a6 100644 [[package]] name = "libc" -@@ -208,9 +206,9 @@ dependencies = [ +@@ -208,9 +201,9 @@ dependencies = [ [[package]] name = "num-traits" @@ -73,7 +83,7 @@ index 3f685e6..23b85a6 100644 dependencies = [ "autocfg", ] -@@ -252,9 +250,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +@@ -252,9 +245,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "proc-macro2" @@ -85,7 +95,7 @@ index 3f685e6..23b85a6 100644 dependencies = [ "unicode-ident", ] -@@ -270,7 +268,7 @@ dependencies = [ +@@ -270,7 +263,7 @@ dependencies = [ "mimalloc", "num-bigint", "pyo3", @@ -94,7 +104,7 @@ index 3f685e6..23b85a6 100644 "python3-dll-a", "regex", "serde", -@@ -286,8 +284,7 @@ dependencies = [ +@@ -286,8 +279,7 @@ dependencies = [ [[package]] name = "pyo3" version = "0.19.1" @@ -104,7 +114,7 @@ index 3f685e6..23b85a6 100644 dependencies = [ "cfg-if", "indoc", -@@ -295,7 +292,7 @@ dependencies = [ +@@ -295,7 +287,7 @@ dependencies = [ "memoffset", "num-bigint", "parking_lot", @@ -113,7 +123,7 @@ index 3f685e6..23b85a6 100644 "pyo3-ffi", "pyo3-macros", "unindent", -@@ -306,6 +303,15 @@ name = "pyo3-build-config" +@@ -306,6 +298,15 @@ name = "pyo3-build-config" version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" @@ -129,7 +139,7 @@ index 3f685e6..23b85a6 100644 dependencies = [ "once_cell", "python3-dll-a", -@@ -315,18 +321,16 @@ dependencies = [ +@@ -315,18 +316,16 @@ dependencies = [ [[package]] name = "pyo3-ffi" version = "0.19.1" @@ -151,7 +161,7 @@ index 3f685e6..23b85a6 100644 dependencies = [ "proc-macro2", "pyo3-macros-backend", -@@ -337,8 +341,7 @@ dependencies = [ +@@ -337,8 +336,7 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" version = "0.19.1" @@ -161,7 +171,7 @@ index 3f685e6..23b85a6 100644 dependencies = [ "proc-macro2", "quote", -@@ -356,9 +359,9 @@ dependencies = [ +@@ -356,9 +354,9 @@ dependencies = [ [[package]] name = "quote" @@ -173,7 +183,7 @@ index 3f685e6..23b85a6 100644 dependencies = [ "proc-macro2", ] -@@ -386,9 +389,9 @@ dependencies = [ +@@ -386,9 +384,9 @@ dependencies = [ [[package]] name = "regex-automata" @@ -185,7 +195,7 @@ index 3f685e6..23b85a6 100644 dependencies = [ "aho-corasick", "memchr", -@@ -403,21 +406,21 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +@@ -403,21 +401,21 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rustversion" @@ -213,7 +223,7 @@ index 3f685e6..23b85a6 100644 [[package]] name = "serde" -@@ -436,7 +439,7 @@ checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" +@@ -436,14 +434,14 @@ checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" dependencies = [ "proc-macro2", "quote", @@ -222,7 +232,16 @@ index 3f685e6..23b85a6 100644 ] [[package]] -@@ -460,8 +463,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + name = "serde_json" +-version = "1.0.103" ++version = "1.0.97" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" ++checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" + dependencies = [ + "indexmap", + "itoa", +@@ -460,8 +458,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "speedate" version = "0.11.0" @@ -232,7 +251,7 @@ index 3f685e6..23b85a6 100644 dependencies = [ "strum", "strum_macros", -@@ -486,7 +488,7 @@ dependencies = [ +@@ -486,7 +483,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", @@ -241,7 +260,7 @@ index 3f685e6..23b85a6 100644 ] [[package]] -@@ -502,9 +504,9 @@ dependencies = [ +@@ -502,9 +499,9 @@ dependencies = [ [[package]] name = "syn" @@ -253,7 +272,7 @@ index 3f685e6..23b85a6 100644 dependencies = [ "proc-macro2", "quote", -@@ -513,9 +515,9 @@ dependencies = [ +@@ -513,9 +510,9 @@ dependencies = [ [[package]] name = "target-lexicon" @@ -265,7 +284,7 @@ index 3f685e6..23b85a6 100644 [[package]] name = "tinyvec" -@@ -540,9 +542,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +@@ -540,9 +537,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -278,9 +297,18 @@ index 3f685e6..23b85a6 100644 [[package]] name = "unicode-normalization" diff --git a/Cargo.toml b/Cargo.toml -index 1cfdba5..058325c 100644 +index 1cfdba5..e3a362c 100644 --- a/Cargo.toml +++ b/Cargo.toml +@@ -30,7 +30,7 @@ pyo3 = { version = "0.19.1", features = ["generate-import-lib", "num-bigint"] } + regex = "1.6.0" + strum = { version = "0.25.0", features = ["derive"] } + strum_macros = "0.25.1" +-serde_json = {version = "1.0.103", features = ["arbitrary_precision", "preserve_order"]} ++serde_json = {version = "<1.0.98", features = ["arbitrary_precision", "preserve_order"]} + enum_dispatch = "0.3.8" + serde = { version = "1.0.175", features = ["derive"] } + # disabled for benchmarks since it makes microbenchmark performance more flakey @@ -52,7 +52,6 @@ crate-type = ["cdylib", "rlib"] [features] # must be enabled when building with `cargo build`, maturin enables this automatically From f14b456e5effae11d55abe3b2a65ef5fe370eac5 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 26 Jul 2023 17:10:18 -0400 Subject: [PATCH 12/20] Update pydantic-core-build-for-manylinux1.patch --- .../pydantic-core-build-for-manylinux1.patch | 87 +++++++++---------- 1 file changed, 41 insertions(+), 46 deletions(-) diff --git a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch index d0bff7d2b59c1..6760dcf7cd2b9 100644 --- a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch +++ b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch @@ -12,7 +12,7 @@ index f0ba8af..274db88 100644 +pyo3 = { git = 'https://github.com/DataDog/pyo3.git', branch = 'support-old-nightly' } +indexmap = { git = 'https://github.com/DataDog/indexmap.git', branch = 'support-old-nightly' } diff --git a/Cargo.lock b/Cargo.lock -index 3f685e6..e1ebadb 100644 +index 3f685e6..d637b37 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,15 +62,9 @@ dependencies = [ @@ -95,15 +95,6 @@ index 3f685e6..e1ebadb 100644 dependencies = [ "unicode-ident", ] -@@ -270,7 +263,7 @@ dependencies = [ - "mimalloc", - "num-bigint", - "pyo3", -- "pyo3-build-config", -+ "pyo3-build-config 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", - "python3-dll-a", - "regex", - "serde", @@ -286,8 +279,7 @@ dependencies = [ [[package]] name = "pyo3" @@ -114,32 +105,17 @@ index 3f685e6..e1ebadb 100644 dependencies = [ "cfg-if", "indoc", -@@ -295,7 +287,7 @@ dependencies = [ - "memoffset", - "num-bigint", - "parking_lot", -- "pyo3-build-config", -+ "pyo3-build-config 0.19.1 (git+https://github.com/DataDog/pyo3.git?branch=support-old-nightly)", - "pyo3-ffi", - "pyo3-macros", - "unindent", -@@ -306,6 +298,15 @@ name = "pyo3-build-config" +@@ -304,8 +296,7 @@ dependencies = [ + [[package]] + name = "pyo3-build-config" version = "0.19.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" -+dependencies = [ -+ "once_cell", -+ "target-lexicon", -+] -+ -+[[package]] -+name = "pyo3-build-config" -+version = "0.19.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" +source = "git+https://github.com/DataDog/pyo3.git?branch=support-old-nightly#782dcfa95ce95ef6306cd9c777ca3aee86b79fcc" dependencies = [ "once_cell", "python3-dll-a", -@@ -315,18 +316,16 @@ dependencies = [ +@@ -315,8 +306,7 @@ dependencies = [ [[package]] name = "pyo3-ffi" version = "0.19.1" @@ -148,10 +124,8 @@ index 3f685e6..e1ebadb 100644 +source = "git+https://github.com/DataDog/pyo3.git?branch=support-old-nightly#782dcfa95ce95ef6306cd9c777ca3aee86b79fcc" dependencies = [ "libc", -- "pyo3-build-config", -+ "pyo3-build-config 0.19.1 (git+https://github.com/DataDog/pyo3.git?branch=support-old-nightly)", - ] - + "pyo3-build-config", +@@ -325,8 +315,7 @@ dependencies = [ [[package]] name = "pyo3-macros" version = "0.19.1" @@ -161,7 +135,7 @@ index 3f685e6..e1ebadb 100644 dependencies = [ "proc-macro2", "pyo3-macros-backend", -@@ -337,8 +336,7 @@ dependencies = [ +@@ -337,8 +326,7 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" version = "0.19.1" @@ -171,7 +145,7 @@ index 3f685e6..e1ebadb 100644 dependencies = [ "proc-macro2", "quote", -@@ -356,9 +354,9 @@ dependencies = [ +@@ -356,9 +344,9 @@ dependencies = [ [[package]] name = "quote" @@ -183,7 +157,7 @@ index 3f685e6..e1ebadb 100644 dependencies = [ "proc-macro2", ] -@@ -386,9 +384,9 @@ dependencies = [ +@@ -386,9 +374,9 @@ dependencies = [ [[package]] name = "regex-automata" @@ -195,7 +169,7 @@ index 3f685e6..e1ebadb 100644 dependencies = [ "aho-corasick", "memchr", -@@ -403,21 +401,21 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +@@ -403,47 +391,47 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rustversion" @@ -223,7 +197,22 @@ index 3f685e6..e1ebadb 100644 [[package]] name = "serde" -@@ -436,14 +434,14 @@ checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" +-version = "1.0.175" ++version = "1.0.176" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" ++checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.175" ++version = "1.0.176" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" ++checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" dependencies = [ "proc-macro2", "quote", @@ -241,7 +230,7 @@ index 3f685e6..e1ebadb 100644 dependencies = [ "indexmap", "itoa", -@@ -460,8 +458,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +@@ -460,8 +448,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "speedate" version = "0.11.0" @@ -251,7 +240,7 @@ index 3f685e6..e1ebadb 100644 dependencies = [ "strum", "strum_macros", -@@ -486,7 +483,7 @@ dependencies = [ +@@ -486,7 +473,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", @@ -260,7 +249,7 @@ index 3f685e6..e1ebadb 100644 ] [[package]] -@@ -502,9 +499,9 @@ dependencies = [ +@@ -502,9 +489,9 @@ dependencies = [ [[package]] name = "syn" @@ -272,7 +261,7 @@ index 3f685e6..e1ebadb 100644 dependencies = [ "proc-macro2", "quote", -@@ -513,9 +510,9 @@ dependencies = [ +@@ -513,9 +500,9 @@ dependencies = [ [[package]] name = "target-lexicon" @@ -284,7 +273,7 @@ index 3f685e6..e1ebadb 100644 [[package]] name = "tinyvec" -@@ -540,9 +537,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +@@ -540,9 +527,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -297,7 +286,7 @@ index 3f685e6..e1ebadb 100644 [[package]] name = "unicode-normalization" diff --git a/Cargo.toml b/Cargo.toml -index 1cfdba5..e3a362c 100644 +index 1cfdba5..dee86c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ pyo3 = { version = "0.19.1", features = ["generate-import-lib", "num-bigint"] } @@ -317,6 +306,12 @@ index 1cfdba5..e3a362c 100644 [profile.release] lto = "fat" +@@ -69,4 +68,4 @@ pyo3 = { version = "0.19.0", 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 = "0.19.0" ++pyo3-build-config = { git = 'https://github.com/DataDog/pyo3.git', branch = 'support-old-nightly' } diff --git a/pyproject.toml b/pyproject.toml index 1602e32..0278c38 100644 --- a/pyproject.toml From 5edeae85e6cabd7e827011cfb302acfbdb9cbc26 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 26 Jul 2023 18:58:55 -0400 Subject: [PATCH 13/20] Update pydantic-core-build-for-manylinux1.patch --- .../pydantic-core-build-for-manylinux1.patch | 463 ++++++++++++++---- omnibus/config/software/pydantic-core-py3.rb | 4 +- 2 files changed, 366 insertions(+), 101 deletions(-) diff --git a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch index 6760dcf7cd2b9..1d6c7c9b75162 100644 --- a/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch +++ b/omnibus/config/patches/pydantic-core-py3/pydantic-core-build-for-manylinux1.patch @@ -1,5 +1,5 @@ diff --git a/.cargo/config.toml b/.cargo/config.toml -index f0ba8af..274db88 100644 +index f0ba8af..4182dd0 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -13,3 +13,8 @@ rustflags = [ @@ -8,70 +8,139 @@ index f0ba8af..274db88 100644 ] + +[patch.crates-io] -+speedate = { git = 'https://github.com/DataDog/speedate.git', branch = 'support-old-nightly' } -+pyo3 = { git = 'https://github.com/DataDog/pyo3.git', branch = 'support-old-nightly' } -+indexmap = { git = 'https://github.com/DataDog/indexmap.git', branch = 'support-old-nightly' } ++speedate = { git = "https://github.com/DataDog/speedate.git", branch = "support-old-nightly" } ++pyo3 = { git = "https://github.com/DataDog/pyo3.git", branch = "support-old-nightly" } ++indexmap = { git = "https://github.com/DataDog/indexmap.git", branch = "support-old-nightly" } diff --git a/Cargo.lock b/Cargo.lock -index 3f685e6..d637b37 100644 +index fc9a6ed..ff5fe71 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -62,15 +62,9 @@ dependencies = [ +@@ -16,9 +16,9 @@ dependencies = [ + + [[package]] + name = "aho-corasick" +-version = "0.7.20" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" ++checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" + dependencies = [ + "memchr", + ] +@@ -55,30 +55,30 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "enum_dispatch" +-version = "0.3.11" ++version = "0.3.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" ++checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" + dependencies = [ "once_cell", "proc-macro2", "quote", -- "syn 2.0.25", +- "syn 1.0.109", + "syn 2.0.27", ] --[[package]] --name = "equivalent" --version = "1.0.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -- [[package]] name = "form_urlencoded" - version = "1.2.0" -@@ -93,9 +87,9 @@ dependencies = [ - - [[package]] - name = "hashbrown" --version = "0.14.0" -+version = "0.12.3" +-version = "1.1.0" ++version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" -+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" ++checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" + dependencies = [ + "percent-encoding", + ] [[package]] - name = "heck" -@@ -115,11 +109,10 @@ dependencies = [ + name = "getrandom" +-version = "0.2.8" ++version = "0.2.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" ++checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" + dependencies = [ + "cfg-if", + "libc", +@@ -107,11 +107,20 @@ dependencies = [ + "unicode-normalization", + ] ++[[package]] ++name = "idna" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" ++dependencies = [ ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ [[package]] name = "indexmap" --version = "2.0.0" + version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -+version = "1.9.3" +-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +source = "git+https://github.com/DataDog/indexmap.git?branch=support-old-nightly#861fad73de14b7f08d2dc56ed83607aef621b42e" dependencies = [ -- "equivalent", -+ "autocfg", + "autocfg", "hashbrown", - ] - -@@ -131,9 +124,9 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +@@ -125,21 +134,21 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "itoa" --version = "1.0.8" +-version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "libc" -@@ -208,9 +201,9 @@ dependencies = [ +-version = "0.2.140" ++version = "0.2.147" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" ++checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + + [[package]] + name = "libmimalloc-sys" +-version = "0.1.30" ++version = "0.1.33" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd8c7cbf8b89019683667e347572e6d55a7df7ea36b0c4ce69961b0cde67b174" ++checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" + dependencies = [ + "cc", + "libc", +@@ -147,9 +156,9 @@ dependencies = [ + + [[package]] + name = "lock_api" +-version = "0.4.9" ++version = "0.4.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" ++checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" + dependencies = [ + "autocfg", + "scopeguard", +@@ -172,9 +181,9 @@ dependencies = [ + + [[package]] + name = "mimalloc" +-version = "0.1.34" ++version = "0.1.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9dcb174b18635f7561a0c6c9fc2ce57218ac7523cf72c50af80e2d79ab8f3ba1" ++checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" + dependencies = [ + "libmimalloc-sys", + ] +@@ -202,18 +211,18 @@ dependencies = [ [[package]] name = "num-traits" @@ -83,19 +152,63 @@ index 3f685e6..d637b37 100644 dependencies = [ "autocfg", ] -@@ -252,9 +245,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + + [[package]] + name = "once_cell" +-version = "1.17.1" ++version = "1.18.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" ++checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + + [[package]] + name = "parking_lot" +@@ -227,28 +236,28 @@ dependencies = [ + + [[package]] + name = "parking_lot_core" +-version = "0.9.7" ++version = "0.9.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" ++checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" + dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", +- "windows-sys", ++ "windows-targets", + ] + + [[package]] + name = "percent-encoding" +-version = "2.2.0" ++version = "2.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" ++checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "proc-macro2" --version = "1.0.64" +-version = "1.0.60" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +-checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] -@@ -286,8 +279,7 @@ dependencies = [ +@@ -260,7 +269,7 @@ dependencies = [ + "ahash", + "base64", + "enum_dispatch", +- "idna", ++ "idna 0.3.0", + "mimalloc", + "num-bigint", + "pyo3", +@@ -279,8 +288,7 @@ dependencies = [ [[package]] name = "pyo3" version = "0.19.1" @@ -105,7 +218,7 @@ index 3f685e6..d637b37 100644 dependencies = [ "cfg-if", "indoc", -@@ -304,8 +296,7 @@ dependencies = [ +@@ -297,8 +305,7 @@ dependencies = [ [[package]] name = "pyo3-build-config" version = "0.19.1" @@ -115,7 +228,7 @@ index 3f685e6..d637b37 100644 dependencies = [ "once_cell", "python3-dll-a", -@@ -315,8 +306,7 @@ dependencies = [ +@@ -308,8 +315,7 @@ dependencies = [ [[package]] name = "pyo3-ffi" version = "0.19.1" @@ -125,7 +238,7 @@ index 3f685e6..d637b37 100644 dependencies = [ "libc", "pyo3-build-config", -@@ -325,8 +315,7 @@ dependencies = [ +@@ -318,8 +324,7 @@ dependencies = [ [[package]] name = "pyo3-macros" version = "0.19.1" @@ -135,7 +248,7 @@ index 3f685e6..d637b37 100644 dependencies = [ "proc-macro2", "pyo3-macros-backend", -@@ -337,8 +326,7 @@ dependencies = [ +@@ -330,8 +335,7 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" version = "0.19.1" @@ -145,46 +258,76 @@ index 3f685e6..d637b37 100644 dependencies = [ "proc-macro2", "quote", -@@ -356,9 +344,9 @@ dependencies = [ +@@ -349,27 +353,39 @@ dependencies = [ [[package]] name = "quote" --version = "1.0.29" +-version = "1.0.28" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] -@@ -386,9 +374,9 @@ dependencies = [ [[package]] - name = "regex-automata" --version = "0.3.2" + name = "redox_syscall" +-version = "0.2.16" ++version = "0.3.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" ++checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" + dependencies = [ + "bitflags", + ] + + [[package]] + name = "regex" +-version = "1.7.3" ++version = "1.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-automata", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-automata" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" +-checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ "aho-corasick", "memchr", -@@ -403,47 +391,47 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +@@ -378,39 +394,39 @@ dependencies = [ + + [[package]] + name = "regex-syntax" +-version = "0.6.29" ++version = "0.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" ++checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rustversion" --version = "1.0.13" +-version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" --version = "1.0.14" +-version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] @@ -197,108 +340,220 @@ index 3f685e6..d637b37 100644 [[package]] name = "serde" --version = "1.0.175" +-version = "1.0.159" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" +-checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.175" -+version = "1.0.176" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" -+checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.25", -+ "syn 2.0.27", - ] [[package]] name = "serde_json" --version = "1.0.103" +-version = "1.0.95" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +-checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" dependencies = [ "indexmap", "itoa", -@@ -460,8 +448,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +@@ -420,18 +436,17 @@ dependencies = [ + + [[package]] + name = "smallvec" +-version = "1.10.0" ++version = "1.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" ++checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + [[package]] name = "speedate" - version = "0.11.0" +-version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e54e4ea42510cf6cb46223f6974670faf58ef49e82040e924a295aa3f0c8eaa2" -+source = "git+https://github.com/DataDog/speedate.git?branch=support-old-nightly#bc24aa838c684a6b092b128dac20a085c79d2d8e" +-checksum = "312e03cbe7f96cdbd7b69de27d396d541632f660b400a953fe536403e4698e75" ++version = "0.9.1" ++source = "git+https://github.com/DataDog/speedate.git?branch=support-old-nightly#461bc4e6f22ddce201731881af3d095f3b6b73fc" dependencies = [ "strum", - "strum_macros", -@@ -486,7 +473,7 @@ dependencies = [ +- "strum_macros 0.25.0", ++ "strum_macros 0.25.1", + ] + + [[package]] +@@ -440,7 +455,7 @@ version = "0.25.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" + dependencies = [ +- "strum_macros 0.25.0", ++ "strum_macros 0.25.1", + ] + + [[package]] +@@ -458,15 +473,15 @@ dependencies = [ + + [[package]] + name = "strum_macros" +-version = "0.25.0" ++version = "0.25.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fe9f3bd7d2e45dcc5e265fbb88d6513e4747d8ef9444cf01a533119bce28a157" ++checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" + dependencies = [ + "heck", "proc-macro2", "quote", "rustversion", -- "syn 2.0.25", +- "syn 2.0.18", + "syn 2.0.27", ] [[package]] -@@ -502,9 +489,9 @@ dependencies = [ +@@ -482,9 +497,9 @@ dependencies = [ [[package]] name = "syn" --version = "2.0.25" +-version = "2.0.18" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" +-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", -@@ -513,9 +500,9 @@ dependencies = [ +@@ -493,9 +508,9 @@ dependencies = [ [[package]] name = "target-lexicon" --version = "0.12.9" +-version = "0.12.6" +version = "0.12.10" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" +-checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" +checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" [[package]] name = "tinyvec" -@@ -540,9 +527,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +@@ -520,9 +535,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" --version = "1.0.10" +-version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" +@@ -541,12 +556,12 @@ checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + + [[package]] + name = "url" +-version = "2.3.1" ++version = "2.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" ++checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" + dependencies = [ + "form_urlencoded", +- "idna", ++ "idna 0.4.0", + "percent-encoding", + ] + +@@ -562,20 +577,11 @@ version = "0.11.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +-[[package]] +-name = "windows-sys" +-version = "0.45.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +-dependencies = [ +- "windows-targets", +-] +- + [[package]] + name = "windows-targets" +-version = "0.42.2" ++version = "0.48.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" ++checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" + dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", +@@ -588,42 +594,42 @@ dependencies = [ + + [[package]] + name = "windows_aarch64_gnullvm" +-version = "0.42.2" ++version = "0.48.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" ++checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + + [[package]] + name = "windows_aarch64_msvc" +-version = "0.42.2" ++version = "0.48.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" ++checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + + [[package]] + name = "windows_i686_gnu" +-version = "0.42.2" ++version = "0.48.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" ++checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + + [[package]] + name = "windows_i686_msvc" +-version = "0.42.2" ++version = "0.48.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" ++checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + + [[package]] + name = "windows_x86_64_gnu" +-version = "0.42.2" ++version = "0.48.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" ++checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + + [[package]] + name = "windows_x86_64_gnullvm" +-version = "0.42.2" ++version = "0.48.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" ++checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + + [[package]] + name = "windows_x86_64_msvc" +-version = "0.42.2" ++version = "0.48.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" ++checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/Cargo.toml b/Cargo.toml -index 1cfdba5..dee86c7 100644 +index 7c3bae8..00d29e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ pyo3 = { version = "0.19.1", features = ["generate-import-lib", "num-bigint"] } regex = "1.6.0" strum = { version = "0.25.0", features = ["derive"] } - strum_macros = "0.25.1" --serde_json = {version = "1.0.103", features = ["arbitrary_precision", "preserve_order"]} -+serde_json = {version = "<1.0.98", features = ["arbitrary_precision", "preserve_order"]} + strum_macros = "0.24.3" +-serde_json = {version = "1.0.87", features = ["preserve_order"]} ++serde_json = {version = "<1.0.98", features = ["preserve_order"]} enum_dispatch = "0.3.8" - serde = { version = "1.0.175", features = ["derive"] } + serde = "1.0.147" # disabled for benchmarks since it makes microbenchmark performance more flakey -@@ -52,7 +52,6 @@ crate-type = ["cdylib", "rlib"] +@@ -51,7 +51,6 @@ crate-type = ["cdylib", "rlib"] [features] # must be enabled when building with `cargo build`, maturin enables this automatically extension-module = ["pyo3/extension-module"] @@ -306,7 +561,7 @@ index 1cfdba5..dee86c7 100644 [profile.release] lto = "fat" -@@ -69,4 +68,4 @@ pyo3 = { version = "0.19.0", features = ["auto-initialize"] } +@@ -68,4 +67,4 @@ pyo3 = { version = "0.19.0", features = ["auto-initialize"] } [build-dependencies] version_check = "0.9.4" # used where logic has to be version/distribution specific, e.g. pypy @@ -332,3 +587,13 @@ index 1602e32..0278c38 100644 [tool.ruff] line-length = 120 +diff --git a/src/lib.rs b/src/lib.rs +index a6780e6..b6bdee2 100644 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -1,3 +1,5 @@ ++#![feature(let_else)] ++#![feature(label_break_value)] + #![cfg_attr(has_no_coverage, feature(no_coverage))] + + extern crate core; diff --git a/omnibus/config/software/pydantic-core-py3.rb b/omnibus/config/software/pydantic-core-py3.rb index 0552462707a29..86d1431cfc9e0 100644 --- a/omnibus/config/software/pydantic-core-py3.rb +++ b/omnibus/config/software/pydantic-core-py3.rb @@ -3,12 +3,12 @@ # manylinux2014 wheels (min. requirement: glibc 2.17) do not support CentOS 6 (glibc 2.12). name "pydantic-core-py3" -default_version "2.4.0" +default_version "2.1.2" dependency "pip3" source :url => "https://github.com/pydantic/pydantic-core/archive/refs/tags/v#{version}.tar.gz", - :sha256 => "94b4ef19df7e0ea5e9f32590afc3673dab0d9855ed786d3dc95513124d842874", + :sha256 => "63c12928b54c8eab426bcbd1d9af005a945ebf9010caa7a9f087ad69cf29cb07", :extract => :seven_zip relative_path "pydantic-core-#{version}" From 7eeada2457c6ff840c25044e29177f54c69ecbd5 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 26 Jul 2023 22:58:24 -0400 Subject: [PATCH 14/20] finish --- .gitlab-ci.yml | 20 ++++++++----------- .../datadog-agent-integrations-py3.rb | 1 - release.json | 4 ++-- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10f0222b2b176..6985d38a255fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,8 +13,6 @@ include: - /.gitlab/package_build.yml - /.gitlab/kitchen_deploy.yml - /.gitlab/kitchen_testing.yml - - /.gitlab/kitchen_tests_upload.yml - - /.gitlab/install_script_testing.yml - /.gitlab/pkg_metrics.yml - /.gitlab/container_build.yml - /.gitlab/container_scan.yml @@ -70,7 +68,6 @@ stages: - package_build - kitchen_deploy - kitchen_testing - - kitchen_tests_upload - pkg_metrics - container_build - container_scan @@ -83,7 +80,6 @@ stages: - choco_build - choco_deploy - internal_image_deploy - - install_script_testing - e2e - e2e_test_junit_upload - kitchen_cleanup @@ -153,21 +149,21 @@ variables: # To use images from datadog-agent-buildimages dev branches, set the corresponding # SUFFIX variable to _test_only DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BUILDIMAGES: v18202418-b468e3c + DATADOG_AGENT_BUILDIMAGES: v17856289-aba8641 DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v18202418-b468e3c + DATADOG_AGENT_WINBUILDIMAGES: v17856289-aba8641 DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v18202418-b468e3c + DATADOG_AGENT_ARMBUILDIMAGES: v17856289-aba8641 DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v18202418-b468e3c + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v17856289-aba8641 DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v18202418-b468e3c + DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v17856289-aba8641 DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_NIKOS_BUILDIMAGES: v18202418-b468e3c + DATADOG_AGENT_NIKOS_BUILDIMAGES: v17856289-aba8641 DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v18202418-b468e3c + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v17856289-aba8641 DATADOG_AGENT_BUILDERS: v16852259-65c480c - TEST_INFRA_DEFINITIONS_BUILDIMAGES: f9dc8c42d94e + TEST_INFRA_DEFINITIONS_BUILDIMAGES: efed150be993 DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded DEB_GPG_KEY_ID: ad9589b7 diff --git a/omnibus/config/software/datadog-agent-integrations-py3.rb b/omnibus/config/software/datadog-agent-integrations-py3.rb index b2580e2bfc215..38d6e938e44be 100644 --- a/omnibus/config/software/datadog-agent-integrations-py3.rb +++ b/omnibus/config/software/datadog-agent-integrations-py3.rb @@ -188,7 +188,6 @@ "aerospike" => nix_build_env.merge({"EXT_CFLAGS" => nix_build_env["CFLAGS"] + " -std=gnu99"}), } - # On Linux & Windows, specify the C99 standard explicitly to avoid issues while building some # wheels (eg. ddtrace). # Not explicitly setting that option has caused us problems in the past on SUSE, where the ddtrace diff --git a/release.json b/release.json index d403f2f12bdd1..05e85b83d7eae 100644 --- a/release.json +++ b/release.json @@ -5,7 +5,7 @@ "7": "7.46.0" }, "nightly": { - "INTEGRATIONS_CORE_VERSION": "florentclarret/pydantic", + "INTEGRATIONS_CORE_VERSION": "master", "OMNIBUS_SOFTWARE_VERSION": "master", "OMNIBUS_RUBY_VERSION": "datadog-5.5.0", "JMXFETCH_VERSION": "0.47.9", @@ -17,7 +17,7 @@ "SECURITY_AGENT_POLICIES_VERSION": "master" }, "nightly-a7": { - "INTEGRATIONS_CORE_VERSION": "florentclarret/pydantic", + "INTEGRATIONS_CORE_VERSION": "master", "OMNIBUS_SOFTWARE_VERSION": "master", "OMNIBUS_RUBY_VERSION": "datadog-5.5.0", "JMXFETCH_VERSION": "0.47.9", From bdcc3a18edede1259d1a2f1112fc126f48162753 Mon Sep 17 00:00:00 2001 From: Florent Clarret Date: Thu, 27 Jul 2023 08:20:04 +0200 Subject: [PATCH 15/20] nit --- release.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.json b/release.json index 05e85b83d7eae..d403f2f12bdd1 100644 --- a/release.json +++ b/release.json @@ -5,7 +5,7 @@ "7": "7.46.0" }, "nightly": { - "INTEGRATIONS_CORE_VERSION": "master", + "INTEGRATIONS_CORE_VERSION": "florentclarret/pydantic", "OMNIBUS_SOFTWARE_VERSION": "master", "OMNIBUS_RUBY_VERSION": "datadog-5.5.0", "JMXFETCH_VERSION": "0.47.9", @@ -17,7 +17,7 @@ "SECURITY_AGENT_POLICIES_VERSION": "master" }, "nightly-a7": { - "INTEGRATIONS_CORE_VERSION": "master", + "INTEGRATIONS_CORE_VERSION": "florentclarret/pydantic", "OMNIBUS_SOFTWARE_VERSION": "master", "OMNIBUS_RUBY_VERSION": "datadog-5.5.0", "JMXFETCH_VERSION": "0.47.9", From 0384146c06480b0122e4cd57dbfbe763130050f6 Mon Sep 17 00:00:00 2001 From: Florent Clarret Date: Thu, 27 Jul 2023 08:20:24 +0200 Subject: [PATCH 16/20] Revert "update -core branch" This reverts commit 0af51e088e334b87e6cfa3b463390ce56a3cffd5. --- release.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release.json b/release.json index d403f2f12bdd1..a055fc8fe7201 100644 --- a/release.json +++ b/release.json @@ -5,7 +5,7 @@ "7": "7.46.0" }, "nightly": { - "INTEGRATIONS_CORE_VERSION": "florentclarret/pydantic", + "INTEGRATIONS_CORE_VERSION": "master", "OMNIBUS_SOFTWARE_VERSION": "master", "OMNIBUS_RUBY_VERSION": "datadog-5.5.0", "JMXFETCH_VERSION": "0.47.9", @@ -17,7 +17,7 @@ "SECURITY_AGENT_POLICIES_VERSION": "master" }, "nightly-a7": { - "INTEGRATIONS_CORE_VERSION": "florentclarret/pydantic", + "INTEGRATIONS_CORE_VERSION": "master", "OMNIBUS_SOFTWARE_VERSION": "master", "OMNIBUS_RUBY_VERSION": "datadog-5.5.0", "JMXFETCH_VERSION": "0.47.9", @@ -82,4 +82,4 @@ "dca-1.9.0": { "SECURITY_AGENT_POLICIES_VERSION": "v0.3" } -} +} \ No newline at end of file From f4fc86b6f3b9543db3b231eb5b3470dd6fa717d4 Mon Sep 17 00:00:00 2001 From: Florent Clarret Date: Thu, 27 Jul 2023 14:10:05 +0200 Subject: [PATCH 17/20] exclude arm --- omnibus/config/software/datadog-agent-integrations-py3.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnibus/config/software/datadog-agent-integrations-py3.rb b/omnibus/config/software/datadog-agent-integrations-py3.rb index 38d6e938e44be..f5ad1ed11c06a 100644 --- a/omnibus/config/software/datadog-agent-integrations-py3.rb +++ b/omnibus/config/software/datadog-agent-integrations-py3.rb @@ -99,7 +99,7 @@ blacklist_packages.push(/^pymqi==/) end -if redhat? +if redhat? && arm? # RPM builds are done on CentOS 6 which is based on glibc v2.12 however newer libraries require v2.17, see: # https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html dependency 'pydantic-core-py3' From 8d8ea714babbd2e5f9965bdfd95d192e61975814 Mon Sep 17 00:00:00 2001 From: Florent Clarret Date: Thu, 27 Jul 2023 14:13:17 +0200 Subject: [PATCH 18/20] exclude arm --- omnibus/config/software/datadog-agent-integrations-py3.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnibus/config/software/datadog-agent-integrations-py3.rb b/omnibus/config/software/datadog-agent-integrations-py3.rb index f5ad1ed11c06a..9a2ff2ac4876e 100644 --- a/omnibus/config/software/datadog-agent-integrations-py3.rb +++ b/omnibus/config/software/datadog-agent-integrations-py3.rb @@ -99,7 +99,7 @@ blacklist_packages.push(/^pymqi==/) end -if redhat? && arm? +if redhat? && !arm? # RPM builds are done on CentOS 6 which is based on glibc v2.12 however newer libraries require v2.17, see: # https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html dependency 'pydantic-core-py3' From 6041017d891e669f5bb9d661f048e2e39a402cf7 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Thu, 27 Jul 2023 15:42:21 -0400 Subject: [PATCH 19/20] Update .gitlab-ci.yml --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6985d38a255fa..5d956f663a19d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -149,19 +149,19 @@ variables: # To use images from datadog-agent-buildimages dev branches, set the corresponding # SUFFIX variable to _test_only DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BUILDIMAGES: v17856289-aba8641 + DATADOG_AGENT_BUILDIMAGES: v18317357-9fd9ee0 DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v17856289-aba8641 + DATADOG_AGENT_WINBUILDIMAGES: v18317357-9fd9ee0 DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v17856289-aba8641 + DATADOG_AGENT_ARMBUILDIMAGES: v18317357-9fd9ee0 DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v17856289-aba8641 + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v18317357-9fd9ee0 DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v17856289-aba8641 + DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v18317357-9fd9ee0 DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_NIKOS_BUILDIMAGES: v17856289-aba8641 + DATADOG_AGENT_NIKOS_BUILDIMAGES: v18317357-9fd9ee0 DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v17856289-aba8641 + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v18317357-9fd9ee0 DATADOG_AGENT_BUILDERS: v16852259-65c480c TEST_INFRA_DEFINITIONS_BUILDIMAGES: efed150be993 From bb35e2099a1e15b440180371a234bbc7a3346c36 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Thu, 27 Jul 2023 16:38:08 -0400 Subject: [PATCH 20/20] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d956f663a19d..2d72c4a252712 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,8 @@ include: - /.gitlab/package_build.yml - /.gitlab/kitchen_deploy.yml - /.gitlab/kitchen_testing.yml + - /.gitlab/kitchen_tests_upload.yml + - /.gitlab/install_script_testing.yml - /.gitlab/pkg_metrics.yml - /.gitlab/container_build.yml - /.gitlab/container_scan.yml @@ -68,6 +70,7 @@ stages: - package_build - kitchen_deploy - kitchen_testing + - kitchen_tests_upload - pkg_metrics - container_build - container_scan @@ -80,6 +83,7 @@ stages: - choco_build - choco_deploy - internal_image_deploy + - install_script_testing - e2e - e2e_test_junit_upload - kitchen_cleanup @@ -163,7 +167,7 @@ variables: DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v18317357-9fd9ee0 DATADOG_AGENT_BUILDERS: v16852259-65c480c - TEST_INFRA_DEFINITIONS_BUILDIMAGES: efed150be993 + TEST_INFRA_DEFINITIONS_BUILDIMAGES: f9dc8c42d94e DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded DEB_GPG_KEY_ID: ad9589b7