Skip to content

Commit 623a524

Browse files
committed
cargo update, nightly-2021-10-01
1 parent f4bc1e3 commit 623a524

13 files changed

+62
-46
lines changed

Cargo.lock

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ encoding_rs = { version = "0.8", default_features = false }
6969
inlinable_string = { version = "0.1" }
7070
itoa = { version = "0.4", default_features = false }
7171
once_cell = { version = "1", default_features = false }
72-
pyo3 = { version = "^0.14.2", default_features = false, features = ["extension-module"]}
72+
pyo3 = { version = "^0.14.5", default_features = false, features = ["extension-module"]}
7373
ryu = { version = "1", default_features = false }
7474
serde = { version = "1", default_features = false }
75-
serde_json = { version = "^1.0.66", default_features = false, features = ["std", "float_roundtrip"] }
75+
serde_json = { version = "^1.0.68", default_features = false, features = ["std", "float_roundtrip"] }
7676
simdutf8 = { version = "0.1", default_features = false, features = ["std"] }
77-
smallvec = { version = "^1.6", default_features = false, features = ["union", "write"] }
77+
smallvec = { version = "^1.7", default_features = false, features = ["union", "write"] }
7878

7979
[profile.release]
8080
codegen-units = 1
@@ -83,3 +83,6 @@ incremental = false
8383
lto = "thin"
8484
opt-level = 3
8585
panic = "abort"
86+
87+
[profile.release.build-override]
88+
opt-level = 0

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1171,7 +1171,7 @@ maturin build --no-sdist --release --strip --cargo-extra-args="--features=unstab
11711171

11721172
To build on the stable channel, do not specify `--features=unstable-simd`.
11731173

1174-
The project's own CI tests against `nightly-2021-08-17` and stable 1.54. It
1174+
The project's own CI tests against `nightly-2021-10-01` and stable 1.54. It
11751175
is prudent to pin the nightly version because that channel can introduce
11761176
breaking changes.
11771177

build.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
use std::process::Command;
2+
3+
fn main() {
4+
let out = Command::new("python")
5+
.args(&["-c", "import sys; print(sys.version_info[1])"])
6+
.output()
7+
.expect("python version did not print");
8+
let version = u8::from_str_radix(String::from_utf8_lossy(&out.stdout).trim(), 10)
9+
.expect("python version was not parsed");
10+
for each in 8..(version + 1) {
11+
println!("cargo:rustc-cfg=Py_3_{}", each);
12+
}
13+
}

ci/azure-debug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ steps:
2020
displayName: rustup
2121
- bash: PATH=$(path) rustup default $(toolchain)
2222
displayName: ensure toolchain
23-
- bash: PATH=$(path) $(interpreter) -m pip install --user --upgrade pip maturin==0.11.2
23+
- bash: PATH=$(path) $(interpreter) -m pip install --user --upgrade pip maturin==0.11.4
2424
displayName: build dependencies
2525
- bash: PATH=$(path) $(interpreter) -m pip install --user -r test/requirements.txt -r integration/requirements.txt
2626
displayName: test dependencies

ci/azure-linux-container.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ steps:
2020
displayName: rustup
2121
- bash: PATH=$(path) rustup default $(toolchain)
2222
displayName: ensure toolchain
23-
- bash: PATH=$(path) $(interpreter) -m pip install --user --upgrade pip maturin==0.11.2 auditwheel
23+
- bash: PATH=$(path) $(interpreter) -m pip install --user --upgrade pip maturin==0.11.4 auditwheel
2424
displayName: build dependencies
2525
- bash: PATH=$(path) maturin build --no-sdist --release --strip $(extra) --compatibility $(manylinux) --interpreter $(interpreter)
2626
env:

ci/azure-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
displayName: rustup
88
- bash: rustup default $(toolchain)
99
displayName: ensure toolchain
10-
- bash: pip install --upgrade pip maturin==0.11.2
10+
- bash: pip install --upgrade pip maturin==0.11.4
1111
displayName: build dependencies
1212
- bash: pip install -r test/requirements.txt -r integration/requirements.txt
1313
displayName: test dependencies

ci/azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pr:
44
- '*'
55

66
variables:
7-
toolchain: nightly-2021-08-17
7+
toolchain: nightly-2021-10-01
88

99
jobs:
1010

@@ -180,7 +180,7 @@ jobs:
180180
pool:
181181
vmImage: windows-2019
182182
variables:
183-
interpreter: C:\hostedtoolcache\windows\Python\3.9.6\x64\python.exe
183+
interpreter: C:\hostedtoolcache\windows\Python\3.9.7\x64\python.exe
184184
target: x86_64-pc-windows-msvc
185185
steps:
186186
- task: UsePythonVersion@0

