Support Python 3.14 and bump version to 0.3.3 (#17)

* Support Python 3.14 and bump version to 0.3.3

* fix

Author: vbkaisetsu

.github/workflows/CI.yml

@@ -10,19 +10,21 @@ on:
     tags:
       - 'v*.*.*'
 
+permissions:
+  contents: read
+
 jobs:
   test:
     strategy:
       matrix:
         runs-on: [ ubuntu-latest, windows-latest, macos-latest ]
-        python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13' ]
+        python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
     runs-on: ${{ matrix.runs-on }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v6
+    - uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: dtolnay/rust-toolchain@stable
     - name: Build package
       uses: PyO3/maturin-action@v1
       with:
@@ -44,17 +46,16 @@ jobs:
     needs: [ test ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v6
+    - uses: actions/setup-python@v6
       with:
-        python-version: '3.13'
-    - uses: dtolnay/rust-toolchain@stable
+        python-version: '3.14'
     - name: Build package
       uses: PyO3/maturin-action@v1
       with:
         command: sdist
     - name: Upload wheels
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: wheels-sdist
         path: target/wheels
@@ -65,74 +66,69 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13' ]
+        python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
         target: [ x86_64, i686 ]
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v6
+    - uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: dtolnay/rust-toolchain@stable
     - name: Build package
       uses: PyO3/maturin-action@v1
       with:
         target: ${{ matrix.target }}
         manylinux: auto
         args: -i ${{ matrix.python-version }} --release
     - name: Upload wheels
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: wheels-linux-${{ matrix.python-version }}-${{ matrix.target }}
         path: target/wheels
 
   pack-windows:
-    needs: [ test ]
     if: "startsWith(github.ref, 'refs/tags/')"
+    needs: [ test ]
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13' ]
+        python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
         target: [ x64, x86 ]
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v6
+    - uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
         architecture: ${{ matrix.target }}
-    - uses: dtolnay/rust-toolchain@stable
     - name: Build package
       uses: PyO3/maturin-action@v1
       with:
         target: ${{ matrix.target }}
-        manylinux: auto
         args: -i ${{ matrix.python-version }} --release
     - name: Upload wheels
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: wheels-windows-${{ matrix.python-version }}-${{ matrix.target }}
         path: target/wheels
 
   pack-macos:
-    needs: [ test ]
     if: "startsWith(github.ref, 'refs/tags/')"
+    needs: [ test ]
     runs-on: macos-latest
     strategy:
       matrix:
-        python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13' ]
+        python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v6
+    - uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: dtolnay/rust-toolchain@stable
     - name: Build package
       uses: PyO3/maturin-action@v1
       with:
         target: ${{ matrix.target }}
-        manylinux: auto
         args: -i ${{ matrix.python-version }} --release --target universal2-apple-darwin
     - name: Upload wheels
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: wheels-macos-${{ matrix.python-version }}
         path: target/wheels
@@ -141,16 +137,15 @@ jobs:
     name: Release
     if: "startsWith(github.ref, 'refs/tags/')"
     needs: [ pack-sdist, pack-linux, pack-windows, pack-macos ]
+    permissions:
+      contents: read
+      id-token: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           pattern: wheels-*
-          merge-multiple: true
+      - name: Install uv
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
       - name: Publish to PyPI
-        uses: messense/maturin-action@v1
-        env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
-        with:
-          command: upload
-          args: --skip-existing *
+        run: uv publish wheels-*/*

.readthedocs.yaml

@@ -2,14 +2,17 @@ version: 2
 
 sphinx:
   builder: html
+  configuration: docs/source/conf.py
 
 build:
-  os: ubuntu-20.04
+  os: ubuntu-24.04
   tools:
-    python: "3.9"
-    rust: "1.64"
+    python: latest
+    rust: latest
 
 python:
   install:
     - method: pip
       path: .
+      extra_requirements:
+        - docs

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "python-vaporetto"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2021"
 authors = ["Koichi Akabe <vbkaisetsu@gmail.com>"]
 description = "Python wrapper of Vaporetto tokenizer"
@@ -14,8 +14,8 @@ name = "vaporetto"
 crate-type = ["cdylib"]
 
 [dependencies]
-hashbrown = "0.15.3"  # MIT or Apache-2.0
+hashbrown = "0.17.1"  # MIT or Apache-2.0
 ouroboros = "0.18.5"  # MIT or Apache-2.0
-pyo3 = { version = "0.25.0", features = ["extension-module"] }  # Apache-2.0
-vaporetto_rust = { package = "vaporetto", version = "0.6.5", features = ["kytea"] }  # MIT or Apache-2.0
-vaporetto_rules = "0.6.5"  # MIT or Apache-2.0
+pyo3 = { version = "0.28.3", features = ["extension-module"] } # Apache-2.0
+vaporetto_rust = { package = "vaporetto", version = "0.6.5", features = ["kytea"] } # MIT or Apache-2.0
+vaporetto_rules = "0.6.5" # MIT or Apache-2.0

docs/source/conf.py

@@ -1,5 +1,5 @@
 project = 'python-vaporetto'
-copyright = '2022, daac-tools'
+copyright = '2026, daac-tools'
 author = 'Koichi Akabe'
 
 extensions = [

pyproject.toml

@@ -4,3 +4,18 @@ build-backend = "maturin"
 
 [project]
 name = "vaporetto"
+version = "0.3.3"
+description = "Python wrapper of Vaporetto tokenizer"
+readme = "README.md"
+classifiers = [
+  "License :: OSI Approved :: Apache Software License",
+  "License :: OSI Approved :: MIT License",
+  "Programming Language :: Rust",
+  "Topic :: Software Development :: Libraries",
+  "Topic :: Text Processing",
+]
+
+[project.optional-dependencies]
+docs = [
+  "sphinx-rtd-theme",
+]

src/lib.rs

@@ -271,7 +271,7 @@ impl Vaporetto {
             word_cache.insert(word.to_string(), PyString::new(py, word).into());
         }
 
-        let predictor = py.allow_threads(|| {
+        let predictor = py.detach(|| {
             Predictor::new(model, predict_tags).map_err(|e| PyValueError::new_err(e.to_string()))
         })?;
 
@@ -319,7 +319,7 @@ impl Vaporetto {
         wsconst: &str,
         norm: bool,
     ) -> PyResult<Self> {
-        let (model, _) = py.allow_threads(|| {
+        let (model, _) = py.detach(|| {
             Model::read_slice(&model).map_err(|e| PyValueError::new_err(e.to_string()))
         })?;
         Self::create_internal(py, model, predict_tags, wsconst, norm)
@@ -347,7 +347,7 @@ impl Vaporetto {
         wsconst: &str,
         norm: bool,
     ) -> PyResult<Self> {
-        let model = py.allow_threads(|| {
+        let model = py.detach(|| {
             let kytea_model =
                 KyteaModel::read(model).map_err(|e| PyValueError::new_err(e.to_string()))?;
             Model::try_from(kytea_model).map_err(|e| PyValueError::new_err(e.to_string()))