Add prebuilt binaries for Python 3.13 (#27)

AngheloAlf · web-flow · commit 4723fc6d5d70 · 2024-12-17T00:38:09.000+09:00
* Hopefully add prebuilt binaries for Python 3.13

* Setup mypy and bump minimal python version to 3.9

* fix

* Setup MSRV

* cleanup

* clippy and MSRV

* version bump

* Explicit version range on setup-python action
diff --git a/.github/workflows/maturin_upload_pypi.yml b/.github/workflows/maturin_upload_pypi.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.9 - 3.13'
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.13'
           architecture: ${{ matrix.target }}
       - name: Build wheels
         uses: PyO3/maturin-action@v1
@@ -76,7 +76,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.13'
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
@@ -113,6 +113,26 @@ jobs:
           path: dist
           if-no-files-found: error
 
+  check_clippy_python_bindings:
+    name: Check clippy for Python bindings
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout reposistory
+        uses: actions/checkout@v4
+
+      - name: Setup Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+
+      - name: Setup clippy
+        run: rustup component add clippy
+
+      - name: Run clippy
+        run: cargo clippy --all-targets --features python_bindings -- -D warnings
+
   release:
     name: Release
     runs-on: ubuntu-latest
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
@@ -0,0 +1,24 @@
+name: Check mypy
+
+# Build on every branch push, tag push, and pull request change:
+on: [push, pull_request]
+
+jobs:
+  checks:
+    runs-on: ubuntu-latest
+    name: mypy
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.9
+
+      - name: Install Dependencies
+        run: |
+          python3 -m pip install -U mypy
+
+      - name: mypy
+        run: |
+          python3 -m mypy --show-column-numbers --hide-error-context .
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -6,14 +6,27 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  rustfmt-check:
+  rustfmt:
+    name: Check formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout reposistory
+        uses: actions/checkout@v4
+
       - name: Run cargo fmt
         run: cargo fmt --all -- --check
+
+  clippy:
+    name: Check clippy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout reposistory
+        uses: actions/checkout@v4
+
       - 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
@@ -35,3 +48,17 @@ jobs:
       - uses: actions/checkout@v4
       - name: Test
         run: cargo test
+
+  msrv:
+    name: Check MSRV
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout reposistory
+        uses: actions/checkout@v4
+
+      - name: Setup MSRV checker
+        uses: taiki-e/install-action@cargo-hack
+
+      # To find current MSRV use `cargo msrv find`. Install it with `cargo install cargo-msrv --locked`
+      - name: Run MSRV checker
+        run: cargo hack check --rust-version --workspace --all-targets --ignore-private
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.2] - 2024-12-15
+
+### Added
+
+- Prebuilt binaries for Python 3.13.
+- Check Python files with mypy.
+- Set MSRV (minimum supported Rust version) to 1.73.
+
+### Changed
+
+- Python 3.9 or later is now required.
+  - Mainly due to not being able to automatically check and build for older versions in CI.
+
 ## [0.5.1] - 2024-07-25
 
 ### Fixed
@@ -73,6 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - C bindings.
 
 [unreleased]: https://github.com/decompals/crunch64/compare/0.5.1...HEAD
+[0.5.2]: https://github.com/decompals/crunch64/compare/0.5.1...0.5.2
 [0.5.1]: https://github.com/decompals/crunch64/compare/0.5.0...0.5.1
 [0.5.0]: https://github.com/decompals/crunch64/compare/0.4.0...0.5.0
 [0.4.0]: https://github.com/decompals/crunch64/compare/0.3.1...0.4.0
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,15 +1,16 @@
 [package]
 name = "crunch64-cli"
-version = "0.5.1"
+version = "0.5.2"
 edition = "2021"
 description = "A utility for compressing/decompressing files with common n64 formats"
 repository = "https://github.com/decompals/crunch64"
 license = "MIT"
+rust-version = "1.73.0"
 
 [[bin]]
 name = "crunch64"
 path = "src/main.rs"
 
 [dependencies]
-crunch64 = { version = "0.5.1", path = "../lib" }
+crunch64 = { version = "0.5.2", path = "../lib" }
 clap = { version = "4.4.11", features = ["derive"] }
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -1,11 +1,12 @@
 [package]
 name = "crunch64"
 # Version should be synced with lib/pyproject.toml and lib/crunch64/__init__.py
-version = "0.5.1"
+version = "0.5.2"
 edition = "2021"
 description = "A library for handling common compression formats for N64 games"
 repository = "https://github.com/decompals/crunch64"
 license = "MIT"
+rust-version = "1.73.0"
 
 [lib]
 name = "crunch64"
diff --git a/lib/crunch64/__init__.py b/lib/crunch64/__init__.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 # Version should be synced with lib/Cargo.toml and lib/pyproject.toml
-__version_info__ = (0, 5, 1)
+__version_info__ = (0, 5, 2)
 __version__ = ".".join(map(str, __version_info__))
 __author__ = "decompals"
 
diff --git a/lib/pyproject.toml b/lib/pyproject.toml
@@ -3,7 +3,7 @@ name = "crunch64"
 # Version should be synced with lib/Cargo.toml and lib/crunch64/__init__.py
 version = "0.5.1"
 description = "A library for handling common compression formats for N64 games"
-requires-python = ">=3.7"
+requires-python = ">=3.9"
 dependencies = [
 ]
 classifiers = [
diff --git a/lib/src/mio0.rs b/lib/src/mio0.rs
@@ -77,13 +77,9 @@ pub fn decompress(bytes: &[u8]) -> Result<Box<[u8]>, Crunch64Error> {
     Ok(ret.into_boxed_slice())
 }
 
-fn divide_round_up(a: usize, b: usize) -> usize {
-    (a + b - 1) / b
-}
-
 fn size_for_compressed_buffer(input_size: usize) -> Result<usize, Crunch64Error> {
     // Taken from Yaz0
-    Ok(input_size + divide_round_up(input_size, 8) + 0x10)
+    Ok(input_size + input_size.div_ceil(8) + 0x10)
 }
 
 pub fn compress(bytes: &[u8]) -> Result<Box<[u8]>, Crunch64Error> {
diff --git a/lib/src/yay0.rs b/lib/src/yay0.rs
@@ -85,13 +85,9 @@ pub fn decompress(bytes: &[u8]) -> Result<Box<[u8]>, Crunch64Error> {
     Ok(ret.into_boxed_slice())
 }
 
-fn divide_round_up(a: usize, b: usize) -> usize {
-    (a + b - 1) / b
-}
-
 fn size_for_compressed_buffer(input_size: usize) -> Result<usize, Crunch64Error> {
     // Taken from Yaz0
-    Ok(input_size + divide_round_up(input_size, 8) + 0x10)
+    Ok(input_size + input_size.div_ceil(8) + 0x10)
 }
 
 pub fn compress(bytes: &[u8]) -> Result<Box<[u8]>, Crunch64Error> {
diff --git a/lib/src/yaz0.rs b/lib/src/yaz0.rs
@@ -82,15 +82,11 @@ pub fn decompress(bytes: &[u8]) -> Result<Box<[u8]>, Crunch64Error> {
     Ok(ret.into_boxed_slice())
 }
 
-fn divide_round_up(a: usize, b: usize) -> usize {
-    (a + b - 1) / b
-}
-
 fn size_for_compressed_buffer(input_size: usize) -> Result<usize, Crunch64Error> {
     // Worst-case size for output is zero compression on the input, meaning the input size plus the number of layout bytes plus the Yaz0 header.
     // There would be one layout byte for every 8 input bytes, so the worst-case size is:
     //   input_size + ROUND_UP_DIVIDE(input_size, 8) + 0x10
-    Ok(input_size + divide_round_up(input_size, 8) + 0x10)
+    Ok(input_size + input_size.div_ceil(8) + 0x10)
 }
 
 pub fn compress(bytes: &[u8]) -> Result<Box<[u8]>, Crunch64Error> {
diff --git a/mypy.ini b/mypy.ini
@@ -0,0 +1,3 @@
+[mypy]
+python_version = 3.9
+check_untyped_defs = True

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ name = "crunch64"`
`3`	`3`	`# Version should be synced with lib/Cargo.toml and lib/crunch64/__init__.py`
`4`	`4`	`version = "0.5.1"`
`5`	`5`	`description = "A library for handling common compression formats for N64 games"`
`6`		`-requires-python = ">=3.7"`
	`6`	`+requires-python = ">=3.9"`
`7`	`7`	`dependencies = [`
`8`	`8`	`]`
`9`	`9`	`classifiers = [`
Original file line number	Diff line number	Diff line change
`@@ -77,13 +77,9 @@ pub fn decompress(bytes: &[u8]) -> Result<Box<[u8]>, Crunch64Error> {`
`77`	`77`	`Ok(ret.into_boxed_slice())`
`78`	`78`	`}`
`79`	`79`
`80`		`-fn divide_round_up(a: usize, b: usize) -> usize {`
`81`		`- (a + b - 1) / b`
`82`		`-}`
`83`		`-`
`84`	`80`	`fn size_for_compressed_buffer(input_size: usize) -> Result<usize, Crunch64Error> {`
`85`	`81`	`// Taken from Yaz0`
`86`		`- Ok(input_size + divide_round_up(input_size, 8) + 0x10)`
	`82`	`+ Ok(input_size + input_size.div_ceil(8) + 0x10)`
`87`	`83`	`}`
`88`	`84`
`89`	`85`	`pub fn compress(bytes: &[u8]) -> Result<Box<[u8]>, Crunch64Error> {`