Skip to content

Commit 4d7d93d

Browse files
authored
Merge branch 'main' into pr-65
2 parents 50bf19a + 7e4aa88 commit 4d7d93d

8 files changed

Lines changed: 906 additions & 75 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
os: [macos-latest, ubuntu-latest]
16+
os: [macos-13, ubuntu-latest] #macos-latest/macos-14 is M1 - some deps fail it due to not having M1 build (MMSeqs2)
1717
python-version: ["3.8", "3.9"]
1818

1919
steps:
@@ -22,7 +22,7 @@ jobs:
2222
fetch-depth: 0
2323

2424
# Setup env
25-
- uses: conda-incubator/setup-miniconda@v3
25+
- uses: "conda-incubator/setup-miniconda@v3"
2626
with:
2727
activate-environment: plassembler
2828
environment-file: build/environment.yaml
@@ -31,10 +31,11 @@ jobs:
3131
channels: conda-forge,bioconda,defaults
3232
channel-priority: strict
3333
auto-update-conda: true
34-
- name: Install project
34+
35+
- name: Install plassembler
3536
shell: bash -l {0}
3637
run: |
37-
mamba install python=${{ matrix.python-version }}
38+
conda install python=${{ matrix.python-version }}
3839
python -m pip install --upgrade pip
3940
pip install -e .
4041
pip install black

.github/workflows/release.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ jobs:
2121
channels: conda-forge,bioconda,defaults
2222
channel-priority: strict
2323
auto-update-conda: true
24-
- name: Install project
24+
25+
- name: Install plassembler
2526
shell: bash -l {0}
2627
run: |
2728
python -m pip install -U pip

0 commit comments

Comments
 (0)