From 38f679bad68b0e6998b40a6b44d84619a2d643e8 Mon Sep 17 00:00:00 2001 From: Paul O'Leary McCann Date: Thu, 31 Oct 2024 17:01:53 +0900 Subject: [PATCH] Add 3.13 builds (#97) * Add 3.13 builds * Update Cython version Cython actually did jump from 0.29 to 3.0, there are no versions in between. * Update cibuildwheel Also fix mac versions --- .github/macos-build.sh | 2 +- .github/workflows/entrypoint.sh | 2 +- .github/workflows/manylinux1.yml | 6 +++--- .github/workflows/osx.yml | 2 +- .github/workflows/test_manylinux.yml | 5 ++++- .github/workflows/windows.yml | 5 ++++- requirements.txt | 2 +- setup.py | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/macos-build.sh b/.github/macos-build.sh index d9ab4c1..2a40410 100755 --- a/.github/macos-build.sh +++ b/.github/macos-build.sh @@ -49,7 +49,7 @@ sudo make install cd ../.. python -m pip install --upgrade setuptools wheel pip setuptools-scm -python -m pip install cibuildwheel==2.17.0 +python -m pip install cibuildwheel==2.21.3 pip install -r requirements.txt python -m cibuildwheel --platform macos --archs x86_64,arm64,universal2 --output-dir dist diff --git a/.github/workflows/entrypoint.sh b/.github/workflows/entrypoint.sh index 1f91055..c31eeec 100755 --- a/.github/workflows/entrypoint.sh +++ b/.github/workflows/entrypoint.sh @@ -21,7 +21,7 @@ make install export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/ # Build the wheels -Python="cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311 cp312-cp312" +Python="cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311 cp312-cp312 cp313-cp313" for PYVER in $Python; do # install cython first /opt/python/$PYVER/bin/pip install cython setuptools-scm diff --git a/.github/workflows/manylinux1.yml b/.github/workflows/manylinux1.yml index 890bd6d..4e5dcb6 100644 --- a/.github/workflows/manylinux1.yml +++ b/.github/workflows/manylinux1.yml @@ -10,7 +10,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '>=3.8 <3.13' + python-version: '>=3.8 <3.14' - name: install MeCab run: | git clone --depth=1 https://github.com/taku910/mecab.git @@ -39,7 +39,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '>=3.8 <3.13' + python-version: '>=3.8 <3.14' - name: build array of wheels uses: ./.github/workflows/actions/build-manylinux/ - name: Upload Wheels @@ -66,7 +66,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '>=3.8 <3.13' + python-version: '>=3.8 <3.14' - name: Set up QEMU id: qemu uses: docker/setup-qemu-action@v1 diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 64e59e2..66bc2e8 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -13,7 +13,7 @@ jobs: - name: Set up python uses: actions/setup-python@v5 with: - python-version: '>=3.7 <3.13' + python-version: '>=3.8 <3.14' - name: Download and build MeCab shell: bash run: | diff --git a/.github/workflows/test_manylinux.yml b/.github/workflows/test_manylinux.yml index 1fb0230..844b1c8 100644 --- a/.github/workflows/test_manylinux.yml +++ b/.github/workflows/test_manylinux.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] include: - python-version: '3.8' py-short: '38' @@ -25,6 +25,9 @@ jobs: - python-version: '3.12' py-short: 312 py-short2: 312 + - python-version: '3.13' + py-short: 313 + py-short2: 313 env: PYTHON: /opt/python/cp${{ matrix.py-short }}-cp${{ matrix.py-short2 }}/bin/python steps: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ae22765..c0b67ca 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 5 matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] include: - python-version: '3.8' py-short: '38' @@ -30,6 +30,9 @@ jobs: - python-version: '3.12' py-short: 312 py-short2: 312 + - python-version: '3.13' + py-short: 313 + py-short2: 313 steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} diff --git a/requirements.txt b/requirements.txt index 0cc17c2..b677f06 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -Cython~=0.29.35 +Cython~=3.0.11 diff --git a/setup.py b/setup.py index c02c87e..867d1e2 100644 --- a/setup.py +++ b/setup.py @@ -56,4 +56,4 @@ 'unidic': ['unidic'], 'unidic-lite': ['unidic-lite'], }, - setup_requires=['wheel', 'Cython~=0.29.35', 'setuptools_scm']) + setup_requires=['wheel', 'Cython~=3.0.11', 'setuptools_scm'])