cargo update, build misc

ijl · Nov 1, 2024 · 7b9458f · 7b9458f
1 parent bceb5ec
commit 7b9458f
Show file tree

Hide file tree

Showing 20 changed files with 202 additions and 124 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,3 @@
-include linguist-vendored
+include/pyo3/pyo3-build-config/**/* linguist-vendored
+include/pyo3/pyo3-ffi/**/* linguist-vendored
+include/yyjson/* linguist-vendored
diff --git a/.github/workflows/artifact.yaml b/.github/workflows/artifact.yaml
@@ -40,7 +40,7 @@ jobs:
 
     - run: python3 -m pip install --user -r test/requirements.txt -r integration/requirements.txt mypy
 
-    - run: pytest -s -rxX -v -n 4 test
+    - run: pytest -v test
       env:
         PYTHONMALLOC: "debug"
 
@@ -58,31 +58,30 @@ jobs:
         overwrite: true
         retention-days: 1
 
-  manylinux_2_17_amd64:
+  manylinux_amd64:
     runs-on: ubuntu-24.04
     timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix:
+        python: [
+          { interpreter: 'python3.13', package: 'python3.13', compatibility: "manylinux_2_17" },
+          { interpreter: 'python3.12', package: 'python3.12', compatibility: "manylinux_2_17" },
+          { interpreter: 'python3.11', package: 'python3.11', compatibility: "manylinux_2_17" },
+          { interpreter: 'python3.10', package: 'python3.10', compatibility: "manylinux_2_17" },
+          { interpreter: 'python3.9', package: 'python3.9', compatibility: "manylinux_2_17" },
+        ]
         arch: [
           {
             cc: "clang",
             cflags: "-Os -fstrict-aliasing -fno-plt -flto=full -emit-llvm",
             features: "avx512,no-panic,unstable-simd,yyjson",
             ldflags: "-fuse-ld=lld -Wl,-plugin-opt=also-emit-llvm -Wl,--as-needed -Wl,-zrelro,-znow",
-            rustflags: "-C linker=clang -C link-arg=-fuse-ld=lld -C linker-plugin-lto -C lto=fat -C link-arg=-Wl,-zrelro,-znow -Z mir-opt-level=4 -Z virtual-function-elimination -Z threads=4 -D warnings",
+            rustflags: "-C linker=clang -C link-arg=-fuse-ld=lld -C linker-plugin-lto -C lto=fat -C link-arg=-Wl,-zrelro,-znow -Z mir-opt-level=4 -Z threads=4 -D warnings",
             tag: null,
             target: "x86_64-unknown-linux-gnu",
           },
         ]
-        python: [
-          { interpreter: 'python3.13', package: 'python3.13' },
-          { interpreter: 'python3.12', package: 'python3.12' },
-          { interpreter: 'python3.11', package: 'python3.11' },
-          { interpreter: 'python3.10', package: 'python3.10' },
-          { interpreter: 'python3.9', package: 'python3.9' },
-          { interpreter: 'python3.8', package: 'python3.8' },
-        ]
     env:
       PYTHON: "${{ matrix.python.interpreter }}"
       PYTHON_PACKAGE: "${{ matrix.python.package }}"
@@ -94,6 +93,7 @@ jobs:
       LDFLAGS: "${{ matrix.arch.ldflags }}"
       RUSTFLAGS: "${{ matrix.arch.rustflags }}"
       CARGO_TARGET_DIR: "/tmp/orjson"
+      COMPATIBILITY: "${{ matrix.python.compatibility }}"
     steps:
 
     - name: cpuinfo
@@ -106,6 +106,7 @@ jobs:
       with:
         container: registry.fedoraproject.org/fedora:42
         arch: ${{ matrix.arch.tag }}
+        initial_delay: 5s
         podman_args: "-v .:/orjson -v /tmp:/tmp --workdir /orjson"
 
     - name: setup-shell-wrapper
@@ -128,13 +129,13 @@ jobs:
 
         maturin build --release --strip \
           --features="${FEATURES}" \
-          --compatibility=manylinux_2_17 \
+          --compatibility="${COMPATIBILITY}" \
           --interpreter="${PYTHON}" \
           --target="${TARGET}"
 
         uv pip install ${CARGO_TARGET_DIR}/wheels/orjson*.whl
 
-        pytest -s -rxX -v -n 4 test
+        pytest -v test
         ./integration/run thread
         ./integration/run http
         ./integration/run init
@@ -151,26 +152,26 @@ jobs:
         retention-days: 1
 
 
-  manylinux_2_17_aarch64:
+  manylinux_aarch64:
     runs-on: ubuntu-24.04
     timeout-minutes: 45
     strategy:
       fail-fast: false
       matrix:
+        python: [
+          { interpreter: 'python3.13', package: 'python3.13', compatibility: "manylinux_2_17" },
+        ]
         arch: [
           {
             cc: "clang",
             cflags: "-Os -fstrict-aliasing -fno-plt -flto=full -emit-llvm",
             features: "no-panic,unstable-simd,yyjson",
             ldflags: "-fuse-ld=lld -Wl,-plugin-opt=also-emit-llvm -Wl,--as-needed -Wl,-zrelro,-znow",
-            rustflags: "-C linker=clang -C link-arg=-fuse-ld=lld -C linker-plugin-lto -C lto=fat -C link-arg=-Wl,-zrelro,-znow -Z mir-opt-level=4 -Z virtual-function-elimination -Z threads=4 -D warnings",
+            rustflags: "-C linker=clang -C link-arg=-fuse-ld=lld -C linker-plugin-lto -C lto=fat -C link-arg=-Wl,-zrelro,-znow -Z mir-opt-level=4 -Z threads=4 -D warnings",
             tag: "aarch64",
             target: "aarch64-unknown-linux-gnu",
           },
         ]
-        python: [
-          { interpreter: 'python3.13', package: 'python3.13' },
-        ]
     env:
       PYTHON: "${{ matrix.python.interpreter }}"
       PYTHON_PACKAGE: "${{ matrix.python.package }}"
@@ -182,6 +183,7 @@ jobs:
       LDFLAGS: "${{ matrix.arch.ldflags }}"
       RUSTFLAGS: "${{ matrix.arch.rustflags }}"
       CARGO_TARGET_DIR: "/tmp/orjson"
+      COMPATIBILITY: "${{ matrix.python.compatibility }}"
     steps:
 
     - name: cpuinfo
@@ -212,31 +214,30 @@ jobs:
 
         ./script/install-fedora
 
-        source "${HOME}/.cargo/env"
         source "${VENV}/bin/activate"
 
         maturin build --release --strip \
           --features="${FEATURES}" \
-          --compatibility=manylinux_2_17 \
+          --compatibility="${COMPATIBILITY}" \
           --interpreter="${PYTHON}" \
           --target="${TARGET}"
 
         uv pip install ${CARGO_TARGET_DIR}/wheels/orjson*.whl
 
-        pytest -s -rxX -v -n 2 test
+        pytest -v test
 
         cp ${CARGO_TARGET_DIR}/wheels/orjson*.whl dist
 
     - name: Store wheels
       if: "startsWith(github.ref, 'refs/tags/')"
       uses: actions/upload-artifact@v4
       with:
-        name: orjson_manylinux_2_17_aarch64_${{ matrix.python.interpreter }}
+        name: orjson_manylinux_aarch64_${{ matrix.python.interpreter }}
         path: dist
         overwrite: true
         retention-days: 1
 
-  musllinux_1_2:
+  musllinux:
     runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
@@ -272,7 +273,7 @@ jobs:
         CC: "gcc"
         CFLAGS: "-Os"
         LDFLAGS: "-Wl,--as-needed"
-        RUSTFLAGS: "-C lto=fat -Z mir-opt-level=4 -Z virtual-function-elimination -Z threads=2 -D warnings -C target-feature=-crt-static"
+        RUSTFLAGS: "-C lto=fat -Z mir-opt-level=4 -Z threads=2 -D warnings -C target-feature=-crt-static"
       with:
         rust-toolchain: "${{ env.RUST_TOOLCHAIN }}"
         rustup-components: rust-src
@@ -301,18 +302,18 @@ jobs:
           venv/bin/pip install -U pip wheel
           venv/bin/pip install -r test/requirements.txt
           venv/bin/pip install orjson --no-index --find-links dist/ --force-reinstall
-          venv/bin/python -m pytest -s -rxX -v -n 2 test
+          venv/bin/python -m pytest -v test
 
     - name: Store wheels
       if: "startsWith(github.ref, 'refs/tags/')"
       uses: actions/upload-artifact@v4
       with:
-        name: orjson_musllinux_1_2_${{ matrix.platform.arch }}_${{ matrix.python.version }}
+        name: orjson_musllinux_${{ matrix.platform.arch }}_${{ matrix.python.version }}
         path: dist
         overwrite: true
         retention-days: 1
 
-  manylinux_2_17_non_amd64:
+  manylinux_non_amd64:
     runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
@@ -385,7 +386,7 @@ jobs:
         overwrite: true
         retention-days: 1
 
-  macos_universal2_aarch64:
+  macos_aarch64:
     runs-on: macos-14
     strategy:
       fail-fast: false
@@ -402,7 +403,7 @@ jobs:
       LDFLAGS: "-Wl,--as-needed"
       CFLAGS_x86_64_apple_darwin: "-O2 -fstrict-aliasing -flto=full -march=x86-64-v2 -mtune=generic"
       CFLAGS_aarch64_apple_darwin: "-O2 -fstrict-aliasing -flto=full -mcpu=apple-m1 -mtune=generic"
-      RUSTFLAGS: "-C lto=fat -Z mir-opt-level=4 -Z virtual-function-elimination -Z threads=3 -D warnings"
+      RUSTFLAGS: "-C lto=fat -Z mir-opt-level=4 -Z threads=3 -D warnings"
       PATH: "/Users/runner/work/orjson/orjson/.venv/bin:/Users/runner/.cargo/bin:/usr/local/opt/curl/bin:/usr/local/bin:/usr/local/sbin:/Users/runner/bin:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/bin:/bin:/usr/sbin:/sbin"
     steps:
 
@@ -441,7 +442,7 @@ jobs:
           --target=universal2-apple-darwin
         uv pip install target/wheels/orjson*.whl
 
-    - run: pytest -s -rxX -v -n 3 test
+    - run: pytest -v test
       env:
         PYTHONMALLOC: "debug"
 
@@ -458,7 +459,7 @@ jobs:
         overwrite: true
         retention-days: 1
 
-  macos_universal2_amd64:
+  macos_amd64:
     runs-on: macos-13
     strategy:
       fail-fast: false
@@ -473,7 +474,7 @@ jobs:
       LDFLAGS: "-Wl,--as-needed"
       CFLAGS_x86_64_apple_darwin: "-O2 -fstrict-aliasing -flto=full -march=x86-64-v2 -mtune=generic"
       CFLAGS_aarch64_apple_darwin: "-O2 -fstrict-aliasing -flto=full -mcpu=apple-m1 -mtune=generic"
-      RUSTFLAGS: "-C lto=fat -Z mir-opt-level=4 -Z virtual-function-elimination -Z threads=3 -D warnings"
+      RUSTFLAGS: "-C lto=fat -Z mir-opt-level=4 -Z threads=3 -D warnings"
       PATH: "/Users/runner/work/orjson/orjson/.venv/bin:/Users/runner/.cargo/bin:/usr/local/opt/curl/bin:/usr/local/bin:/usr/local/sbin:/Users/runner/bin:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/bin:/bin:/usr/sbin:/sbin"
     steps:
 
@@ -511,7 +512,7 @@ jobs:
           --target=universal2-apple-darwin
         uv pip install target/wheels/orjson*.whl
 
-    - run: pytest -s -rxX -v -n 3 test
+    - run: pytest -v test
       env:
         PYTHONMALLOC: "debug"
 
@@ -533,29 +534,39 @@ jobs:
     runs-on: ubuntu-24.04
     if: "startsWith(github.ref, 'refs/tags/')"
     needs: [
-      macos_universal2_aarch64,
-      macos_universal2_amd64,
-      manylinux_2_17_aarch64,
-      manylinux_2_17_amd64,
-      manylinux_2_17_non_amd64,
-      musllinux_1_2,
+      macos_aarch64,
+      macos_amd64,
+      manylinux_aarch64,
+      manylinux_amd64,
+      manylinux_non_amd64,
+      musllinux,
       sdist,
     ]
+    environment:
+      name: pypi
+      url: https://pypi.org/p/orjson
+    permissions:
+      id-token: write
     steps:
       - uses: actions/download-artifact@v4
         with:
-          pattern: orjson_*
           merge-multiple: true
+          name: python-package-distributions
+          path: dist/
+          pattern: orjson_*
+
+      - run: ls -1 dist/
+
       - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
-      - run: pip install pip "maturin>=1,<2"
-      - run: ls -1 .
-      - name: deploy wheel
-        run: maturin upload --skip-existing --username "$MATURIN_USERNAME" *.whl
-        env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
-      - name: deploy sdist
-        run: maturin upload --skip-existing --username "$MATURIN_USERNAME" *.tar.gz
-        env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+
+      - name: Publish distribution to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          attestations: true
+          packages-dir: dist
+          repository-url: https://github.com/ijl/orjson
+          skip-existing: true
+          user: ijl
+          verbose: true
diff --git a/.github/workflows/debug.yaml b/.github/workflows/debug.yaml
@@ -10,8 +10,8 @@ jobs:
         profile: [
           { rust: "1.72", features: "" },
           { rust: "1.72", features: "--features=yyjson" },
-          { rust: "nightly-2024-09-25", features: "--features=yyjson,unstable-simd"},
-          { rust: "nightly-2024-09-25", features: "--features=avx512,yyjson,unstable-simd"},
+          { rust: "nightly-2024-09-25", features: "--features=yyjson,unstable-simd" },
+          { rust: "nightly-2024-09-25", features: "--features=avx512,yyjson,unstable-simd" },
         ]
         python: [
           { version: '3.13' },
@@ -27,12 +27,8 @@ jobs:
     steps:
     - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain ${{ matrix.profile.rust }} --profile minimal -y
 
-    - name: cpuinfo
-      run: cat /proc/cpuinfo
-
     - uses: actions/setup-python@v5
       with:
-        allow-prereleases: true
         python-version: '${{ matrix.python.version }}'
 
     - run: python -m pip install --user --upgrade pip "maturin>=1,<2" wheel

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -8,7 +8,7 @@ jobs:
       with:
         python-version: "3.12"
     - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=default -y
-    - run: pip install -U autoflake isort black ruff mypy types-python-dateutil types-pytz types-simplejson types-ujson
+    - run: pip install -U ruff==0.7.1 mypy==1.13.0
 
     - uses: actions/checkout@v4
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 
 
-### 3.10.10
+## 3.10.10
 
 ### Fixed
 
@@ -12,15 +12,15 @@
 - Publish aarch64 manylinux_2_17 wheel for 3.13 to PyPI.
 
 
-### 3.10.9
+## 3.10.9
 
 ### Fixed
 
 - Fix `int` serialization on 32-bit Python 3.8, 3.9, 3.10. This was
 introduced in 3.10.8.
 
 
-### 3.10.8
+## 3.10.8
 
 ### Changed