From 5ae4b76627398ae98f58eae8b3574b15d5515549 Mon Sep 17 00:00:00 2001 From: ijl Date: Tue, 28 Mar 2023 13:31:17 +0000 Subject: [PATCH] cargo update, fix linux-cross matrix.target.args --- .github/workflows/linux-cross.yaml | 4 ++-- .github/workflows/manylinux2014.yaml | 2 +- .github/workflows/manylinux_2_28.yaml | 4 ++-- .github/workflows/musllinux.yaml | 2 +- .gitignore | 20 +++++++++----------- Cargo.lock | 16 ++++++++-------- README.md | 2 +- ci/azure-pipelines.yml | 2 +- 8 files changed, 25 insertions(+), 27 deletions(-) diff --git a/.github/workflows/linux-cross.yaml b/.github/workflows/linux-cross.yaml index 74b03db8..07e215dd 100644 --- a/.github/workflows/linux-cross.yaml +++ b/.github/workflows/linux-cross.yaml @@ -44,10 +44,10 @@ jobs: with: maturin-version: v1.0.0-beta.5 target: ${{ matrix.target.arch }} - rust-toolchain: nightly-2023-03-20 + rust-toolchain: nightly-2023-03-28 rustup-components: rust-src manylinux: auto - args: --release --strip --out dist -i python${{ matrix.python.version }} + args: --release --strip --out dist -i python${{ matrix.python.version }} ${{ matrix.target.args }} - uses: uraimo/run-on-arch-action@v2 name: Install built wheel with: diff --git a/.github/workflows/manylinux2014.yaml b/.github/workflows/manylinux2014.yaml index 9bbf8509..65bdc8f5 100644 --- a/.github/workflows/manylinux2014.yaml +++ b/.github/workflows/manylinux2014.yaml @@ -24,7 +24,7 @@ jobs: image: quay.io/pypa/manylinux2014_x86_64:latest options: --user 0 steps: - - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-03-20 --profile minimal -y + - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-03-28 --profile minimal -y - uses: actions/checkout@v3 - run: python3 -m pip install --user --upgrade --pre pip "maturin>=0.14,<2" wheel - run: maturin build --release --strip --features=unstable-simd,yyjson --compatibility manylinux2014 --interpreter python${{ matrix.python.version }} diff --git a/.github/workflows/manylinux_2_28.yaml b/.github/workflows/manylinux_2_28.yaml index d51328c2..9253ffab 100644 --- a/.github/workflows/manylinux_2_28.yaml +++ b/.github/workflows/manylinux_2_28.yaml @@ -26,8 +26,8 @@ jobs: options: --user 0 steps: - run: yum install -y clang lld - - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-03-20 --profile minimal -y - - run: rustup component add rust-src --toolchain nightly-2023-03-20-x86_64-unknown-linux-gnu + - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-03-28 --profile minimal -y + - run: rustup component add rust-src --toolchain nightly-2023-03-28-x86_64-unknown-linux-gnu - uses: actions/checkout@v3 - run: python3 -m pip install --user --upgrade --pre pip "maturin>=0.14,<2" wheel - run: | diff --git a/.github/workflows/musllinux.yaml b/.github/workflows/musllinux.yaml index 986a12bd..ad7c9c8d 100644 --- a/.github/workflows/musllinux.yaml +++ b/.github/workflows/musllinux.yaml @@ -31,7 +31,7 @@ jobs: CARGO_UNSTABLE_SPARSE_REGISTRY: "true" with: maturin-version: v1.0.0-beta.5 - rust-toolchain: nightly-2023-03-20 + rust-toolchain: nightly-2023-03-28 rustup-components: rust-src target: ${{ matrix.platform.target }} manylinux: musllinux_1_1 diff --git a/.gitignore b/.gitignore index e032ba0f..83b01b45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,12 @@ *.patch +/.benchmarks +/.coverage +/.mypy_cache +/.pytest_cache +/.venv* +/build +/include/vendor /perf.* -__pycache__ -*.pyc /target -.pytest_cache -/.venv* -benchmark_*.svg -.coverage -.benchmarks -.mypy_cache -vendor -build -!json/perfect_float.patch +/vendor +__pycache__ diff --git a/Cargo.lock b/Cargo.lock index d7c694df..fa2acfcd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -194,9 +194,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75439f995d07ddfad42b192dfcf3bc66a7ecfd8b4a1f5f6f046aa5c2c5d7677d" +checksum = "98a42e7f42e917ce6664c832d5eee481ad514c98250c49e0b03b20593e2c7ed0" dependencies = [ "once_cell", "target-lexicon", @@ -204,9 +204,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "839526a5c07a17ff44823679b68add4a58004de00512a95b6c1c98a6dcac0ee5" +checksum = "a0707f0ab26826fe4ccd59b69106e9df5e12d097457c7b8f9c0fd1d2743eec4d" dependencies = [ "libc", "pyo3-build-config", @@ -226,15 +226,15 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "serde" -version = "1.0.158" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ "itoa", "ryu", diff --git a/README.md b/README.md index 4bb7a92e..434aa2e3 100644 --- a/README.md +++ b/README.md @@ -1165,7 +1165,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-2023-03-20` and stable 1.60. It +The project's own CI tests against `nightly-2023-03-28` and stable 1.60. It is prudent to pin the nightly version because that channel can introduce breaking changes. diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index c98e8cab..c2059555 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - toolchain: nightly-2023-03-20 + toolchain: nightly-2023-03-28 jobs: