From 8b01da0b5591ce29e2ea0124666d0ae3202dd146 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 Sep 2025 16:44:41 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20deps:=20Update=20depen?= =?UTF-8?q?dencies=20(non-major)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- rust/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2c3df02..fafd723 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ dynamic = ["version"] [project.optional-dependencies] -dev = ["pytest>=7.4.4", "ruff==0.11.13", "pyright>=1.1.293", "build"] +dev = ["pytest>=7.4.4", "ruff==0.13.2", "pyright>=1.1.293", "build"] [tool.pyright] include = ["src", "tests"] diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 349694e..3c5a1fc 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -9,5 +9,5 @@ name = "codespan_reporting_pyo3" crate-type = ["cdylib"] [dependencies] -pyo3 = "0.25.0" +pyo3 = "0.26.0" codespan-reporting = "0.12.0" From 452b1db5bf94ff0911b8c2de0e5c163028f488a7 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Wed, 1 Oct 2025 00:48:32 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=9A=A8=20fix:=20fix=20lint=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 25 ++++++++++++------------- src/codespan_reporting/_core.pyi | 4 +++- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c8bde83..a61e0ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -56,9 +56,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "portable-atomic" @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a" +checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" dependencies = [ "indoc", "libc", @@ -94,19 +94,18 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598" +checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" dependencies = [ - "once_cell", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c" +checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" dependencies = [ "libc", "pyo3-build-config", @@ -114,9 +113,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50" +checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -126,9 +125,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc" +checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" dependencies = [ "heck", "proc-macro2", diff --git a/src/codespan_reporting/_core.pyi b/src/codespan_reporting/_core.pyi index 8cbcc8e..9bd1522 100644 --- a/src/codespan_reporting/_core.pyi +++ b/src/codespan_reporting/_core.pyi @@ -1,3 +1,5 @@ +from typing_extensions import TypeAlias + # config.rs class Config: def __init__(self) -> None: ... @@ -20,7 +22,7 @@ class LabelStyle: Secondary: LabelStyle SecondaryUnderline: LabelStyle -type FileId = int +FileId: TypeAlias = int class Label: def __init__( From e10a7c6943ae7ca9c4c2cc55f782e61e7a5dcf15 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Wed, 1 Oct 2025 00:55:35 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20chore:=20drop=20python?= =?UTF-8?q?=203.8,=203.9=20support?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/lint-and-fmt.yml | 3 ++- .github/workflows/release.yml | 5 ++++- .github/workflows/unit-test.yml | 3 ++- pyproject.toml | 10 +++++----- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/lint-and-fmt.yml b/.github/workflows/lint-and-fmt.yml index 675620d..9597d71 100644 --- a/.github/workflows/lint-and-fmt.yml +++ b/.github/workflows/lint-and-fmt.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: # Only run linter and formatter on minimum supported Python version - python-version: ['3.8'] + python-version: ['3.10'] architecture: ['x64'] name: lint and fmt - Python ${{ matrix.python-version }} on ${{ matrix.architecture }} steps: @@ -33,6 +33,7 @@ jobs: python-version: ${{ matrix.python-version }} architecture: ${{ matrix.architecture }} cache: 'pip' + allow-prerelease: true - name: Install just uses: extractions/setup-just@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a348b5..a77dfde 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12', '3.13', '3.14'] target: [x86_64, x86, aarch64] name: Ubuntu, ${{ matrix.target }}, Python ${{ matrix.python-version }} steps: @@ -24,6 +24,7 @@ jobs: - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} + allow-prerelease: true - name: Build wheels uses: PyO3/maturin-action@v1 with: @@ -50,6 +51,7 @@ jobs: with: python-version: ${{ matrix.python-version }} architecture: ${{ matrix.target }} + allow-prerelease: true - name: Build wheels uses: PyO3/maturin-action@v1 with: @@ -74,6 +76,7 @@ jobs: - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} + allow-prerelease: true - name: Build wheels uses: PyO3/maturin-action@v1 with: diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 0c4f8e4..52feca5 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12', '3.13', '3.14'] architecture: ['x64'] name: unittest - Python ${{ matrix.python-version }} on ${{ matrix.architecture }} steps: @@ -28,6 +28,7 @@ jobs: python-version: ${{ matrix.python-version }} architecture: ${{ matrix.architecture }} cache: 'pip' + allow-prerelease: true - name: Install just uses: extractions/setup-just@v3 diff --git a/pyproject.toml b/pyproject.toml index fafd723..d485fe8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "maturin" name = "codespan-reporting" description = "A python binding for codespan-reporting" readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.10" authors = [{ name = "Nyakku Shigure", email = "sigure.qaq@gmail.com" }] keywords = ["codespan-reporting"] license = { text = "MIT" } @@ -15,11 +15,11 @@ classifiers = [ "Programming Language :: Rust", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", ] @@ -30,12 +30,12 @@ dev = ["pytest>=7.4.4", "ruff==0.13.2", "pyright>=1.1.293", "build"] [tool.pyright] include = ["src", "tests"] -pythonVersion = "3.8" +pythonVersion = "3.10" typeCheckingMode = "strict" [tool.ruff] line-length = 120 -target-version = "py38" +target-version = "py310" [tool.ruff.lint] select = [ From d0168935ab71b2b40cb16a7beda3a23bb115b34a Mon Sep 17 00:00:00 2001 From: SigureMo Date: Wed, 1 Oct 2025 01:05:05 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E2=9C=A8=20feat:=20use=20abi310?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 21 +++++++++------------ rust/Cargo.toml | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a77dfde..fe2a7b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,14 +16,13 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.10', '3.11', '3.12', '3.13', '3.14'] target: [x86_64, x86, aarch64] - name: Ubuntu, ${{ matrix.target }}, Python ${{ matrix.python-version }} + name: Ubuntu, ${{ matrix.target }} steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v6 with: - python-version: ${{ matrix.python-version }} + python-version: 3.x allow-prerelease: true - name: Build wheels uses: PyO3/maturin-action@v1 @@ -35,21 +34,20 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels-ubuntu-${{ matrix.target }}-${{ matrix.python-version }} + name: wheels-ubuntu-${{ matrix.target }} path: dist windows: runs-on: windows-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] target: [x64, x86] - name: Windows, ${{ matrix.target }}, Python ${{ matrix.python-version }} + name: Windows, ${{ matrix.target }} steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v6 with: - python-version: ${{ matrix.python-version }} + python-version: 3.x architecture: ${{ matrix.target }} allow-prerelease: true - name: Build wheels @@ -61,21 +59,20 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels-windows-${{ matrix.target }}-${{ matrix.python-version }} + name: wheels-windows-${{ matrix.target }} path: dist macos: runs-on: macos-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] target: [x86_64, aarch64] - name: macOS, ${{ matrix.target }}, Python ${{ matrix.python-version }} + name: macOS, ${{ matrix.target }} steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v6 with: - python-version: ${{ matrix.python-version }} + python-version: 3.x allow-prerelease: true - name: Build wheels uses: PyO3/maturin-action@v1 @@ -86,7 +83,7 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels-macos-${{ matrix.target }}-${{ matrix.python-version }} + name: wheels-macos-${{ matrix.target }} path: dist sdist: diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 3c5a1fc..72c92e0 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -9,5 +9,5 @@ name = "codespan_reporting_pyo3" crate-type = ["cdylib"] [dependencies] -pyo3 = "0.26.0" +pyo3 = { version = "0.26.0", features = ["abi3-py310"] } codespan-reporting = "0.12.0" From 407850854897272a9fbcaa2d6013d037c8068bf6 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Wed, 1 Oct 2025 01:06:22 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=9A=A8=20fix:=20correct=20spelling=20?= =?UTF-8?q?of=20'allow-prerelease'=20to=20'allow-prereleases'=20in=20workf?= =?UTF-8?q?low=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/lint-and-fmt.yml | 2 +- .github/workflows/release.yml | 6 +++--- .github/workflows/unit-test.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint-and-fmt.yml b/.github/workflows/lint-and-fmt.yml index 9597d71..71db1aa 100644 --- a/.github/workflows/lint-and-fmt.yml +++ b/.github/workflows/lint-and-fmt.yml @@ -33,7 +33,7 @@ jobs: python-version: ${{ matrix.python-version }} architecture: ${{ matrix.architecture }} cache: 'pip' - allow-prerelease: true + allow-prereleases: true - name: Install just uses: extractions/setup-just@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe2a7b0..4f9f396 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-python@v6 with: python-version: 3.x - allow-prerelease: true + allow-prereleases: true - name: Build wheels uses: PyO3/maturin-action@v1 with: @@ -49,7 +49,7 @@ jobs: with: python-version: 3.x architecture: ${{ matrix.target }} - allow-prerelease: true + allow-prereleases: true - name: Build wheels uses: PyO3/maturin-action@v1 with: @@ -73,7 +73,7 @@ jobs: - uses: actions/setup-python@v6 with: python-version: 3.x - allow-prerelease: true + allow-prereleases: true - name: Build wheels uses: PyO3/maturin-action@v1 with: diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 52feca5..e0007af 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -28,7 +28,7 @@ jobs: python-version: ${{ matrix.python-version }} architecture: ${{ matrix.architecture }} cache: 'pip' - allow-prerelease: true + allow-prereleases: true - name: Install just uses: extractions/setup-just@v3 From cdcdccdce824fcee7fbef3979ef42dc3864aa593 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Wed, 1 Oct 2025 01:13:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=9A=A8=20fix:=20replace=20'typing=5Fe?= =?UTF-8?q?xtensions'=20with=20'typing'=20for=20TypeAlias=20import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/codespan_reporting/_core.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/codespan_reporting/_core.pyi b/src/codespan_reporting/_core.pyi index 9bd1522..6dd7575 100644 --- a/src/codespan_reporting/_core.pyi +++ b/src/codespan_reporting/_core.pyi @@ -1,4 +1,4 @@ -from typing_extensions import TypeAlias +from typing import TypeAlias # config.rs class Config: