From 323bd22158b5fd13802979bdf486f0862592d682 Mon Sep 17 00:00:00 2001 From: Victor Lin Date: Wed, 17 Jun 2026 13:48:35 -0700 Subject: [PATCH] Drop testing for macOS x86 on aarch64 Reasoning in changelog entry and removed issue link. --- .github/workflows/ci.yaml | 2 -- CHANGES.md | 7 +++++++ doc/changes.md | 8 ++++++++ setup.py | 5 ----- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 292d3625..35d040a4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -307,8 +307,6 @@ jobs: - { os: ubuntu-22.04-arm, target: aarch64-unknown-linux-gnu } - { os: ubuntu-24.04-arm, target: aarch64-unknown-linux-gnu } - { os: macos-15-intel, target: x86_64-apple-darwin } - - { os: macos-14, target: x86_64-apple-darwin } - - { os: macos-15, target: x86_64-apple-darwin } - { os: macos-14, target: aarch64-apple-darwin } - { os: macos-15, target: aarch64-apple-darwin } - { os: windows-2022, target: x86_64-pc-windows-msvc } diff --git a/CHANGES.md b/CHANGES.md index 8d782aa2..437c6291 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,13 @@ development source code and as such may not be routinely kept up to date. # __NEXT__ +## Development + +* We no longer test the macOS x86 standalone archive on aarch64 machines (Apple + Silicon). Apple Silicon users should be using the native aarch64 standalone + archive. If you encounter any issues starting with this version, first try + [re-installing Nextstrain CLI](https://docs.nextstrain.org/projects/cli/en/__NEXT__/installation/). + ([#537](https://github.com/nextstrain/cli/pull/537)) # 11.0.0 (5 May 2026) diff --git a/doc/changes.md b/doc/changes.md index 75c87215..daf2f778 100644 --- a/doc/changes.md +++ b/doc/changes.md @@ -16,6 +16,14 @@ development source code and as such may not be routinely kept up to date. (v-next)= ## __NEXT__ +(v-next-development)= +### Development + +* We no longer test the macOS x86 standalone archive on aarch64 machines (Apple + Silicon). Apple Silicon users should be using the native aarch64 standalone + archive. If you encounter any issues starting with this version, first try + [re-installing Nextstrain CLI](https://docs.nextstrain.org/projects/cli/en/__NEXT__/installation/). + ([#537](https://github.com/nextstrain/cli/pull/537)) (v11-0-0)= ## 11.0.0 (5 May 2026) diff --git a/setup.py b/setup.py index 26c3b8e2..51362ff3 100644 --- a/setup.py +++ b/setup.py @@ -122,11 +122,6 @@ def find_namespaced_packages(namespace): # https://github.com/fsspec/filesystem_spec/pull/1358 that causes the # error described in https://github.com/fsspec/s3fs/issues/790 "fsspec[s3] !=2023.9.1", - - # pyjwt[crypto] depends on cryptography. Our standalone build has issues - # with 49.0.0, so it is avoided here as a temporary fix. - # - "cryptography <49.0.0", ], extras_require = {