diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da0723e..4f9d6e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] runs-on: ${{ matrix.os }} steps: @@ -19,6 +19,7 @@ jobs: python-version: ${{ matrix.python-version }} cache: 'pip' cache-dependency-path: pyproject.toml + allow-prereleases: true - name: Install dependencies run: | diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml index b37972c..dee5dd5 100644 --- a/.github/workflows/github-pages.yml +++ b/.github/workflows/github-pages.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.12 + - name: Set up Python 3.13 uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' - name: Install dependencies run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b843382..89bff43 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,11 +1,11 @@ name: publish -on: - push: - branches: - - main - tags: - - 'v*.*.*' +on: push + #push: + # branches: + # - main + # tags: + # - 'v*.*.*' jobs: build_wheels: @@ -21,9 +21,9 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.20.0 env: - CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-* + CIBW_BUILD: cp3*-* CIBW_SKIP: pp* *i686* *win32 *musllinux* - CIBW_PROJECT_REQUIRES_PYTHON: '>=3.8,<3.13' + CIBW_PROJECT_REQUIRES_PYTHON: '>=3.9' CIBW_BEFORE_BUILD: pip install --verbose --editable . CIBW_ARCHS_LINUX: auto64 CIBW_ARCHS_MACOS: x86_64 universal2 arm64 @@ -43,7 +43,8 @@ jobs: - uses: actions/setup-python@v5 name: Install Python with: - python-version: '3.12' + python-version: '3.13' + allow-prereleases: true - run: pip install build @@ -55,22 +56,22 @@ jobs: name: artifact-source path: dist/*.tar.gz - upload_pypi: - needs: [build_wheels, build_sdist] - runs-on: ubuntu-latest + #upload_pypi: + # needs: [build_wheels, build_sdist] + # runs-on: ubuntu-latest - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') - steps: - - uses: actions/download-artifact@v4 - with: - path: dist - pattern: artifact-* - merge-multiple: true + # if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') + # steps: + # - uses: actions/download-artifact@v4 + # with: + # path: dist + # pattern: artifact-* + # merge-multiple: true - - uses: pypa/gh-action-pypi-publish@v1.10.1 - with: - user: __token__ - password: ${{ secrets.PYPI_PASSWORD }} - # To test, uncomment the following: - # password: ${{ secrets.TEST_PYPI_PASSWORD }} - # repository-url: https://test.pypi.org/legacy/ + # - uses: pypa/gh-action-pypi-publish@v1.10.1 + # with: + # user: __token__ + # password: ${{ secrets.PYPI_PASSWORD }} + # # To test, uncomment the following: + # # password: ${{ secrets.TEST_PYPI_PASSWORD }} + # # repository-url: https://test.pypi.org/legacy/ diff --git a/pyproject.toml b/pyproject.toml index 5f31e76..f9a24ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ requires = [ [tool.black] line-length = 99 preview = true -target_version = ["py38", "py39", "py310", "py311", "py312"] +target_version = ["py39", "py310", "py311", "py312", "py313"] [tool.cython-lint] ignore = ["E741"] diff --git a/quantile_forest/tests/test_quantile_forest.py b/quantile_forest/tests/test_quantile_forest.py index 96b1076..017b341 100755 --- a/quantile_forest/tests/test_quantile_forest.py +++ b/quantile_forest/tests/test_quantile_forest.py @@ -3,7 +3,7 @@ import math import pickle import warnings -from typing import Any, Dict +from typing import Any import numpy as np import pytest @@ -41,7 +41,7 @@ X_california = california.data[perm] y_california = california.target[perm] -FOREST_REGRESSORS: Dict[str, Any] = { +FOREST_REGRESSORS: dict[str, Any] = { "ExtraTreesQuantileRegressor": ExtraTreesQuantileRegressor, "RandomForestQuantileRegressor": RandomForestQuantileRegressor, } diff --git a/setup.py b/setup.py index bdcb4f0..b900bae 100755 --- a/setup.py +++ b/setup.py @@ -52,11 +52,11 @@ def write_version_py(): "Operating System :: POSIX", "Operating System :: Unix", "Operating System :: MacOS", - "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 :: Implementation :: CPython", ]