diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index 49c2221..fe13f92 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -15,15 +15,20 @@ jobs: os: - ubuntu-latest - ubuntu-24.04-arm - - macos-13 # x86 - - macos-latest # arm - python: ["cp39", "cp310", "cp311", "cp312"] + - macos-15-intel # x86 + - macos-latest # arm + python: ["cp310", "cp311", "cp312", "cp313", "cp314"] steps: - - uses: actions/checkout@v4 - - name: Build binary wheels - uses: pypa/cibuildwheel@v2.19 - with: - output-dir: dist + - uses: actions/checkout@v6 + - name: Install cibuildwheel + run: python -m pip install cibuildwheel==3.3.1 + + - name: Build wheels + run: | + if [ "$(uname -s)" = Darwin ]; then + export MACOSX_DEPLOYMENT_TARGET="$(sw_vers -productVersion | awk -F. '{print $1 ".0"}')" + fi + python -m cibuildwheel --output-dir dist env: # Wheel version settings CIBW_BUILD: ${{matrix.python}}-* @@ -31,8 +36,7 @@ jobs: # Linux archs CIBW_ARCHS_LINUX: ${{ fromJSON('["x86_64", "aarch64"]')[matrix.os == 'ubuntu-24.04-arm'] }} # poor man ternary https://github.com/orgs/community/discussions/25725#discussioncomment-3248924 # MacOS archs - CIBW_ARCHS_MACOS: ${{ fromJSON('["arm64", "x86_64"]')[matrix.os == 'macos-13'] }} - MACOSX_DEPLOYMENT_TARGET: ${{ fromJSON('["14.0", "13.0"]')[matrix.os == 'macos-13'] }} + CIBW_ARCHS_MACOS: ${{ fromJSON('["arm64", "x86_64"]')[matrix.os == 'macos-15-intel'] }} # General CIBW_TEST_REQUIRES: -r requirements-dev.txt CIBW_TEST_COMMAND: pytest -v {project}/tests diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index c37df89..487e2f0 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -11,7 +11,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"] steps: - uses: actions/checkout@v4 diff --git a/pyproject.toml b/pyproject.toml index 6a48aa1..85bab26 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,11 +24,11 @@ classifiers = [ "Operating System :: POSIX :: Linux", "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", "Topic :: Scientific/Engineering :: Atmospheric Science", ] diff --git a/tox.ini b/tox.ini index bca5241..94d8f87 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ [tox] min_version = 4.0 envlist = - py{36,37,38,39,310,311,312} + py{310,311,312,313,314} [testenv] deps = -r {toxinidir}/requirements-dev.txt