cargo update, nightly-2021-10-01

ijl · Oct 1, 2021 · 623a524 · 623a524
1 parent f4bc1e3
commit 623a524
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 46 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -69,12 +69,12 @@ encoding_rs = { version = "0.8", default_features = false }
 inlinable_string = { version = "0.1" }
 itoa = { version = "0.4", default_features = false }
 once_cell = { version = "1", default_features = false }
-pyo3 = { version = "^0.14.2", default_features = false, features = ["extension-module"]}
+pyo3 = { version = "^0.14.5", default_features = false, features = ["extension-module"]}
 ryu = { version = "1", default_features = false }
 serde = { version = "1", default_features = false }
-serde_json = { version = "^1.0.66", default_features = false, features = ["std", "float_roundtrip"] }
+serde_json = { version = "^1.0.68", default_features = false, features = ["std", "float_roundtrip"] }
 simdutf8 = { version = "0.1", default_features = false, features = ["std"] }
-smallvec = { version = "^1.6", default_features = false, features = ["union", "write"] }
+smallvec = { version = "^1.7", default_features = false, features = ["union", "write"] }
 
 [profile.release]
 codegen-units = 1
@@ -83,3 +83,6 @@ incremental = false
 lto = "thin"
 opt-level = 3
 panic = "abort"
