Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
schedule:
# 3 am Tuesdays and Fridays
- cron: "0 3 * * 2,5"
workflow_dispatch:


concurrency:
Expand All @@ -37,9 +38,11 @@ jobs:
fail-fast: false
matrix:
buildplat:
- [ubuntu-22.04, manylinux_x86_64, x86_64]
- [windows-2022, win_amd64, AMD64]
- [macos-14, macosx_*, arm64]
- [ubuntu-22.04, manylinux, x86_64]
- [ubuntu-24.04-arm, manylinux, aarch64]
- [windows-2025, win, AMD64]
- [macos-14, macosx, arm64]
- [macos-15-intel, macosx, x86_64]
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really want to target builds for intel macs? Can't builds for those be dropped and if someone requires it they can always build themselves?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My take is here is "why not" - there's not really a cost to having them. Is the concern mostly that we don't test it anymore?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd still build them as long as it does not break our system. Not everyone can afford upgrading their laptop every 3 years (yes, M1 was ~2020...) and so providing our software on older architectures makes it more accessible.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mention mostly because Blender has dropped providing explicit binaries for Intel Mac's because of the development burden. As long as it's not breaking anything then I suppose why not, but I think if it starts causing issues we drop it.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My suggestion is that we add intel osx back into the cron test matrix. I am a little bit wary that we've not run tests with it in a while, so have it solely in deployment seems risky.

python: ["cp311", "cp312", "cp313", "cp314"]
defaults:
run:
Expand All @@ -50,11 +53,11 @@ jobs:
fetch-depth: 0

- name: Build wheels
uses: pypa/cibuildwheel@v3.4.0
uses: pypa/cibuildwheel@v3.4.1
with:
package-dir: package
env:
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}_${{ matrix.buildplat[2] }}
CIBW_ARCHS: ${{ matrix.buildplat[2] }}
CIBW_BUILD_VERBOSITY: 1

Expand Down Expand Up @@ -144,7 +147,7 @@ jobs:
mv dist/mdanalysistests-* testsuite/dist

- name: upload_source_and_wheels
uses: pypa/gh-action-pypi-publish@v1.13.0
uses: pypa/gh-action-pypi-publish@v1.14.0
with:
skip_existing: true
repository_url: https://test.pypi.org/legacy/
Expand Down Expand Up @@ -173,7 +176,7 @@ jobs:
mv dist/mdanalysistests-* testsuite/dist

- name: upload_tests
uses: pypa/gh-action-pypi-publish@v1.13.0
uses: pypa/gh-action-pypi-publish@v1.14.0
with:
packages_dir: testsuite/dist
skip_existing: true
Expand Down Expand Up @@ -203,7 +206,7 @@ jobs:
mv dist/mdanalysistests-* testsuite/dist

- name: upload_source_and_wheels
uses: pypa/gh-action-pypi-publish@v1.13.0
uses: pypa/gh-action-pypi-publish@v1.14.0

upload_pypi_mdanalysistests:
if: |
Expand All @@ -229,7 +232,7 @@ jobs:
mv dist/mdanalysistests-* testsuite/dist

- name: upload_tests
uses: pypa/gh-action-pypi-publish@v1.13.0
uses: pypa/gh-action-pypi-publish@v1.14.0
with:
packages_dir: testsuite/dist

Expand All @@ -249,8 +252,11 @@ jobs:
type: ["FULL", "MIN"]
exclude:
# Multiple deps don't like windows
# no osx-arm64 packages for HOLE2
- os: windows-latest
type: "FULL"
- os: "macos-latest"
type: "FULL"
- python-version: "3.14"
type: "FULL"
env:
Expand All @@ -260,7 +266,7 @@ jobs:
- uses: actions/checkout@v6

- name: setup_micromamba
uses: mamba-org/setup-micromamba@v2
uses: mamba-org/setup-micromamba@v3
with:
environment-name: mda
create-args: >-
Expand Down
Loading