From c05ce505e6a021402afeee7a1df6a149e00845e8 Mon Sep 17 00:00:00 2001 From: Koichi Akabe Date: Wed, 4 Sep 2024 08:19:28 +0900 Subject: [PATCH 1/7] Update actions/{upload,download}-artifact to v4 --- .github/workflows/CI.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 693a08b..66f39b3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -54,9 +54,9 @@ jobs: with: command: sdist - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-${{ matrix.runs-on }} path: target/wheels pack-linux: @@ -80,9 +80,9 @@ jobs: manylinux: auto args: -i ${{ matrix.python-version }} --release - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-${{ matrix.runs-on }} path: target/wheels pack-windows: @@ -107,9 +107,9 @@ jobs: manylinux: auto args: -i ${{ matrix.python-version }} --release - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-${{ matrix.runs-on }} path: target/wheels pack-macos: @@ -132,9 +132,9 @@ jobs: manylinux: auto args: -i ${{ matrix.python-version }} --release --universal2 - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-${{ matrix.runs-on }} path: target/wheels release: @@ -143,9 +143,10 @@ jobs: needs: [ pack-sdist, pack-linux, pack-windows, pack-macos ] runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: wheels + pattern: wheels-* + merge-multiple: true - name: Publish to PyPI uses: messense/maturin-action@v1 env: From 73dd6fc1b18b3b4289dedbbf64b1a9a5a42703ad Mon Sep 17 00:00:00 2001 From: Koichi Akabe Date: Wed, 4 Sep 2024 08:42:28 +0900 Subject: [PATCH 2/7] Update Python version --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 66f39b3..6fe81cb 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: runs-on: [ ubuntu-latest, windows-latest, macos-latest ] - python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ] + python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ] runs-on: ${{ matrix.runs-on }} steps: - uses: actions/checkout@v3 From 66f675c857073ce244aafca7260c7dafaeb4304e Mon Sep 17 00:00:00 2001 From: Koichi Akabe Date: Wed, 4 Sep 2024 08:44:03 +0900 Subject: [PATCH 3/7] update --- .github/workflows/CI.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6fe81cb..7050a0c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' - uses: dtolnay/rust-toolchain@stable - name: Build package uses: PyO3/maturin-action@v1 @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ] + python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ] target: [ x86_64, i686 ] steps: - uses: actions/checkout@v3 @@ -91,7 +91,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ] + python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ] target: [ x64, x86 ] steps: - uses: actions/checkout@v3 @@ -118,7 +118,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ] + python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ] steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 From 6681198515ee887e828ee1454f8bf780f81324a0 Mon Sep 17 00:00:00 2001 From: Koichi Akabe Date: Wed, 4 Sep 2024 09:02:30 +0900 Subject: [PATCH 4/7] fix --- tests/test_comparison_cat.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_comparison_cat.py b/tests/test_comparison_cat.py index 6c654d9..00eacdd 100644 --- a/tests/test_comparison_cat.py +++ b/tests/test_comparison_cat.py @@ -1,11 +1,11 @@ from __future__ import annotations import vaporetto -import Mykytea # type: ignore[import] -from sudachipy import tokenizer as sudachi_tokenizer # type: ignore[import] +import Mykytea +from sudachipy import tokenizer as sudachi_tokenizer from sudachipy import dictionary as sudachi_dictionary -from pytest_benchmark import fixture # type: ignore[import] +from pytest_benchmark import fixture from tests import dataset From 12a50394ccf411512fa56ae73fc0907f6de92afe Mon Sep 17 00:00:00 2001 From: Koichi Akabe Date: Wed, 4 Sep 2024 09:02:56 +0900 Subject: [PATCH 5/7] =?UTF-8?q?test=5Fcomparison=5Fcount.py=20=E3=81=AE?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_comparison_count.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_comparison_count.py b/tests/test_comparison_count.py index d770713..c27d913 100644 --- a/tests/test_comparison_count.py +++ b/tests/test_comparison_count.py @@ -1,11 +1,11 @@ from __future__ import annotations import vaporetto -import Mykytea # type: ignore[import] -from sudachipy import tokenizer as sudachi_tokenizer # type: ignore[import] +import Mykytea +from sudachipy import tokenizer as sudachi_tokenizer from sudachipy import dictionary as sudachi_dictionary -from pytest_benchmark import fixture # type: ignore[import] +from pytest_benchmark import fixture from tests import dataset From f37ca5a7c7fcdea032957b3c63aa47253c4f05bf Mon Sep 17 00:00:00 2001 From: Koichi Akabe Date: Wed, 4 Sep 2024 09:09:22 +0900 Subject: [PATCH 6/7] fix --- tests/test_comparison_count.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_comparison_count.py b/tests/test_comparison_count.py index c27d913..f31df43 100644 --- a/tests/test_comparison_count.py +++ b/tests/test_comparison_count.py @@ -1,11 +1,11 @@ from __future__ import annotations import vaporetto -import Mykytea -from sudachipy import tokenizer as sudachi_tokenizer +import Mykytea # type: ignore[import-not-found] +from sudachipy import tokenizer as sudachi_tokenizer # type: ignore[import-not-found] from sudachipy import dictionary as sudachi_dictionary -from pytest_benchmark import fixture +from pytest_benchmark import fixture # type: ignore[import-not-found] from tests import dataset From 2a457d9e865ff128f6d78e1e6c9647fc05f8c76e Mon Sep 17 00:00:00 2001 From: Koichi Akabe Date: Wed, 4 Sep 2024 09:11:29 +0900 Subject: [PATCH 7/7] fix --- tests/test_comparison_cat.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_comparison_cat.py b/tests/test_comparison_cat.py index 00eacdd..9b79e44 100644 --- a/tests/test_comparison_cat.py +++ b/tests/test_comparison_cat.py @@ -1,11 +1,11 @@ from __future__ import annotations import vaporetto -import Mykytea -from sudachipy import tokenizer as sudachi_tokenizer +import Mykytea # type: ignore[import-not-found] +from sudachipy import tokenizer as sudachi_tokenizer # type: ignore[import-not-found] from sudachipy import dictionary as sudachi_dictionary -from pytest_benchmark import fixture +from pytest_benchmark import fixture # type: ignore[import-not-found] from tests import dataset