+
+[profile.release.build-override]
+opt-level = 0
diff --git 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-17` and stable 1.54. It
+The project's own CI tests against `nightly-2021-10-01` and stable 1.54. It
 is prudent to pin the nightly version because that channel can introduce
 breaking changes.
 

diff --git a/build.rs b/build.rs
@@ -0,0 +1,13 @@
+use std::process::Command;
+
+fn main() {
+    let out = Command::new("python")
+        .args(&["-c", "import sys; print(sys.version_info[1])"])
+        .output()
+        .expect("python version did not print");
+    let version = u8::from_str_radix(String::from_utf8_lossy(&out.stdout).trim(), 10)
+        .expect("python version was not parsed");
+    for each in 8..(version + 1) {
+        println!("cargo:rustc-cfg=Py_3_{}", each);
+    }
+}
diff --git a/ci/azure-debug.yml b/ci/azure-debug.yml
@@ -20,7 +20,7 @@ steps:
   displayName: rustup
 - bash: PATH=$(path) rustup default $(toolchain)
   displayName: ensure toolchain
-- bash: PATH=$(path) $(interpreter) -m pip install --user --upgrade pip maturin==0.11.2
+- bash: PATH=$(path) $(interpreter) -m pip install --user --upgrade pip maturin==0.11.4
   displayName: build dependencies
 - bash: PATH=$(path) $(interpreter) -m pip install --user -r test/requirements.txt -r integration/requirements.txt
   displayName: test dependencies

diff --git a/ci/azure-linux-container.yml b/ci/azure-linux-container.yml
@@ -20,7 +20,7 @@ steps:
   displayName: rustup
 - bash: PATH=$(path) rustup default $(toolchain)
   displayName: ensure toolchain
-- bash: PATH=$(path) $(interpreter) -m pip install --user --upgrade pip maturin==0.11.2 auditwheel
+- bash: PATH=$(path) $(interpreter) -m pip install --user --upgrade pip maturin==0.11.4 auditwheel
   displayName: build dependencies
 - bash: PATH=$(path) maturin build --no-sdist --release --strip $(extra) --compatibility $(manylinux) --interpreter $(interpreter)
   env:

diff --git a/ci/azure-macos.yml b/ci/azure-macos.yml
@@ -7,7 +7,7 @@ steps:
   displayName: rustup
 - bash: rustup default $(toolchain)
   displayName: ensure toolchain
-- bash: pip install --upgrade pip maturin==0.11.2
+- bash: pip install --upgrade pip maturin==0.11.4
   displayName: build dependencies
 - bash: pip install -r test/requirements.txt -r integration/requirements.txt
   displayName: test dependencies

diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
@@ -4,7 +4,7 @@ pr:
     - '*'
 
 variables:
-  toolchain: nightly-2021-08-17
+  toolchain: nightly-2021-10-01
 
 jobs:
 
@@ -180,7 +180,7 @@ jobs:
   pool:
     vmImage: windows-2019
   variables:
-    interpreter: C:\hostedtoolcache\windows\Python\3.9.6\x64\python.exe
+    interpreter: C:\hostedtoolcache\windows\Python\3.9.7\x64\python.exe
     target: x86_64-pc-windows-msvc
   steps:
   - task: UsePythonVersion@0

diff --git a/ci/azure-sdist.yml b/ci/azure-sdist.yml
@@ -14,7 +14,7 @@ steps:
   displayName: rustup
 - bash: PATH=$(path) rustup default $(toolchain)
   displayName: ensure toolchain
-- bash: PATH=$(path) $(interpreter) -m pip install --user --upgrade pip maturin==0.11.2
+- bash: PATH=$(path) $(interpreter) -m pip install --user --upgrade pip maturin==0.11.4
   displayName: build dependencies
 - bash: PATH=$(path) $(interpreter) -m pip install --user -r test/requirements.txt -r integration/requirements.txt
   displayName: test dependencies

diff --git a/ci/azure-win.yml b/ci/azure-win.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.11.2
+- script: python.exe -m pip install --upgrade pip maturin==0.11.4
   displayName: build dependencies
 - script: python.exe -m pip install -r test\requirements.txt -r integration\requirements.txt
   displayName: test dependencies

diff --git a/ci/drone.yml b/ci/drone.yml
@@ -14,8 +14,8 @@ steps:
     MATURIN_PASSWORD:
       from_secret: twine_password
   commands:
-    - 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
+    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-10-01 --profile minimal -y
+    - python3.10 -m pip install --user --upgrade pip maturin==0.11.4
     - 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
     - python3.10 -m pip install --user -r test/requirements.txt -r integration/requirements.txt
@@ -38,8 +38,8 @@ steps:
     MATURIN_PASSWORD:
       from_secret: twine_password
   commands:
-    - 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
+    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-10-01 --profile minimal -y
+    - python3.9 -m pip install --user --upgrade pip maturin==0.11.4
     - 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
     - python3.9 -m pip install --user -r test/requirements.txt -r integration/requirements.txt
@@ -62,8 +62,8 @@ steps:
     MATURIN_PASSWORD:
       from_secret: twine_password
   commands:
-    - 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
+    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-10-01 --profile minimal -y
+    - python3.8 -m pip install --user --upgrade pip maturin==0.11.4
     - 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
     - python3.8 -m pip install --user -r test/requirements.txt -r integration/requirements.txt
@@ -86,8 +86,8 @@ steps:
     MATURIN_PASSWORD:
       from_secret: twine_password
   commands:
-    - 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
+    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-10-01 --profile minimal -y
+    - python3.7 -m pip install --user --upgrade pip maturin==0.11.4
     - 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
     - python3.7 -m pip install --user -r test/requirements.txt -r integration/requirements.txt

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,13 +4,13 @@ repository = "https://github.com/ijl/orjson"
 
 [build-system]
 build-backend = "maturin"
-requires = ["maturin>=0.11.2,<0.12"]
+requires = ["maturin>=0.11.4,<0.12"]
 
 [tool.maturin]
 sdist-include = ["Cargo.lock"]
 strip = true
 
 [tool.black]
 line-length = 88
-target-version = ['py36', 'py37', 'py38']
+target-version = ['py37', 'py38', 'py39']
 include = '\.pyi?$'
diff --git a/test/test_transform.py b/test/test_transform.py
@@ -83,7 +83,7 @@ def test_object_same_key_unclear_values(self):
         """
         object_same_key_unclear_values.json
         """
-        self._pass_transform("object_same_key_unclear_values.json", b'{"a":0}')
+        self._pass_transform("object_same_key_unclear_values.json", b'{"a":-0.0}')
 
     def test_string_1_escaped_invalid_codepoint(self):
         """