pyo3 ^0.14.2

python3.6 is dropped because it's nearly end of life and there is now assertion error in pyo3::gil::prepare_freethreaded_python in CI when running integration/thread.
gtfierro · Aug 15, 2021 · a116ddf · a116ddf
1 parent 037e699
commit a116ddf
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 159 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,6 @@ homepage = "https://github.com/ijl/orjson"
 readme = "README.md"
 keywords = ["fast", "json", "dataclass", "dataclasses", "datetime", "rfc", "8259", "3339"]
 include = [
-    "build.rs",
     "Cargo.toml",
     "CHANGELOG.md",
     "data/*",
@@ -29,7 +28,7 @@ name = "orjson"
 crate-type = ["cdylib"]
 
 [package.metadata.maturin]
-requires-python = ">=3.6"
+requires-python = ">=3.7"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
@@ -40,7 +39,6 @@ classifiers = [
     "Operating System :: POSIX :: Linux",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
@@ -59,7 +57,7 @@ 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.13.2", default_features = false, features = ["extension-module"]}
+pyo3 = { version = "^0.14.2", default_features = false, features = ["extension-module"]}
 ryu = { version = "1", default_features = false }
 serde = { version = "1", default_features = false }
 serde_json = { path = "./json", default_features = false, features = ["std"] }
@@ -75,6 +73,3 @@ incremental = false
 lto = "thin"
 opt-level = 3
 panic = "abort"
-
-[profile.release.build-override]
-opt-level = 0
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ support for 64-bit
 * does not provide `load()` or `dump()` functions for reading from/writing to
 file-like objects
 
-orjson supports CPython 3.6, 3.7, 3.8, 3.9, and 3.10. It distributes x86_64/amd64
+orjson supports CPython 3.7, 3.8, 3.9, and 3.10. It distributes x86_64/amd64
 and aarch64/armv8 wheels for Linux and macOS. It distributes x86_64/amd64 wheels
 for Windows. orjson does not support PyPy. Releases follow semantic
 versioning and serializing a new object type without an opt-in flag is

diff --git a/build.rs b/build.rs
diff --git a/ci/azure-debug.yml b/ci/azure-debug.yml
@@ -2,7 +2,6 @@ parameters:
   interpreter: ''
   manylinux: ''
   path: ''
-  target: ''
   toolchain: ''
 
 steps:
@@ -14,7 +13,7 @@ steps:
   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)
+- bash: PATH=$(path) maturin build --no-sdist --strip --compatibility $(manylinux) --interpreter $(interpreter)
   env:
     RUSTFLAGS: "-C target-cpu=k8"
   displayName: build debug

diff --git a/ci/azure-linux-container.yml b/ci/azure-linux-container.yml
@@ -2,7 +2,6 @@ parameters:
   interpreter: ''
   manylinux: ''
   path: ''
-  target: ''
   toolchain: ''
   verifyManylinux: ''
 
@@ -13,7 +12,7 @@ steps:
   displayName: ensure toolchain
 - 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)
+- bash: PATH=$(path) maturin build --no-sdist --release --strip --compatibility $(manylinux) --interpreter $(interpreter)
   env:
     RUSTFLAGS: "-C target-cpu=k8"
   displayName: build

diff --git a/ci/azure-macos.yml b/ci/azure-macos.yml
@@ -1,7 +1,5 @@
 parameters:
   interpreter: ''
-  manylinux: ''
-  target: ''
   toolchain: ''
 
 steps:
@@ -13,7 +11,9 @@ steps:
   displayName: build dependencies
 - bash: pip install -r test/requirements.txt -r integration/requirements.txt
   displayName: test dependencies
-- bash: PATH=$HOME/.cargo/bin:$PATH maturin build --no-sdist --release --strip --manylinux $(manylinux) --interpreter $(interpreter) --target $(target)
+- bash: PATH=$HOME/.cargo/bin:$PATH maturin build --no-sdist --release --strip --interpreter $(interpreter)
+  env:
+    RUSTFLAGS: "-C target-cpu=k8"
   displayName: build
 - bash: pip install target/wheels/orjson*.whl
   displayName: install
@@ -29,7 +29,7 @@ steps:
   displayName: http
 - bash: rustup target add aarch64-apple-darwin
   displayName: rustup target
