manylinux_2_24, maturin 0.11, RUSTFLAGS

Author: ijl

.cargo/config

@@ -4,14 +4,14 @@ version = "3.6.0"
 authors = ["ijl <[email protected]>"]
 description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
 edition = "2018"
+resolver = "2"
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/ijl/orjson"
 homepage = "https://github.com/ijl/orjson"
 readme = "README.md"
 keywords = ["fast", "json", "dataclass", "dataclasses", "datetime", "rfc", "8259", "3339"]
 include = [
     "build.rs",
-    ".cargo",
     "Cargo.toml",
     "CHANGELOG.md",
     "data/*",
@@ -60,10 +60,10 @@ inlinable_string = { version = "0.1" }
 itoa = { version = "0.4", default_features = false }
 once_cell = { version = "1", default_features = false }
 pyo3 = { version = "^0.13.2", default_features = false, features = ["extension-module"]}
-ryu = { version = "1" }
+ryu = { version = "1", default_features = false }
 serde = { version = "1", default_features = false }
 serde_json = { path = "./json", default_features = false, features = ["std"] }
-smallvec = { version = "^1.6", default_features = false, features = ["const_generics", "union", "specialization", "write"] }
+smallvec = { version = "^1.6", default_features = false, features = ["union", "write"] }
 
 [target.'cfg(any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "i686", target_arch = "armv7"))'.dependencies]
 encoding_rs = { version = "0.8", default_features = false, features = ["simd-accel"] }

Cargo.lock

@@ -78,13 +78,10 @@ available in the repository.
 To install a wheel from PyPI:
 
 ```sh
-pip install --upgrade "pip>=19.3" # manylinux2014 support
+pip install --upgrade "pip>=20.3" # manylinux_x_y, universal2 wheel support
 pip install --upgrade orjson
 ```
 
-Notice that Linux environments with a `pip` version shipped in 2018 or earlier
-must first upgrade `pip` to support `manylinux2014` wheels.
-
 To build a wheel, see [packaging](https://github.com/ijl/orjson#packaging).
 
 ### Quickstart
@@ -1142,8 +1139,9 @@ scripts. The memory results can be reproduced using the `pymem` script.
 
 ### Why can't I install it from PyPI?
 
-Probably `pip` needs to be upgraded. `pip` added support for `manylinux2014`
-in 2019.
+
+Probably `pip` needs to be upgraded to version 20.3 or later to support
+the latest manylinux_x_y or universal2 wheel formats.
 
 ### Will it deserialize to dataclasses, UUIDs, decimals, etc or support object_hook?
 
@@ -1161,49 +1159,30 @@ If someone implements it well.
 
 ## Packaging
 
-To package orjson requires [Rust](https://www.rust-lang.org/) on the
- nightly channel and the [maturin](https://github.com/PyO3/maturin)
-build tool. maturin can be installed from PyPI or packaged as
-well. This is the simplest and recommended way of installing
-from source, assuming `rustup` is available from a
-package manager:
-
-```sh
-rustup default nightly
-pip wheel --no-binary=orjson orjson
-```
+To package orjson requires [Rust](https://www.rust-lang.org/) and the
+[maturin](https://github.com/PyO3/maturin) build tool.
 
-This is an example of building a wheel using the repository as source,
-`rustup` installed from upstream, and a pinned version of Rust:
+This is an example for the x86_64-unknown-linux-gnu target:
 
 ```sh
-pip install maturin
-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
-```
+RUSTFLAGS="-C target-cpu=k8" maturin build --no-sdist --release --strip
+````
 
-Problems with the Rust nightly channel may require pinning a version.
-`nightly-2021-06-24` is known to be ok.
+The explicit `RUSTFLAGS` enables SSE2 on amd64. aarch64 does not need any
+`target-feature` specified.
 
-orjson is tested for amd64 and aarch64 on Linux, macOS, and Windows. It
-may not work on 32-bit targets. It has recommended `RUSTFLAGS`
-specified in `.cargo/config` so it is recommended to either not set
-`RUSTFLAGS` or include these options.
+The project's own CI tests against `nightly-2021-08-04`. It is prudent to
+pin this version because Rust nightly can introduce breaking changes.
 
-There are no runtime dependencies other than libc.
-
-orjson's tests are included in the source distribution on PyPI. It is
-necessarily to install dependencies from PyPI specified in
-`test/requirements.txt`. These require a C compiler. The tests do not
-make network requests.
+orjson is tested for amd64 and aarch64 on Linux and amd64 on macOS and
+Windows. It may not work on 32-bit targets.
 
-The tests should be run as part of the build. It can be run like this:
+There are no runtime dependencies other than libc.
 
-```sh
-pip install -r test/requirements.txt
-pytest -q test
-```
+orjson's tests are included in the source distribution on PyPI. The
+requirements to run the tests are specified in `test/requirements.txt`. The
+tests should be run as part of the build. It can be run with
+`pytest -q test`.
 
 ## License
 

Cargo.toml

@@ -10,11 +10,13 @@ steps:
   displayName: rustup
 - bash: PATH=$(path) rustup default $(toolchain)
   displayName: ensure toolchain
-- bash: PATH=$(path) pip install --user --upgrade pip maturin==0.10.6
+- bash: PATH=$(path) pip install --user --upgrade pip maturin==0.11.2
   displayName: build dependencies
 - bash: PATH=$(path) $(interpreter) -m pip install --user -r test/requirements.txt -r integration/requirements.txt
   displayName: test dependencies
 - bash: PATH=$(path) maturin build --no-sdist --strip --manylinux $(manylinux) --interpreter $(interpreter) --target $(target)
+  env:
+    RUSTFLAGS: "-C target-cpu=k8"
   displayName: build debug
 - bash: PATH=$(path) $(interpreter) -m pip install --user target/wheels/orjson*.whl
   displayName: install

README.md

@@ -11,9 +11,11 @@ steps:
   displayName: rustup
 - bash: PATH=$(path) rustup default $(toolchain)
   displayName: ensure toolchain
-- bash: PATH=$(path) pip install --user --upgrade pip maturin==0.10.6 auditwheel
+- bash: PATH=$(path) pip install --user --upgrade pip maturin==0.11.2 auditwheel
   displayName: build dependencies
 - bash: PATH=$(path) maturin build --no-sdist --release --strip --manylinux $(manylinux) --interpreter $(interpreter) --target $(target)
+  env:
+    RUSTFLAGS: "-C target-cpu=k8"
   displayName: build
 - bash: PATH=$(path) $(interpreter) -m auditwheel repair target/wheels/orjson*.whl
   displayName: verify that wheel conforms to manylinux tag

ci/azure-debug.yml

@@ -9,7 +9,7 @@ steps:
   displayName: rustup
 - bash: rustup default $(toolchain)
   displayName: ensure toolchain
-- bash: pip install --upgrade pip maturin==0.10.6
+- bash: pip install --upgrade pip maturin==0.11.2
   displayName: build dependencies
 - bash: pip install -r test/requirements.txt -r integration/requirements.txt
   displayName: test dependencies

ci/azure-linux-container.yml

@@ -4,32 +4,32 @@ pr:
     - '*'
 
 variables:
-  toolchain: nightly-2021-06-24
+  toolchain: nightly-2021-08-04
 
 jobs:
 
 - job: linux_sdist
   pool:
     vmImage: ubuntu-20.04
   variables:
-    interpreter: python3.8
+    interpreter: python3.9
     target: x86_64-unknown-linux-gnu
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.8'
+      versionSpec: '3.9'
       addToPath: true
   - checkout: self
   - template: ./azure-sdist.yml
 
 - job: linux_debug
   pool:
     vmImage: ubuntu-20.04
-  container: quay.io/pypa/manylinux2014_x86_64:latest
+  container: quay.io/pypa/manylinux_2_24_x86_64:latest
   variables:
-    interpreter: python3.8
+    interpreter: python3.9
     manylinux: off
-    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
+    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
     target: x86_64-unknown-linux-gnu
     verifyManylinux: false
   steps:
@@ -64,56 +64,42 @@ jobs:
   - checkout: self
   - template: ./azure-linux-container.yml
 
-- job: linux_python39_amd64_manylinux2014
-  pool:
-    vmImage: ubuntu-20.04
-  container: quay.io/pypa/manylinux2014_x86_64:latest
-  variables:
-    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
-    target: x86_64-unknown-linux-gnu
-    verifyManylinux: true
-  steps:
-  - checkout: self
-  - template: ./azure-linux-container.yml
-
-- job: linux_python38_amd64_manylinux2014
+- job: linux_python38_amd64_manylinux_2_24
   pool:
     vmImage: ubuntu-20.04
-  container: quay.io/pypa/manylinux2014_x86_64:latest
+  container: quay.io/pypa/manylinux_2_24_x86_64:latest
   variables:
     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
+    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
     target: x86_64-unknown-linux-gnu
     verifyManylinux: true
   steps:
   - checkout: self
   - template: ./azure-linux-container.yml
 
-- job: linux_python37_amd64_manylinux2014
+- job: linux_python37_amd64_manylinux_2_24
   pool:
     vmImage: ubuntu-20.04
-  container: quay.io/pypa/manylinux2014_x86_64:latest
+  container: quay.io/pypa/manylinux_2_24_x86_64:latest
   variables:
     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
+    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
     target: x86_64-unknown-linux-gnu
     verifyManylinux: true
   steps:
   - checkout: self
   - template: ./azure-linux-container.yml
 
-- job: linux_python36_amd64_manylinux2014
+- job: linux_python36_amd64_manylinux_2_24
   pool:
     vmImage: ubuntu-20.04
-  container: quay.io/pypa/manylinux2014_x86_64:latest
+  container: quay.io/pypa/manylinux_2_24_x86_64:latest
   variables:
     interpreter: python3.6
-    manylinux: 2014
-    path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.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
+    manylinux: 2_24
+    path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp36-cp36m/bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin
     target: x86_64-unknown-linux-gnu
     verifyManylinux: true
   steps:
@@ -184,7 +170,7 @@ jobs:
   pool:
     vmImage: windows-2019
   variables:
-    interpreter: C:\hostedtoolcache\windows\Python\3.9.5\x64\python.exe
+    interpreter: C:\hostedtoolcache\windows\Python\3.9.6\x64\python.exe
     target: x86_64-pc-windows-msvc
   steps:
   - task: UsePythonVersion@0

ci/azure-macos.yml

@@ -8,7 +8,7 @@ steps:
   displayName: rustup
 - bash: rustup default $(toolchain)
   displayName: ensure toolchain
-- bash: pip install --upgrade pip maturin==0.10.6
+- bash: pip install --upgrade pip maturin==0.11.2
   displayName: build dependencies
 - bash: python3 -m pip install -r test/requirements.txt -r integration/requirements.txt
   displayName: test dependencies

ci/azure-pipelines.yml

@@ -11,11 +11,13 @@ 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
+- script: python.exe -m pip install --upgrade pip maturin==0.11.2
   displayName: build dependencies
 - script: python.exe -m pip install -r test\requirements.txt -r integration\requirements.txt
   displayName: test dependencies
 - script: maturin.exe build --no-sdist --release --strip --interpreter $(interpreter)
+  env:
+    RUSTFLAGS: "-C target-cpu=k8"
   displayName: build
 - script: python.exe -m pip install orjson --no-index --find-links=D:\a\1\s\target\wheels
   displayName: install