ci/azure-sdist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ steps:
1414
displayName: rustup
1515
- bash: PATH=$(path) rustup default $(toolchain)
1616
displayName: ensure toolchain
17-
- bash: PATH=$(path) $(interpreter) -m pip install --user --upgrade pip maturin==0.11.2
17+
- bash: PATH=$(path) $(interpreter) -m pip install --user --upgrade pip maturin==0.11.4
1818
displayName: build dependencies
1919
- bash: PATH=$(path) $(interpreter) -m pip install --user -r test/requirements.txt -r integration/requirements.txt
2020
displayName: test dependencies

ci/azure-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ steps:
1111
rustup default $(toolchain)
1212
echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
1313
displayName: rustup
14-
- script: python.exe -m pip install --upgrade pip maturin==0.11.2
14+
- script: python.exe -m pip install --upgrade pip maturin==0.11.4
1515
displayName: build dependencies
1616
- script: python.exe -m pip install -r test\requirements.txt -r integration\requirements.txt
1717
displayName: test dependencies

ci/drone.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ steps:
1414
MATURIN_PASSWORD:
1515
from_secret: twine_password
1616
commands:
17-
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-08-17 --profile minimal -y
18-
- python3.10 -m pip install --user --upgrade pip maturin==0.11.2
17+
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-10-01 --profile minimal -y
18+
- python3.10 -m pip install --user --upgrade pip maturin==0.11.4
1919
- maturin build --no-sdist --release --strip --compatibility 2_24 --cargo-extra-args="--features=unstable-simd" --interpreter python3.10
2020
- python3.10 -m pip install --user target/wheels/orjson*.whl
2121
- python3.10 -m pip install --user -r test/requirements.txt -r integration/requirements.txt
@@ -38,8 +38,8 @@ steps:
3838
MATURIN_PASSWORD:
3939
from_secret: twine_password
4040
commands:
41-
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-08-17 --profile minimal -y
42-
- python3.9 -m pip install --user --upgrade pip maturin==0.11.2
41+
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-10-01 --profile minimal -y
42+
- python3.9 -m pip install --user --upgrade pip maturin==0.11.4
4343
- maturin build --no-sdist --release --strip --compatibility 2_24 --cargo-extra-args="--features=unstable-simd" --interpreter python3.9
4444
- python3.9 -m pip install --user target/wheels/orjson*.whl
4545
- python3.9 -m pip install --user -r test/requirements.txt -r integration/requirements.txt
@@ -62,8 +62,8 @@ steps:
6262
MATURIN_PASSWORD:
6363
from_secret: twine_password
6464
commands:
65-
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-08-17 --profile minimal -y
66-
- python3.8 -m pip install --user --upgrade pip maturin==0.11.2
65+
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-10-01 --profile minimal -y
66+
- python3.8 -m pip install --user --upgrade pip maturin==0.11.4
6767
- maturin build --no-sdist --release --strip --compatibility 2_24 --cargo-extra-args="--features=unstable-simd" --interpreter python3.8
6868
- python3.8 -m pip install --user target/wheels/orjson*.whl
6969
- python3.8 -m pip install --user -r test/requirements.txt -r integration/requirements.txt
@@ -86,8 +86,8 @@ steps:
8686
MATURIN_PASSWORD:
8787
from_secret: twine_password
8888
commands:
89-
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-08-17 --profile minimal -y
90-
- python3.7 -m pip install --user --upgrade pip maturin==0.11.2
89+
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-10-01 --profile minimal -y
90+
- python3.7 -m pip install --user --upgrade pip maturin==0.11.4
9191
- maturin build --no-sdist --release --strip --compatibility 2_24 --cargo-extra-args="--features=unstable-simd" --interpreter python3.7
9292
- python3.7 -m pip install --user target/wheels/orjson*.whl
9393
- python3.7 -m pip install --user -r test/requirements.txt -r integration/requirements.txt

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ repository = "https://github.com/ijl/orjson"
44

55
[build-system]
66
build-backend = "maturin"
7-
requires = ["maturin>=0.11.2,<0.12"]
7+
requires = ["maturin>=0.11.4,<0.12"]
88

99
[tool.maturin]
1010
sdist-include = ["Cargo.lock"]
1111
strip = true
1212

1313
[tool.black]
1414
line-length = 88
15-
target-version = ['py36', 'py37', 'py38']
15+
target-version = ['py37', 'py38', 'py39']
1616
include = '\.pyi?$'

test/test_transform.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def test_object_same_key_unclear_values(self):
8383
"""
8484
object_same_key_unclear_values.json
8585
"""
86-
self._pass_transform("object_same_key_unclear_values.json", b'{"a":0}')
86+
self._pass_transform("object_same_key_unclear_values.json", b'{"a":-0.0}')
8787

8888
def test_string_1_escaped_invalid_codepoint(self):
8989
"""

0 commit comments

Comments
 (0)