From bec7ee82050f7ef406425b805b2ee216bfba7d6b Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Fri, 22 Nov 2024 10:02:41 -0800 Subject: [PATCH 1/9] removing macos-12 --- .github/workflows/ci.yaml | 3 --- .github/workflows/installer.yaml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d7bd615b6..14e449629 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,9 +42,6 @@ jobs: - "3.12" openeye: ["no"] include: - - os: "macos-12" - python-version: "3.12" - pydantic-version: ">1" - os: "ubuntu-latest" python-version: "3.11" pydantic-version: "<2" diff --git a/.github/workflows/installer.yaml b/.github/workflows/installer.yaml index 4fac5c433..e297360cd 100644 --- a/.github/workflows/installer.yaml +++ b/.github/workflows/installer.yaml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-14, macos-12, ubuntu-latest] + os: [macos-13, macos-latest, ubuntu-latest] steps: - name: Checkout Code From 59e002239fa0fb762ed5a8e2e03b295455ec53dd Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Fri, 22 Nov 2024 11:31:15 -0800 Subject: [PATCH 2/9] add back macos-latest check --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 14e449629..fc039385d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,6 +42,9 @@ jobs: - "3.12" openeye: ["no"] include: + - os: "macos-latest" + python-version: "3.12" + pydantic-version: ">1" - os: "ubuntu-latest" python-version: "3.11" pydantic-version: "<2" From 2a4569d104c2659d65be2d240b93eeec17e8de3d Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Fri, 22 Nov 2024 14:29:06 -0800 Subject: [PATCH 3/9] remove macos-13, we know it fails bc ambertools --- .github/workflows/installer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer.yaml b/.github/workflows/installer.yaml index e297360cd..bbe0dbfed 100644 --- a/.github/workflows/installer.yaml +++ b/.github/workflows/installer.yaml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, macos-latest, ubuntu-latest] + os: [macos-latest, ubuntu-latest] steps: - name: Checkout Code From e2958c674f5448e4b3f1956693b8d5f543d5197a Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Fri, 22 Nov 2024 14:31:29 -0800 Subject: [PATCH 4/9] adding news entry --- news/no_more_macos12.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/no_more_macos12.rst diff --git a/news/no_more_macos12.rst b/news/no_more_macos12.rst new file mode 100644 index 000000000..59ac043c2 --- /dev/null +++ b/news/no_more_macos12.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* Removed support for macos-12, macos-14 is now the minimum supported. + +**Fixed:** + +* + +**Security:** + +* From c3884aa89e6f00a0eee3228deef511e0b335b934 Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Fri, 22 Nov 2024 16:10:19 -0800 Subject: [PATCH 5/9] add python 3.13 --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fc039385d..3b43d4322 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,6 +40,7 @@ jobs: - "3.10" - "3.11" - "3.12" + - "3.13" openeye: ["no"] include: - os: "macos-latest" From 0d8781cd3a76d8babcd2fd571fa8b5f30eb6db15 Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Fri, 22 Nov 2024 16:12:35 -0800 Subject: [PATCH 6/9] remove macos-13 and python 3.9 from conda cron --- .github/workflows/conda_cron.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/conda_cron.yaml b/.github/workflows/conda_cron.yaml index 2698810a8..cc0acc9da 100644 --- a/.github/workflows/conda_cron.yaml +++ b/.github/workflows/conda_cron.yaml @@ -20,9 +20,8 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'macos-latest', 'macos-13'] + os: ['ubuntu-latest', 'macos-latest'] python-version: - - "3.9" - "3.10" - "3.11" - "3.12" From 81611d9a9e0bb752e0beeec4fb1f8b49687110d7 Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Fri, 22 Nov 2024 16:17:14 -0800 Subject: [PATCH 7/9] Revert "add python 3.13" This reverts commit c3884aa89e6f00a0eee3228deef511e0b335b934. --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3b43d4322..fc039385d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,7 +40,6 @@ jobs: - "3.10" - "3.11" - "3.12" - - "3.13" openeye: ["no"] include: - os: "macos-latest" From 61b31d1f575e30b98f679d8bc2711dc744254845 Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Mon, 25 Nov 2024 08:19:14 -0800 Subject: [PATCH 8/9] removing redundant matrix exclude --- .github/workflows/conda_cron.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/conda_cron.yaml b/.github/workflows/conda_cron.yaml index cc0acc9da..af4eaa535 100644 --- a/.github/workflows/conda_cron.yaml +++ b/.github/workflows/conda_cron.yaml @@ -25,9 +25,6 @@ jobs: - "3.10" - "3.11" - "3.12" - exclude: - - os: 'macos-latest' - python-version: '3.9' steps: - name: Setup Micromamba From 61654beb77ed0d455cb40f9b284380ddb52d50fc Mon Sep 17 00:00:00 2001 From: Alyssa Travitz <31974495+atravitz@users.noreply.github.com> Date: Mon, 25 Nov 2024 10:41:07 -0800 Subject: [PATCH 9/9] Update news/no_more_macos12.rst Co-authored-by: Irfan Alibay --- news/no_more_macos12.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/no_more_macos12.rst b/news/no_more_macos12.rst index 59ac043c2..88e2dc8bf 100644 --- a/news/no_more_macos12.rst +++ b/news/no_more_macos12.rst @@ -12,7 +12,7 @@ **Removed:** -* Removed support for macos-12, macos-14 is now the minimum supported. +* openfe is no longer tested against macos-12. macos support is, for now, limited to osx-arm64 (macos-14+). **Fixed:**