Merge remote-tracking branch 'origin/main' into modernize-repo

mozilla-services · Feb 1, 2024 · d3817b8 · d3817b8
2 parents ea7a258 + 57136a3
commit d3817b8
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 41 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -26,14 +26,14 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v4
       with:
-        python-version: '3.11'
+        python-version: '3.12'
         architecture: 'x64'
     - name: Build Linux wheel
       uses: messense/maturin-action@v1
       with:
         target: x86_64
         manylinux: auto
-        args: --release --out dist/ --interpreter python3.11
+        args: --release --out dist/ --interpreter python3.12
     - name: Install built wheel
       run: pip install canonicaljson-rs --no-index --find-links dist/ --force-reinstall
     - name: Run tests

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -18,67 +18,67 @@ jobs:
             target: x86_64
             manylinux: auto
             python-architecture: x64
-            interpreter: 3.7 3.8 3.9 3.10 3.11
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
           - os: windows
             ls: dir
             target: i686
             manylinux: auto
             python-architecture: x86
-            interpreter: 3.7 3.8 3.9 3.10 3.11
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
           - os: macos
             target: x86_64
             manylinux: auto
             python-architecture: x64
-            interpreter: 3.7 3.8 3.9 3.10 3.11 pypy3.7 pypy3.8 pypy3.9
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 pypy3.9 pypy3.10
           - os: macos
             target: aarch64
             manylinux: auto
             python-architecture: x64
-            interpreter: 3.7 3.8 3.9 3.10 3.11
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
           # Build all manylinux targets on 2_24
           # https://github.com/pypa/manylinux#readme
           # https://github.com/PyO3/maturin-action/blob/135c746/src/index.ts#L33
           - os: ubuntu
             target: x86_64
             manylinux: 2_24
             python-architecture: x64
-            interpreter: 3.7 3.8 3.9 3.10 3.11 pypy3.7 pypy3.8 pypy3.9
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 pypy3.9 pypy3.10
           - os: ubuntu
             target: aarch64
             manylinux: 2_24
             python-architecture: x64
-            interpreter: 3.7 3.8 3.9 3.10 3.11 pypy3.7 pypy3.8 pypy3.9
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 pypy3.9 pypy3.10
           - os: ubuntu
             target: i686
             manylinux: 2_24
             python-architecture: x64
-            interpreter: 3.7 3.8 3.9 3.10 3.11 pypy3.7 pypy3.8 pypy3.9
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 pypy3.9 pypy3.10
           - os: ubuntu
             target: armv7
             manylinux: 2_24
             python-architecture: x64
-            interpreter: 3.7 3.8 3.9 3.10 3.11
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
           - os: ubuntu
             target: ppc64le
             manylinux: 2_24
             python-architecture: x64
-            interpreter: 3.7 3.8 3.9 3.10 3.11
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
           - os: ubuntu
             target: s390x
             manylinux: 2_24
             python-architecture: x64
-            interpreter: 3.7 3.8 3.9 3.10 3.11
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
           # musllinux - https://musl.libc.org/about.html
           - os: ubuntu
             target: x86_64
             manylinux: musllinux_1_1 # /!\ value used in steps conditions below.
             python-architecture: x64
-            interpreter: 3.7 3.8 3.9 3.10 3.11 pypy3.7 pypy3.8 pypy3.9
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 pypy3.9 pypy3.10
           - os: ubuntu
             target: aarch64
             manylinux: musllinux_1_1
             python-architecture: x64
-            interpreter: 3.7 3.8 3.9 3.10 3.11 pypy3.7 pypy3.8 pypy3.9
+            interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 pypy3.9 pypy3.10
 
     runs-on: ${{ matrix.os }}-latest
     steps:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,5 +17,5 @@ serde_json = "1.0"
 canonical_json = "0.5.0"
 
 [dependencies.pyo3]
-version = "0.18.0"
+version = "0.19.2"
 features = ["extension-module"]