Skip to content

Commit

Permalink
nightly-2021-08-17
Browse files Browse the repository at this point in the history
  • Loading branch information
ijl committed Aug 17, 2021
1 parent fb1a3bb commit e8a9d74
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 21 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 0 additions & 4 deletions ci/azure-linux-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
9 changes: 1 addition & 8 deletions ci/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pr:
- '*'

variables:
toolchain: nightly-2021-08-04
toolchain: nightly-2021-08-17

jobs:

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ci/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e8a9d74

Please sign in to comment.