From 01f5803a87df9c7e14a051ed37bcbd7b8e42cc9a Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Thu, 12 Dec 2024 11:03:47 -0800 Subject: [PATCH 1/3] test against gufe main again --- .github/workflows/ci.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2a54bd2e7..629257ffb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,34 +41,34 @@ jobs: - "3.11" - "3.12" openeye: ["no"] - gufe-version: ['a9b5982471eb3644ca8c4423c7001e6309a3f544'] + gufe-version: ['main'] include: - os: "macos-latest" python-version: "3.12" pydantic-version: ">1" - gufe-version: 'a9b5982471eb3644ca8c4423c7001e6309a3f544' + gufe-version: 'main' - os: "ubuntu-latest" python-version: "3.11" pydantic-version: "<2" - gufe-version: 'a9b5982471eb3644ca8c4423c7001e6309a3f544' + gufe-version: 'main' - os: "ubuntu-latest" python-version: "3.11" pydantic-version: ">1" openeye: "yes" - gufe-version: 'a9b5982471eb3644ca8c4423c7001e6309a3f544' + gufe-version: 'main' - os: "macos-latest" python-version: "3.12" pydantic-version: ">1" omff-version: ">0.13" openeye: ["no"] - gufe-version: 'a9b5982471eb3644ca8c4423c7001e6309a3f544' + gufe-version: 'main' - # temporary test against gufe main while we're pinned to a9b5 + # temporary check against v1.1.0 until issue #1033 is closed - os: "ubuntu-latest" python-version: "3.11" pydantic-version: ">1" openeye: "yes" - gufe-version: 'main' + gufe-version: 'v1.1.0' env: OE_LICENSE: ${{ github.workspace }}/oe_license.txt From 6372acbb7eac95859ecaae7cea0718d9b1f8a310 Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Fri, 13 Dec 2024 08:21:38 -0800 Subject: [PATCH 2/3] all matrix tests against gufe main --- .github/workflows/ci.yaml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 629257ffb..2c95ba125 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -30,7 +30,7 @@ defaults: jobs: tests: runs-on: ${{ matrix.os }} - name: "💻-${{matrix.os }} 🐍-${{ matrix.python-version }} 🗃️${{ matrix.pydantic-version }} oechem-${{ matrix.openeye }} gufe-${{ matrix.gufe-version }}" + name: "💻-${{matrix.os }} 🐍-${{ matrix.python-version }} 🗃️${{ matrix.pydantic-version }} oechem-${{ matrix.openeye }}" strategy: fail-fast: false matrix: @@ -41,34 +41,22 @@ jobs: - "3.11" - "3.12" openeye: ["no"] - gufe-version: ['main'] include: - os: "macos-latest" python-version: "3.12" pydantic-version: ">1" - gufe-version: 'main' - os: "ubuntu-latest" python-version: "3.11" pydantic-version: "<2" - gufe-version: 'main' - os: "ubuntu-latest" python-version: "3.11" pydantic-version: ">1" openeye: "yes" - gufe-version: 'main' - os: "macos-latest" python-version: "3.12" pydantic-version: ">1" omff-version: ">0.13" openeye: ["no"] - gufe-version: 'main' - - # temporary check against v1.1.0 until issue #1033 is closed - - os: "ubuntu-latest" - python-version: "3.11" - pydantic-version: ">1" - openeye: "yes" - gufe-version: 'v1.1.0' env: OE_LICENSE: ${{ github.workspace }}/oe_license.txt @@ -108,10 +96,6 @@ jobs: micromamba install -c openeye openeye-toolkits python -c "import openeye; assert openeye.oechem.OEChemIsLicensed(), 'oechem license check failed!'" - - name: "Install GUFE at {{ matrix.gufe-version }}" - if: ${{ matrix.gufe-version != 'main' }} - run: python -m pip install --no-deps git+https://github.com/OpenFreeEnergy/gufe@${{ matrix.gufe-version }} - - name: "Install" run: python -m pip install --no-deps -e . From bb3b75e432fbaae0c1c9397609b8fe450bdc3486 Mon Sep 17 00:00:00 2001 From: Alyssa Travitz Date: Fri, 13 Dec 2024 08:38:07 -0800 Subject: [PATCH 3/3] format to match expected --- .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 2c95ba125..eddf60bba 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -30,7 +30,7 @@ defaults: jobs: tests: runs-on: ${{ matrix.os }} - name: "💻-${{matrix.os }} 🐍-${{ matrix.python-version }} 🗃️${{ matrix.pydantic-version }} oechem-${{ matrix.openeye }}" + name: "💻-${{matrix.os }} 🐍-${{ matrix.python-version }} 🗃️${{ matrix.pydantic-version }} oechem: ${{ matrix.openeye }}" strategy: fail-fast: false matrix: