Skip to content

Commit

Permalink
Add entries for pangolin-data/-assignment, update workflows (#553)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
AngieHinrichs authored Jan 27, 2025
1 parent ed2a797 commit a7d6180
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/pangolin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/pangolin_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions pangolin/data/data_compatibility.csv
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit a7d6180

Please sign in to comment.