-- bash: PATH=$HOME/.cargo/bin:$PATH PYO3_CROSS_LIB_DIR=$(python -c "import sysconfig;print(sysconfig.get_config_var('LIBDIR'))") maturin build --no-sdist --release --strip --manylinux $(manylinux) --interpreter $(interpreter) --universal2
+- bash: PATH=$HOME/.cargo/bin:$PATH PYO3_CROSS_LIB_DIR=$(python -c "import sysconfig;print(sysconfig.get_config_var('LIBDIR'))") maturin build --no-sdist --release --strip --interpreter $(interpreter) --universal2
   displayName: build universal2
 - bash: pip install --force-reinstall target/wheels/orjson*universal2.whl
   displayName: install universal2

diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
@@ -13,7 +13,6 @@ jobs:
     vmImage: ubuntu-20.04
   variables:
     interpreter: python3.9
-    target: x86_64-unknown-linux-gnu
   steps:
   - task: UsePythonVersion@0
     inputs:
@@ -30,7 +29,6 @@ jobs:
     interpreter: python3.9
     manylinux: off
     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:
   - checkout: self
@@ -44,7 +42,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
-    target: x86_64-unknown-linux-gnu
     verifyManylinux: true
   steps:
   - checkout: self
@@ -58,7 +55,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
-    target: x86_64-unknown-linux-gnu
     verifyManylinux: true
   steps:
   - checkout: self
@@ -72,7 +68,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
-    target: x86_64-unknown-linux-gnu
     verifyManylinux: true
   steps:
   - checkout: self
@@ -86,21 +81,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
-    target: x86_64-unknown-linux-gnu
-    verifyManylinux: true
-  steps:
-  - checkout: self
-  - template: ./azure-linux-container.yml
-
-- job: linux_python36_amd64_manylinux_2_24
-  pool:
-    vmImage: ubuntu-20.04
-  container: quay.io/pypa/manylinux_2_24_x86_64:latest
-  variables:
-    interpreter: python3.6
-    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:
   - checkout: self
@@ -114,7 +94,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
-    target: x86_64-unknown-linux-gnu
     verifyManylinux: true
   steps:
   - checkout: self
@@ -128,7 +107,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
-    target: x86_64-unknown-linux-gnu
     verifyManylinux: true
   steps:
   - checkout: self
@@ -142,21 +120,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
-    target: x86_64-unknown-linux-gnu
-    verifyManylinux: true
-  steps:
-  - checkout: self
-  - template: ./azure-linux-container.yml
-
-- job: linux_python36_amd64_manylinux2014
-  pool:
-    vmImage: ubuntu-20.04
-  container: quay.io/pypa/manylinux2014_x86_64:2021-07-03-d4d5413
-  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
-    target: x86_64-unknown-linux-gnu
     verifyManylinux: true
   steps:
   - checkout: self
@@ -167,8 +130,6 @@ jobs:
     vmImage: macOS-10.15
   variables:
     interpreter: python3.9
-    manylinux: off
-    target: x86_64-apple-darwin
   steps:
   - task: UsePythonVersion@0
     inputs:
@@ -182,8 +143,6 @@ jobs:
     vmImage: macOS-10.15
   variables:
     interpreter: python3.8
-    manylinux: off
-    target: x86_64-apple-darwin
   steps:
   - task: UsePythonVersion@0
     inputs:
@@ -197,8 +156,6 @@ jobs:
     vmImage: macOS-10.15
   variables:
     interpreter: python3.7
-    manylinux: off
-    target: x86_64-apple-darwin
   steps:
   - task: UsePythonVersion@0
     inputs:
@@ -207,21 +164,6 @@ jobs:
   - checkout: self
   - template: ./azure-macos.yml
 
-- job: macos_python36_amd64
-  pool:
-    vmImage: macOS-10.15
-  variables:
-    interpreter: python3.6
-    manylinux: off
-    target: x86_64-apple-darwin
-  steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.6'
-      addToPath: true
-  - checkout: self
-  - template: ./azure-macos.yml
-
 - job: win_python39_amd64
   pool:
     vmImage: windows-2019
@@ -266,18 +208,3 @@ jobs:
       architecture: 'x64'
   - checkout: self
   - template: ./azure-win.yml
-
-- job: win_python36_amd64
-  pool:
-    vmImage: windows-2019
-  variables:
-    interpreter: C:\hostedtoolcache\windows\Python\3.6.8\x64\python.exe
-    target: x86_64-pc-windows-msvc
-  steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.6'
-      addToPath: true
-      architecture: 'x64'
-  - checkout: self
-  - template: ./azure-win.yml