diff --git a/Cargo.lock b/Cargo.lock index 2a2d4084..de4bf75a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,9 +27,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "bitflags" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da1976d75adbe5fbc88130ecd119529cf1cc6a93ae1546d8696ee66f0d21af1" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bytecount" diff --git a/README.md b/README.md index 4c3ae40a..831354db 100644 --- a/README.md +++ b/README.md @@ -1171,7 +1171,7 @@ maturin build --no-sdist --release --strip --cargo-extra-args="--features=unstab To build on the stable channel, do not specify `--features=unstable-simd`. -The project's own CI tests against `nightly-2021-08-04` and stable 1.54. It +The project's own CI tests against `nightly-2021-08-17` and stable 1.54. It is prudent to pin the nightly version because that channel can introduce breaking changes. diff --git a/ci/azure-linux-container.yml b/ci/azure-linux-container.yml index 90726bdb..276c916b 100644 --- a/ci/azure-linux-container.yml +++ b/ci/azure-linux-container.yml @@ -14,9 +14,6 @@ parameters: - name: toolchain type: string default : '' - - name: verifyManylinux - type: boolean - default : true steps: - bash: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain $(toolchain) --profile minimal -y @@ -31,7 +28,6 @@ steps: displayName: build - bash: PATH=$(path) $(interpreter) -m auditwheel repair target/wheels/orjson*.whl displayName: verify that wheel conforms to manylinux tag - condition: eq(${{ parameters.verifyManylinux }}, true) - bash: PATH=$(path) $(interpreter) -m pip install --user target/wheels/orjson*.whl displayName: install - bash: PATH=$(path) $(interpreter) -m pip install --user -r test/requirements.txt -r integration/requirements.txt diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index ad7681b2..4dce739a 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -4,7 +4,7 @@ pr: - '*' variables: - toolchain: nightly-2021-08-04 + toolchain: nightly-2021-08-17 jobs: @@ -55,7 +55,6 @@ jobs: interpreter: python3.10 manylinux: 2_24 path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp310-cp310/bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin - verifyManylinux: true steps: - checkout: self - template: ./azure-linux-container.yml @@ -69,7 +68,6 @@ jobs: interpreter: python3.9 manylinux: 2_24 path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp39-cp39/bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin - verifyManylinux: true steps: - checkout: self - template: ./azure-linux-container.yml @@ -83,7 +81,6 @@ jobs: interpreter: python3.8 manylinux: 2_24 path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp38-cp38/bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin - verifyManylinux: true steps: - checkout: self - template: ./azure-linux-container.yml @@ -97,7 +94,6 @@ jobs: interpreter: python3.7 manylinux: 2_24 path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp37-cp37m/bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin - verifyManylinux: true steps: - checkout: self - template: ./azure-linux-container.yml @@ -111,7 +107,6 @@ jobs: interpreter: python3.9 manylinux: 2014 path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp39-cp39/bin:/opt/rh/devtoolset-9/root/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - verifyManylinux: true steps: - checkout: self - template: ./azure-linux-container.yml @@ -125,7 +120,6 @@ jobs: interpreter: python3.8 manylinux: 2014 path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp38-cp38/bin:/opt/rh/devtoolset-9/root/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - verifyManylinux: true steps: - checkout: self - template: ./azure-linux-container.yml @@ -139,7 +133,6 @@ jobs: interpreter: python3.7 manylinux: 2014 path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp37-cp37m/bin:/opt/rh/devtoolset-9/root/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - verifyManylinux: true steps: - checkout: self - template: ./azure-linux-container.yml diff --git a/ci/drone.yml b/ci/drone.yml index 75c80b9d..3a724cfa 100644 --- a/ci/drone.yml +++ b/ci/drone.yml @@ -14,7 +14,7 @@ steps: MATURIN_PASSWORD: from_secret: twine_password commands: - - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-08-04 --profile minimal -y + - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-08-17 --profile minimal -y - python3.10 -m pip install --user --upgrade pip maturin==0.11.2 - maturin build --no-sdist --release --strip --compatibility 2_24 --cargo-extra-args="--features=unstable-simd" --interpreter python3.10 - python3.10 -m pip install --user target/wheels/orjson*.whl @@ -38,7 +38,7 @@ steps: MATURIN_PASSWORD: from_secret: twine_password commands: - - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-08-04 --profile minimal -y + - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-08-17 --profile minimal -y - python3.9 -m pip install --user --upgrade pip maturin==0.11.2 - maturin build --no-sdist --release --strip --compatibility 2_24 --cargo-extra-args="--features=unstable-simd" --interpreter python3.9 - python3.9 -m pip install --user target/wheels/orjson*.whl @@ -62,7 +62,7 @@ steps: MATURIN_PASSWORD: from_secret: twine_password commands: - - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-08-04 --profile minimal -y + - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-08-17 --profile minimal -y - python3.8 -m pip install --user --upgrade pip maturin==0.11.2 - maturin build --no-sdist --release --strip --compatibility 2_24 --cargo-extra-args="--features=unstable-simd" --interpreter python3.8 - python3.8 -m pip install --user target/wheels/orjson*.whl @@ -86,7 +86,7 @@ steps: MATURIN_PASSWORD: from_secret: twine_password commands: - - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-08-04 --profile minimal -y + - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-08-17 --profile minimal -y - python3.7 -m pip install --user --upgrade pip maturin==0.11.2 - maturin build --no-sdist --release --strip --compatibility 2_24 --cargo-extra-args="--features=unstable-simd" --interpreter python3.7 - python3.7 -m pip install --user target/wheels/orjson*.whl diff --git a/pyproject.toml b/pyproject.toml index 757cd2c8..3d061173 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,9 +7,8 @@ build-backend = "maturin" requires = ["maturin>=0.11.2,<0.12"] [tool.maturin] -manylinux = "off" sdist-include = ["Cargo.lock"] -strip = "on" +strip = true [tool.black] line-length = 88