Release 1.1.6

.github/workflows/CI.yml

@@ -21,10 +21,10 @@ jobs:
   lint:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.11'
       - run: pip install pre-commit
         name: Install pre-commit
       - run: pre-commit run --all
@@ -33,17 +33,20 @@ jobs:
   test:
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-12, windows-latest ]
-        python_version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10']
+        os: [ubuntu-22.04, macos-13, windows-latest ]
+        python_version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.9', 'pypy-3.10']
+        exclude:
+          - python_version: 3.7
+            os: macos-13
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python_version }}
           allow-prereleases: true
       - name: Setup dependencies
-        run: pip install --upgrade pip pytest
+        run: pip install pytest
       - name: Install mkcert (Linux)
         if: matrix.os == 'ubuntu-22.04'
         run: sudo apt-get install mkcert
@@ -90,7 +93,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [x86_64, x86, aarch64, armv7, s390x, ppc64le, ppc64, i686]
-        python_version: ['3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10']
+        python_version: ['3.10', 'pypy-3.9', 'pypy-3.10', '3.13t']
         manylinux: ['auto', 'musllinux_1_1']
         exclude:
           - manylinux: musllinux_1_1
@@ -101,15 +104,20 @@ jobs:
             target: ppc64le
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        if: matrix.python_version != '3.13t'
         with:
           python-version: ${{ matrix.python_version }}
+      - uses: Quansight-Labs/setup-python@v5
+        if: matrix.python_version == '3.13t'
+        with:
+          python-version: '3.13t'
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist --interpreter ${{ matrix.python_version }}
+          args: --release --out dist --interpreter ${{ matrix.python_version == '3.13t' && '/opt/python/cp313-cp313t/bin/python' || matrix.python_version }}
           sccache: 'true'
           manylinux: ${{ matrix.manylinux }}
       - name: Upload wheels
@@ -127,7 +135,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [x64, aarch64]
-        python_version: ['3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10']
+        python_version: ['3.10', 'pypy-3.9', 'pypy-3.10', '3.13t']
         exclude:
           - target: aarch64
             python_version: 'pypy-3.7'
@@ -137,12 +145,20 @@ jobs:
             python_version: 'pypy-3.9'
           - target: aarch64
             python_version: 'pypy-3.10'
+          - target: aarch64
+            python_version: '3.13t'
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        if: matrix.python_version != '3.13t'
         with:
           python-version: ${{ matrix.python_version }}
           architecture: x64
+      - uses: Quansight-Labs/setup-python@v5
+        if: matrix.python_version == '3.13t'
+        with:
+          python-version: '3.13t'
+          architecture: x64
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
@@ -159,22 +175,27 @@ jobs:
     needs:
       - test
       - lint
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       fail-fast: false
       matrix:
         target: [x86_64, aarch64, universal2]
-        python_version: ['3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10']
+        python_version: ['3.10', 'pypy-3.9', 'pypy-3.10', '3.13t']
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        if: matrix.python_version != '3.13t'
         with:
           python-version: ${{ matrix.python_version }}
+      - uses: Quansight-Labs/setup-python@v5
+        if: matrix.python_version == '3.13t'
+        with:
+          python-version: '3.13t'
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist --interpreter ${{ matrix.python_version }}
+          args: --release --out dist
           sccache: 'true'
       - name: Upload wheels
         uses: actions/upload-artifact@v3
@@ -188,7 +209,7 @@ jobs:
       - lint
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build sdist
         uses: PyO3/maturin-action@v1
         with:
@@ -206,8 +227,8 @@ jobs:
       - lint
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Install dependencies

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-exclude: 'docs/|src/'
+exclude: 'docs/|freethreaded.patch'
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v4.4.0
@@ -29,3 +29,19 @@ repos:
   -   id: mypy
       args: [--check-untyped-defs]
       exclude: 'tests/'
+- repo: local
+  hooks:
+  -   id: rust-linting
+      name: Rust linting
+      description: Run cargo fmt on files included in the commit. rustfmt should be installed before-hand.
+      entry: cargo fmt --all --
+      pass_filenames: true
+      types: [file, rust]
+      language: system
+  -   id: rust-clippy
+      name: Rust clippy
+      description: Run cargo clippy on files included in the commit. clippy should be installed before-hand.
+      entry: cargo clippy --all-targets --all-features -- -Dclippy::all
+      pass_filenames: false
+      types: [file, rust]
+      language: system

CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to wassima will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 1.1.6 (2024-11-11)
+
+### Changed
+- pyo3 updated from 0.22.5 to 0.23.1
+- minor improvements in Rust code.
+
+### Added
+- Initial support for Python 3.13 freethreaded experimental build.
+
 ## 1.1.5 (2024-10-27)
 
 ### Changed

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wassima"
-version = "1.1.5"
+version = "1.1.6"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -9,7 +9,7 @@ name = "wassima"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.22.5", features = ["abi3-py37", "extension-module"] }
+pyo3 = { version = "0.23.2", features = ["abi3-py37", "extension-module"] }
 rustls-native-certs = "0.7.3"
 
 [package.metadata.maturin]

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["maturin>=1.2,<2.0"]
+requires = ["maturin>=1.7.5,<2.0"]
 build-backend = "maturin"
 
 [project]
@@ -46,7 +46,7 @@ dependencies = [
 "Issue tracker" = "https://github.com/jawah/wassima/issues"
 
 [tool.maturin]
-features = ["pyo3/extension-module"]
+features = ["pyo3/extension-module", "pyo3/abi3-py37"]
 module-name = "wassima._rustls"
 
 [tool.pytest.ini_options]

src/lib.rs

@@ -1,25 +1,26 @@
-use pyo3::{prelude::*, types::PyBytes};
 use pyo3::exceptions::PyRuntimeError;
-use rustls_native_certs;
+use pyo3::{prelude::*, types::PyBytes};
 
 /// Retrieve a list of system DER root CAs
 #[pyfunction]
-fn root_der_certificates(py: Python) -> PyResult<Vec<Bound<'_, PyBytes, >>> {
+fn root_der_certificates(py: Python) -> PyResult<Vec<Bound<'_, PyBytes>>> {
     let mut roots = Vec::new();
     let certs = rustls_native_certs::load_native_certs();
 
     if certs.is_err() {
-        return Err(PyRuntimeError::new_err("unable to extract root certificates"));
+        return Err(PyRuntimeError::new_err(
+            "unable to extract root certificates",
+        ));
     }
 
     for cert in certs.unwrap() {
-        roots.push(PyBytes::new_bound(py, &cert.as_ref().to_vec()));
+        roots.push(PyBytes::new(py, cert.as_ref()));
     }
 
-    return Ok(roots);
+    Ok(roots)
 }
 
-#[pymodule]
+#[pymodule(gil_used = false)]
 fn _rustls(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(root_der_certificates, m)?)?;
     Ok(())