Bump pyo3 version and get to some of the comments

Author: jpburnett

.github/workflows/python_bindings.yml

@@ -5,21 +5,36 @@ on: [push, pull_request]
 
 jobs:
   tests_cases:
-    name: Tests cases
+    name: Tests for Python ${{ matrix.py_version}}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
+      matrix:
+        py_version:
+          - '3.8'
+          - '3.9'
+          - '3.10'
+          - '3.11'
+          - '3.12'
+          - '3.13'
+          - '3.14'
+          - '3.x' # Explicit latest
 
     steps:
-    - name: Checkout repo
-      uses: actions/checkout@v5
+      - name: Checkout repo
+        uses: actions/checkout@v5
 
-    - name: Setup requirements
-      run: |
-        python3 -m pip install -U maturin
+      - name: Setup Python ${{ matrix.py_version }}
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.py_version }}
 
-    - name: Install local pigment64
-      run: python3 -m pip install .
+      - name: Setup requirements
+        run: |
+          python3 --version
+          python3 -m pip install -U maturin
+      - name: Install local pigment64
+        run: python3 -m pip install ./lib
 
-    - name: Run tests
-      run: python3 ./tests/test_python.py
+      - name: Run tests
+        run: python3 ./python_bindings/tests.py

.github/workflows/release.yml

@@ -1,6 +1,7 @@
 on:
     release:
       types: [created]
+
 jobs:
     release:
       name: release ${{ matrix.target }}
@@ -12,23 +13,24 @@ jobs:
             - target: x86_64-pc-windows-gnu
             - target: x86_64-unknown-linux-musl
             - target: x86_64-apple-darwin
+
       steps:
-        - uses: actions/checkout@master
+        - name: Checkout repo
+          uses: actions/checkout@5
+
         - name: Compile and release
           uses: rust-build/rust-build.action@v1.4.5
           env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           with:
             RUSTTARGET: ${{ matrix.target }}
             ARCHIVE_TYPES: tar.gz
+
     publish:
       runs-on: ubuntu-latest
       steps:
-        - uses: actions/checkout@v3
-        - uses: actions-rs/toolchain@v1
-          with:
-              toolchain: stable
-              override: true
+        - uses: actions/checkout@v5
+        - uses: dtolnay/rust-toolchain@stable
         - uses: katyo/publish-crates@v2
           with:
               registry-token: ${{ secrets.CRATE_AUTH_TOKEN }}

.github/workflows/rust.yml

@@ -10,34 +10,45 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  rustfmt-check:
+  rustfmt:
+    name: Check formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - name: Checkout reposistory
+        uses: actions/checkout@v5
+
       - name: Run cargo fmt
         run: cargo fmt --all -- --check
+
+  clippy:
+    name: Check clippy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout reposistory
+        uses: actions/checkout@v5
+
       - name: Run cargo clippy
-        run: cargo clippy --all -- -D warnings
+        run: |
+          cargo clippy --version
+          cargo clippy --all --all-targets --all-features -- -D warnings
+
   macos-check:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v5
-      # Set up a Python environment for the linker to the right Python libraries
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
       - name: Test
-        run: cargo test --all-features
+        run: cargo test
+
   ubuntu-check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
       - name: Test
-        run: cargo test --all-features
+        run: cargo test
+
   windows-check:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v5
       - name: Test
-        run: cargo test --all-features
+        run: cargo test

Cargo.lock

@@ -18,6 +18,9 @@ crate-type = ["cdylib", "rlib"]
 name = "pigment64_cli"
 path = "src/main.rs"
 
+[features]
+python_bindings = ["dep:pyo3"]
+
 [dependencies]
 png = "0.17.16"
 clap = { version = "4.5.45", features = ["derive"] }
@@ -29,7 +32,4 @@ strum_macros = "0.27.2"
 thiserror = "2.0.15"
 
 # Python bindings
-pyo3 = { version="0.25", features = ["extension-module"], optional = true }
-
-[features]
-python_bindings = ["dep:pyo3"]
+pyo3 = { version="0.26", features = ["extension-module"], optional = true }

Cargo.toml

@@ -49,13 +49,13 @@ This project uses `maturin` to build the Rust-based Python extension. It is reco
 
 #### Setup
 
-1.  **Create and activate a virtual environment:**
+1.  Create and activate a virtual environment:
     ```bash
     python3 -m venv .venv
     source .venv/bin/activate
     ```
 
-2.  **Install dependencies:**
+2.  Install dependencies:
     ```bash
     pip install maturin pytest
     ```
@@ -65,7 +65,7 @@ This project uses `maturin` to build the Rust-based Python extension. It is reco
 To compile the library and install it into your active virtual environment, run:
 
 ```bash
-maturin develop --features python_bindings
+maturin develop
 ```
 ## License
 

README.md

@@ -1,7 +1,7 @@
 [project]
 name = "pigment64"
 # Version should be synced with lib/Cargo.toml and lib/pigment64/__init__.py
-version = "0.5.3"
+version = "0.6.0"
 description = "A library for handling conversion between N64 texture formats and modern image formats"
 requires-python = ">=3.9"
 dependencies = [

pyproject.toml

@@ -9,12 +9,10 @@ use num_enum::TryFromPrimitive;
 use strum_macros::{EnumCount, EnumIter};
 use thiserror::Error;
 
-// PyO3 imports (will only be used if the feature is enabled)
+// Conditional imports for Python bindings
 #[cfg(feature = "python_bindings")]
-use pyo3::prelude::*;
+use pyo3::{Bound, prelude::*, types::PyBytes};
 #[cfg(feature = "python_bindings")]
-use pyo3::types::PyBytes;
-#[cfg_attr(not(feature = "python_bindings"), allow(unused_imports))]
 use std::io::Cursor;
 
 #[derive(Debug, Error)]
@@ -194,14 +192,14 @@ impl PyPNGImage {
     fn as_i8(&self) -> PyResult<Py<PyBytes>> {
         let mut buf = Vec::new();
         self.img.as_i8(&mut buf)?;
-        let py = unsafe { Python::assume_gil_acquired() };
+        let py = unsafe { Python::assume_attached() };
         Ok(PyBytes::new(py, &buf).into())
     }
 
     fn as_rgba16(&self) -> PyResult<Py<PyBytes>> {
         let mut buf = Vec::new();
         self.img.as_rgba16(&mut buf)?;
-        let py = unsafe { Python::assume_gil_acquired() };
+        let py = unsafe { Python::assume_attached() };
         Ok(PyBytes::new(py, &buf).into())
     }
 }