From 95415eac707f8003f64470c8bd58e48f9d329966 Mon Sep 17 00:00:00 2001 From: Mike Henry <11765982+mikemhenry@users.noreply.github.com> Date: Mon, 20 Nov 2023 16:55:59 -0700 Subject: [PATCH 1/4] install latest openfe and gufe as a canary to catch upstream changes --- .github/workflows/ci-integration.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index b89408b9..fcc802ac 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -29,6 +29,10 @@ jobs: python-version: - "3.9" - "3.10" + openfe-latest: ['false'] + include: + - openfe-latest: 'true' + python-version: "3.10" steps: - uses: actions/checkout@v2 @@ -42,6 +46,9 @@ jobs: environment-file: devtools/conda-envs/test.yml activate-environment: alchemiscale-test + - name: "Install openfe & gufe from latest source" + if: ${{ matrix.openfe-latest == 'true' }} + run: pip install --no-deps git+https://github.com/OpenFreeEnergy/gufe git+https://github.com/OpenFreeEnergy/openfe - name: "Install" run: python -m pip install --no-deps -e . From 8117a4e035c6bc0c7aa1be133ecad3907caa6fb2 Mon Sep 17 00:00:00 2001 From: David Dotson Date: Mon, 4 Dec 2023 19:13:48 +0100 Subject: [PATCH 2/4] Fix to integration CI for openfe/gufe canary --- .github/workflows/ci-integration.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index fcc802ac..6246e56c 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -31,8 +31,9 @@ jobs: - "3.10" openfe-latest: ['false'] include: - - openfe-latest: 'true' + - os: 'ubuntu' python-version: "3.10" + openfe-latest: 'true' steps: - uses: actions/checkout@v2 From 6d10f1f60e398b7b6d3b25f8a0f8a0715a656ca8 Mon Sep 17 00:00:00 2001 From: David Dotson Date: Mon, 4 Dec 2023 19:16:21 +0100 Subject: [PATCH 3/4] Made values easier to read for openfe-latest --- .github/workflows/ci-integration.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index 6246e56c..6563f327 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -29,11 +29,11 @@ jobs: python-version: - "3.9" - "3.10" - openfe-latest: ['false'] + deps-versions: ['pinned'] include: - os: 'ubuntu' python-version: "3.10" - openfe-latest: 'true' + deps-versions: 'openfe-latest' steps: - uses: actions/checkout@v2 @@ -48,7 +48,7 @@ jobs: activate-environment: alchemiscale-test - name: "Install openfe & gufe from latest source" - if: ${{ matrix.openfe-latest == 'true' }} + if: ${{ matrix.deps-versions == 'openfe-latest' }} run: pip install --no-deps git+https://github.com/OpenFreeEnergy/gufe git+https://github.com/OpenFreeEnergy/openfe - name: "Install" From 02840f094a5e94f3b9ccba57b96c18a657f8b35b Mon Sep 17 00:00:00 2001 From: David Dotson Date: Mon, 4 Dec 2023 19:17:44 +0100 Subject: [PATCH 4/4] One more adjustment --- .github/workflows/ci-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index 6563f327..e644f76f 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -29,7 +29,7 @@ jobs: python-version: - "3.9" - "3.10" - deps-versions: ['pinned'] + deps-versions: ['openfe-release'] include: - os: 'ubuntu' python-version: "3.10"