From a7d618040c866271e0333f670dd4ef81e4a8d646 Mon Sep 17 00:00:00 2001 From: Angie Hinrichs Date: Mon, 27 Jan 2025 13:49:01 -0800 Subject: [PATCH] Add entries for pangolin-data/-assignment, update workflows (#553) * Add entries for pangolin-data/-assignment 1.31 * Get workflows running again * Remove conda-version setting because it constrained python to 3.10 or 3.11 but that caused a conflict with a pinned python 3.12. * pangolin_macos.yml needs setup-miniconda@v2 for now because it sets architecture to x86_64, and setup-miniconda@v3 uses arm64 which is not working for usher yet. pangolin_macos.yml also needs to set miniconda-version to latest so conda installation doesn't fail. * Add entries for pangolin-data/-assignment 1.32 --- .github/workflows/pangolin.yml | 6 ++---- .github/workflows/pangolin_macos.yml | 5 ++--- pangolin/data/data_compatibility.csv | 4 ++++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pangolin.yml b/.github/workflows/pangolin.yml index 8d297d8..3dc2aea 100644 --- a/.github/workflows/pangolin.yml +++ b/.github/workflows/pangolin.yml @@ -12,14 +12,12 @@ jobs: matrix: os: ["ubuntu-latest"] steps: - - uses: actions/checkout@v2 - - uses: conda-incubator/setup-miniconda@v2 + - uses: actions/checkout@v4 + - uses: conda-incubator/setup-miniconda@v3 with: environment-file: environment.yml activate-environment: pangolin channels: conda-forge,bioconda,defaults - conda-version: "23.5.0" - mamba-version: "*" - name: Install pangolin run: pip install -e . - name: Check pangolin version diff --git a/.github/workflows/pangolin_macos.yml b/.github/workflows/pangolin_macos.yml index d5a1aaf..c719c2c 100644 --- a/.github/workflows/pangolin_macos.yml +++ b/.github/workflows/pangolin_macos.yml @@ -12,14 +12,13 @@ jobs: matrix: os: ["macos-latest"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: conda-incubator/setup-miniconda@v2 with: environment-file: environment.yml activate-environment: pangolin channels: conda-forge,bioconda,defaults - conda-version: "23.5.0" - mamba-version: "*" + miniconda-version: "latest" - name: Install pangolin run: pip install -e . - name: Check pangolin version diff --git a/pangolin/data/data_compatibility.csv b/pangolin/data/data_compatibility.csv index 0d77819..524d300 100644 --- a/pangolin/data/data_compatibility.csv +++ b/pangolin/data/data_compatibility.csv @@ -1,4 +1,6 @@ data_source,version,min_pangolin_version,min_scorpio_version +pangolin-data,1.32,4.3, +pangolin-data,1.31,4.3, pangolin-data,1.30,4.3, pangolin-data,1.29,4.3, pangolin-data,1.28.1,4.3, @@ -29,6 +31,8 @@ pangolin-data,1.6,4, pangolin-data,1.3,4, pangolin-data,1.2.133,4, pangolin-data,1.2.127,4, +pangolin-assignment,1.32,4.3, +pangolin-assignment,1.31,4.3, pangolin-assignment,1.30,4.3, pangolin-assignment,1.29,4.3, pangolin-assignment,1.28.1,4.3,