From ab8584b1e13279490c58b29dd009b0c337fba7f9 Mon Sep 17 00:00:00 2001 From: ijl Date: Fri, 13 Sep 2024 14:27:49 +0000 Subject: [PATCH] cargo update --- .github/workflows/artifact.yaml | 11 ++++---- .github/workflows/debug.yaml | 4 +-- Cargo.lock | 45 ++++++++++++++++++++------------- README.md | 2 +- build.rs | 1 + ci/azure-pipelines.yml | 2 +- 6 files changed, 38 insertions(+), 27 deletions(-) diff --git a/.github/workflows/artifact.yaml b/.github/workflows/artifact.yaml index cf73c02c..7550b010 100644 --- a/.github/workflows/artifact.yaml +++ b/.github/workflows/artifact.yaml @@ -1,7 +1,7 @@ name: artifact on: push env: - RUST_TOOLCHAIN: "nightly-2024-08-05" + RUST_TOOLCHAIN: "nightly-2024-09-13" CARGO_UNSTABLE_SPARSE_REGISTRY: "true" UNSAFE_PYO3_BUILD_FREE_THREADED: "1" UNSAFE_PYO3_SKIP_VERSION_CHECK: "1" @@ -167,7 +167,7 @@ jobs: LDFLAGS: "-Wl,--as-needed" RUSTFLAGS: "-C lto=fat -Z mir-opt-level=4 -Z virtual-function-elimination -Z threads=2 -D warnings -C target-feature=-crt-static" with: - rust-toolchain: nightly-2024-08-05 + rust-toolchain: nightly-2024-09-13 rustup-components: rust-src target: ${{ matrix.platform.target }} manylinux: musllinux_1_2 @@ -211,6 +211,7 @@ jobs: fail-fast: false matrix: python: [ + { version: '3.13', abi: 'cp313-cp313' }, { version: '3.12', abi: 'cp312-cp312' }, { version: '3.11', abi: 'cp311-cp311' }, { version: '3.10', abi: 'cp310-cp310' }, @@ -263,7 +264,7 @@ jobs: RUSTFLAGS: "${{ matrix.target.rustflags }}" with: target: ${{ matrix.target.target }} - rust-toolchain: nightly-2024-08-05 + rust-toolchain: nightly-2024-09-13 rustup-components: rust-src manylinux: auto args: --release --strip --out=dist --features=${{ matrix.target.features }} -i python${{ matrix.python.version }} @@ -328,7 +329,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: "nightly-2024-08-05" + toolchain: "nightly-2024-09-13" targets: "aarch64-apple-darwin, x86_64-apple-darwin" components: "rust-src" @@ -398,7 +399,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: "nightly-2024-08-05" + toolchain: "nightly-2024-09-13" targets: "aarch64-apple-darwin, x86_64-apple-darwin" components: "rust-src" diff --git a/.github/workflows/debug.yaml b/.github/workflows/debug.yaml index f8564850..63d0013b 100644 --- a/.github/workflows/debug.yaml +++ b/.github/workflows/debug.yaml @@ -10,8 +10,8 @@ jobs: profile: [ { rust: "1.72", features: "" }, { rust: "1.72", features: "--features=yyjson" }, - { rust: "nightly-2024-08-05", features: "--features=yyjson,unstable-simd"}, - { rust: "nightly-2024-08-05", features: "--features=avx512,yyjson,unstable-simd"}, + { rust: "nightly-2024-09-13", features: "--features=yyjson,unstable-simd"}, + { rust: "nightly-2024-09-13", features: "--features=avx512,yyjson,unstable-simd"}, ] python: [ { version: '3.13' }, diff --git a/Cargo.lock b/Cargo.lock index 68676e35..80f36ae6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" dependencies = [ "serde", ] @@ -49,9 +49,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.8" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -131,9 +134,9 @@ checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "memchr" @@ -226,9 +229,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -250,18 +253,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.205" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.205" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -270,9 +273,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.122" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -280,6 +283,12 @@ dependencies = [ "serde", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "simdutf8" version = "0.1.4" @@ -300,9 +309,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "2.0.72" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -317,9 +326,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unwinding" diff --git a/README.md b/README.md index 5c3e5fad..8d88f711 100644 --- a/README.md +++ b/README.md @@ -1205,7 +1205,7 @@ It benefits from also having a C build environment to compile a faster deserialization backend. See this project's `manylinux_2_28` builds for an example using clang and LTO. -The project's own CI tests against `nightly-2024-08-05` and stable 1.72. It +The project's own CI tests against `nightly-2024-09-13` and stable 1.72. It is prudent to pin the nightly version because that channel can introduce breaking changes. diff --git a/build.rs b/build.rs index dc65d40f..8107291d 100644 --- a/build.rs +++ b/build.rs @@ -20,6 +20,7 @@ fn main() { println!("cargo:rustc-check-cfg=cfg(Py_3_13)"); println!("cargo:rustc-check-cfg=cfg(Py_3_8)"); println!("cargo:rustc-check-cfg=cfg(Py_3_9)"); + println!("cargo:rustc-check-cfg=cfg(Py_GIL_DISABLED)"); for cfg in pyo3_build_config::get().build_script_outputs() { println!("{cfg}"); diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index 4a1387d2..edf6c341 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - toolchain: nightly-2024-08-05 + toolchain: nightly-2024-09-13 jobs: