diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index b4e2e55..198736f 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -1,6 +1,10 @@ name: Build and upload to PyPI on: + # uncomment pr trigger when testing + # pull_request: + # branches: + # - "main" push: tags: - "*" @@ -31,14 +35,15 @@ jobs: - [ubuntu-20.04, manylinux_x86_64, x86_64] - [macos-11, macosx_*, x86_64] - [windows-2019, win_amd64, AMD64] - python: ["cp39", "cp310", "cp311"] + - [macos-14, macosx_*, arm64] + python: ["cp39", "cp310", "cp311", "cp312"] steps: - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.16.5 env: CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }} CIBW_ARCHS: ${{ matrix.buildplat[2] }} @@ -132,7 +137,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - name: setup python diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml index fe80bf5..44a2eb7 100644 --- a/.github/workflows/gh-ci.yaml +++ b/.github/workflows/gh-ci.yaml @@ -46,7 +46,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macOS-latest, ubuntu-latest, windows-latest] + os: [macOS-latest, ubuntu-latest, windows-latest, macos-14] python-version: ${{ fromJSON(needs.environment-config.outputs.python-matrix) }} mdanalysis-version: ["latest", "develop"] diff --git a/CHANGELOG.md b/CHANGELOG.md index ab134f5..76736d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ The rules for this file: ### Authors - ianmkenney - tylerjereddy +- IAlibay ### Added @@ -30,7 +31,7 @@ The rules for this file: - Temporary fix for Windows integer size default change in NumPy 2.0.0 ### Changed - +- Update CI and wheel deployment to include macos-arm64 and py3.12 (PR #63) ### Deprecated