Use manylinux_2_24 for python3.10, nightly-2021-06-24

Author: ijl

Cargo.lock

@@ -1156,13 +1156,13 @@ This is an example of building a wheel using the repository as source,
 
 ```sh
 pip install maturin
-curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-05-25 --profile minimal -y
+curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-06-24 --profile minimal -y
 maturin build --no-sdist --release --strip --manylinux off
 ls -1 target/wheels
 ```
 
 Problems with the Rust nightly channel may require pinning a version.
-`nightly-2021-05-25` is known to be ok.
+`nightly-2021-06-24` is known to be ok.
 
 orjson is tested for amd64 and aarch64 on Linux, macOS, and Windows. It
 may not work on 32-bit targets. It has recommended `RUSTFLAGS`

README.md

@@ -10,7 +10,7 @@ steps:
   displayName: rustup
 - bash: PATH=$(path) rustup default $(toolchain)
   displayName: ensure toolchain
-- bash: PATH=$(path) pip install --user --upgrade pip maturin==0.10.6 twine
+- bash: PATH=$(path) pip install --user --upgrade pip maturin==0.10.6
   displayName: build dependencies
 - bash: PATH=$(path) $(interpreter) -m pip install --user -r test/requirements.txt -r integration/requirements.txt
   displayName: test dependencies

ci/azure-debug.yml

@@ -11,9 +11,9 @@ steps:
   displayName: rustup
 - bash: PATH=$(path) rustup default $(toolchain)
   displayName: ensure toolchain
-- bash: PATH=$(path) pip install --user --upgrade pip maturin==0.10.6 twine auditwheel
+- bash: PATH=$(path) pip install --user --upgrade pip maturin==0.10.6 auditwheel
   displayName: build dependencies
-- bash: PATH=$(path) maturin build --no-sdist --release --strip --manylinux $(manylinux) --skip-auditwheel --interpreter $(interpreter) --target $(target)
+- bash: PATH=$(path) maturin build --no-sdist --release --strip --manylinux $(manylinux) --interpreter $(interpreter) --target $(target)
   displayName: build
 - bash: PATH=$(path) $(interpreter) -m auditwheel repair target/wheels/orjson*.whl
   displayName: verify that wheel conforms to manylinux tag
@@ -35,5 +35,5 @@ steps:
 - bash: PATH=$(path) ./ci/deploy target/wheels/*.whl
   displayName: deploy
   env:
-    TWINE_PASSWORD: $(TWINE_PASSWORD)
-    TWINE_USERNAME: $(TWINE_USERNAME)
+    MATURIN_PASSWORD: $(TWINE_PASSWORD)
+    MATURIN_USERNAME: $(TWINE_USERNAME)

ci/azure-linux-container.yml

@@ -9,7 +9,7 @@ steps:
   displayName: rustup
 - bash: rustup default $(toolchain)
   displayName: ensure toolchain
-- bash: pip install --upgrade pip maturin==0.9.4 twine
+- bash: pip install --upgrade pip maturin==0.10.6
   displayName: build dependencies
 - bash: pip install -r test/requirements.txt -r integration/requirements.txt
   displayName: test dependencies
@@ -38,10 +38,10 @@ steps:
 - bash: ./ci/deploy target/wheels/*_x86_64.whl
   displayName: deploy x86_64
   env:
-    TWINE_PASSWORD: $(TWINE_PASSWORD)
-    TWINE_USERNAME: $(TWINE_USERNAME)
+    MATURIN_PASSWORD: $(TWINE_PASSWORD)
+    MATURIN_USERNAME: $(TWINE_USERNAME)
 - bash: ./ci/deploy target/wheels/*_universal2.whl
   displayName: deploy universal2
   env:
-    TWINE_PASSWORD: $(TWINE_PASSWORD)
-    TWINE_USERNAME: $(TWINE_USERNAME)
+    MATURIN_PASSWORD: $(TWINE_PASSWORD)
+    MATURIN_USERNAME: $(TWINE_USERNAME)

ci/azure-macos.yml

@@ -4,7 +4,7 @@ pr:
     - '*'
 
 variables:
-  toolchain: nightly-2021-05-25
+  toolchain: nightly-2021-06-24
 
 jobs:
 
@@ -39,13 +39,13 @@ jobs:
 - job: linux_python310_amd64_manylinux2014
   pool:
     vmImage: ubuntu-20.04
-  container: python:3.10-rc-buster
+  container: quay.io/pypa/manylinux_2_24_x86_64:latest
   variables:
     interpreter: python3.10
-    manylinux: 2014
-    path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+    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
     target: x86_64-unknown-linux-gnu
-    verifyManylinux: false
+    verifyManylinux: true
   steps:
   - checkout: self
   - template: ./azure-linux-container.yml

ci/azure-pipelines.yml

@@ -8,7 +8,7 @@ steps:
   displayName: rustup
 - bash: rustup default $(toolchain)
   displayName: ensure toolchain
-- bash: pip install --upgrade pip maturin==0.10.6 twine
+- bash: pip install --upgrade pip maturin==0.10.6
   displayName: build dependencies
 - bash: python3 -m pip install -r test/requirements.txt -r integration/requirements.txt
   displayName: test dependencies
@@ -25,5 +25,5 @@ steps:
 - bash: ./ci/deploy target/wheels/*.tar.gz
   displayName: deploy
   env:
-    TWINE_PASSWORD: $(TWINE_PASSWORD)
-    TWINE_USERNAME: $(TWINE_USERNAME)
+    MATURIN_PASSWORD: $(TWINE_PASSWORD)
+    MATURIN_USERNAME: $(TWINE_USERNAME)

ci/azure-sdist.yml

@@ -11,7 +11,7 @@ steps:
     rustup default $(toolchain)
     echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
   displayName: rustup
-- script: python.exe -m pip install --upgrade pip maturin==0.10.6 twine
+- script: python.exe -m pip install --upgrade pip maturin==0.10.6
   displayName: build dependencies
 - script: python.exe -m pip install -r test\requirements.txt -r integration\requirements.txt
   displayName: test dependencies
@@ -30,5 +30,5 @@ steps:
 - bash: ./ci/deploy /d/a/1/s/target/wheels/*.whl
   displayName: deploy
   env:
-    TWINE_PASSWORD: $(TWINE_PASSWORD)
-    TWINE_USERNAME: $(TWINE_USERNAME)
+    MATURIN_PASSWORD: $(TWINE_PASSWORD)
+    MATURIN_USERNAME: $(TWINE_USERNAME)

ci/azure-win.yml

@@ -2,8 +2,6 @@
 
 set -eou pipefail
 
-twine --version
-
 if [ -z ${DRONE_TAG+x} ]; then
     tag=$(git name-rev --tags --name-only $(git rev-parse HEAD))
 else
@@ -17,4 +15,4 @@ if [[ "$tag" == "undefined" ]]; then
     exit 0
 fi
 
-twine upload --non-interactive --skip-existing "$1"
+maturin upload --skip-existing --username "$MATURIN_USERNAME" "$1"

ci/deploy

@@ -6,19 +6,19 @@ platform:
   arch: arm64
 steps:
 - name: test
-  image: python:3.10-rc-buster
+  image: quay.io/pypa/manylinux_2_24_aarch64:latest
   environment:
-    PATH: "/root/.local/bin:/root/.cargo/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-    TWINE_USERNAME:
+    PATH: "/root/.local/bin:/root/.cargo/bin:/opt/python/cp310-cp310/bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin"
+    MATURIN_USERNAME:
       from_secret: twine_username
-    TWINE_PASSWORD:
+    MATURIN_PASSWORD:
       from_secret: twine_password
   commands:
-    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-05-25 --profile minimal -y
-    - python3.10 -m pip install --upgrade pip maturin==0.10.6
-    - maturin build --no-sdist --release --strip --manylinux 2014 --skip-auditwheel --interpreter python3.10
-    - python3.10 -m pip install target/wheels/orjson*.whl
-    - python3.10 -m pip install -r test/requirements.txt -r integration/requirements.txt twine
+    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-06-24 --profile minimal -y
+    - python3.10 -m pip install --user --upgrade pip maturin==0.10.6
+    - maturin build --no-sdist --release --strip --manylinux 2_24 --interpreter python3.10
+    - python3.10 -m pip install --user target/wheels/orjson*.whl
+    - python3.10 -m pip install --user -r test/requirements.txt -r integration/requirements.txt
     - pytest -s -rxX -v test
     - ./integration/run thread
     - ./integration/run http
@@ -33,16 +33,16 @@ steps:
   image: quay.io/pypa/manylinux2014_aarch64:latest
   environment:
     PATH: "/root/.local/bin:/root/.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"
-    TWINE_USERNAME:
+    MATURIN_USERNAME:
       from_secret: twine_username
-    TWINE_PASSWORD:
+    MATURIN_PASSWORD:
       from_secret: twine_password
   commands:
-    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-05-25 --profile minimal -y
-    - python3.9 -m pip install --upgrade pip maturin==0.10.6
+    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-06-24 --profile minimal -y
+    - python3.9 -m pip install --user --upgrade pip maturin==0.10.6
     - maturin build --no-sdist --release --strip --manylinux 2014 --interpreter python3.9
-    - python3.9 -m pip install target/wheels/orjson*.whl
-    - python3.9 -m pip install -r test/requirements.txt -r integration/requirements.txt twine
+    - python3.9 -m pip install --user target/wheels/orjson*.whl
+    - python3.9 -m pip install --user -r test/requirements.txt -r integration/requirements.txt
     - pytest -s -rxX -v test
     - ./integration/run thread
     - ./integration/run http
@@ -57,16 +57,16 @@ steps:
   image: quay.io/pypa/manylinux2014_aarch64:latest
   environment:
     PATH: "/root/.local/bin:/root/.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"
-    TWINE_USERNAME:
+    MATURIN_USERNAME:
       from_secret: twine_username
-    TWINE_PASSWORD:
+    MATURIN_PASSWORD:
       from_secret: twine_password
   commands:
-    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-05-25 --profile minimal -y
-    - python3.8 -m pip install --upgrade pip maturin==0.10.6
+    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-06-24 --profile minimal -y
+    - python3.8 -m pip install --user --upgrade pip maturin==0.10.6
     - maturin build --no-sdist --release --strip --manylinux 2014 --interpreter python3.8
-    - python3.8 -m pip install target/wheels/orjson*.whl
-    - python3.8 -m pip install -r test/requirements.txt -r integration/requirements.txt twine
+    - python3.8 -m pip install --user target/wheels/orjson*.whl
+    - python3.8 -m pip install --user -r test/requirements.txt -r integration/requirements.txt
     - pytest -s -rxX -v test
     - ./integration/run thread
     - ./integration/run http
@@ -81,16 +81,16 @@ steps:
   image: quay.io/pypa/manylinux2014_aarch64:latest
   environment:
     PATH: "/root/.local/bin:/root/.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"
-    TWINE_USERNAME:
+    MATURIN_USERNAME:
       from_secret: twine_username
-    TWINE_PASSWORD:
+    MATURIN_PASSWORD:
       from_secret: twine_password
   commands:
-    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-05-25 --profile minimal -y
-    - python3.7 -m pip install --upgrade pip maturin==0.10.6
+    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-06-24 --profile minimal -y
+    - python3.7 -m pip install --user --upgrade pip maturin==0.10.6
     - maturin build --no-sdist --release --strip --manylinux 2014 --interpreter python3.7
-    - python3.7 -m pip install target/wheels/orjson*.whl
-    - python3.7 -m pip install -r test/requirements.txt -r integration/requirements.txt twine
+    - python3.7 -m pip install --user target/wheels/orjson*.whl
+    - python3.7 -m pip install --user -r test/requirements.txt -r integration/requirements.txt
     - pytest -s -rxX -v test
     - ./integration/run thread
     - ./integration/run http
@@ -105,16 +105,16 @@ steps:
   image: quay.io/pypa/manylinux2014_aarch64:latest
   environment:
     PATH: "/root/.local/bin:/root/.cargo/bin:/opt/python/cp36-cp36m/bin:/opt/rh/devtoolset-9/root/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-    TWINE_USERNAME:
+    MATURIN_USERNAME:
       from_secret: twine_username
-    TWINE_PASSWORD:
+    MATURIN_PASSWORD:
       from_secret: twine_password
   commands:
-    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-05-25 --profile minimal -y
-    - python3.6 -m pip install --upgrade pip maturin==0.10.6
+    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-06-24 --profile minimal -y
+    - python3.6 -m pip install --user --upgrade pip maturin==0.10.6
     - maturin build --no-sdist --release --strip --manylinux 2014 --interpreter python3.6
-    - python3.6 -m pip install target/wheels/orjson*.whl
-    - python3.6 -m pip install -r test/requirements.txt -r integration/requirements.txt twine
+    - python3.6 -m pip install --user target/wheels/orjson*.whl
+    - python3.6 -m pip install --user -r test/requirements.txt -r integration/requirements.txt
     - pytest -s -rxX -v test
     - ./integration/run thread
     - ./integration/run http