From fb483f6abb6ef661daf592fbc9fb02eb1ac1ab46 Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Fri, 22 Nov 2024 14:38:05 -0800 Subject: [PATCH 1/5] switch from macos-12 pin to macos-latest --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/conda_cron.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index da3799a2..9032bcfd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,9 +34,9 @@ jobs: - "3.11" - "3.12" include: - # Note: pinned to macos-12 + # Note: we still need to add support for macos-13 # see https://github.com/OpenFreeEnergy/openfe/issues/842 - - os: "macos-12" + - os: "macos-latest" python-version: "3.11" pydantic-version: ">1" - os: "ubuntu-latest" diff --git a/.github/workflows/conda_cron.yaml b/.github/workflows/conda_cron.yaml index 33d3a954..c4f7ec49 100644 --- a/.github/workflows/conda_cron.yaml +++ b/.github/workflows/conda_cron.yaml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'macos-14'] + os: ['ubuntu-latest', 'macos-latest'] python-version: - "3.10" - "3.11" From 7e1cc96688d84c255c2a45b3395c95a96bc0b54e Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Fri, 22 Nov 2024 16:13:50 -0800 Subject: [PATCH 2/5] add python 3.13 to ci --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9032bcfd..489035bd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,6 +33,7 @@ jobs: - "3.10" - "3.11" - "3.12" + - "3.13" include: # Note: we still need to add support for macos-13 # see https://github.com/OpenFreeEnergy/openfe/issues/842 From 57afd92e1988682143dddb846778055e941ebcc9 Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Mon, 25 Nov 2024 09:04:45 -0800 Subject: [PATCH 3/5] Revert "add python 3.13 to ci" This reverts commit 7e1cc96688d84c255c2a45b3395c95a96bc0b54e. --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 489035bd..9032bcfd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,7 +33,6 @@ jobs: - "3.10" - "3.11" - "3.12" - - "3.13" include: # Note: we still need to add support for macos-13 # see https://github.com/OpenFreeEnergy/openfe/issues/842 From c894b52a5034feef5b2144c23d441806e3c4a727 Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Mon, 25 Nov 2024 10:25:01 -0800 Subject: [PATCH 4/5] trying macos 13 --- .github/workflows/ci.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9032bcfd..82d15600 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,7 +27,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest'] + os: ['ubuntu-latest', macos-latest, macos-13] pydantic-version: [">1"] python-version: - "3.10" @@ -36,9 +36,6 @@ jobs: include: # Note: we still need to add support for macos-13 # see https://github.com/OpenFreeEnergy/openfe/issues/842 - - os: "macos-latest" - python-version: "3.11" - pydantic-version: ">1" - os: "ubuntu-latest" python-version: "3.11" pydantic-version: "<2" From b31fc0811502eb13faccc0d3202fe2ca9da72f04 Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Mon, 25 Nov 2024 10:40:40 -0800 Subject: [PATCH 5/5] removing macos-13 from matrix --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 82d15600..6df2ffd6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,7 +27,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', macos-latest, macos-13] + os: ['ubuntu-latest', macos-latest] pydantic-version: [">1"] python-version: - "3.10"