Skip to content

Commit 7e4aa88

Browse files
authored
Merge pull request #63 from gbouras13/dev
Fix #60 implement #61
2 parents 8f72574 + 7be742f commit 7e4aa88

10 files changed

Lines changed: 910 additions & 81 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 5 additions & 5 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,20 +22,20 @@ jobs:
2222
fetch-depth: 0
2323

2424
# Setup env
25-
- uses: conda-incubator/setup-miniconda@v2
25+
- uses: "conda-incubator/setup-miniconda@v3"
2626
with:
2727
activate-environment: plassembler
2828
environment-file: build/environment.yaml
2929
python-version: ${{ matrix.python-version }}
3030
auto-activate-base: false
31-
miniforge-variant: Mambaforge
3231
channels: conda-forge,bioconda,defaults
3332
channel-priority: strict
3433
auto-update-conda: true
35-
- name: Install project
34+
35+
- name: Install plassembler
3636
shell: bash -l {0}
3737
run: |
38-
mamba install python=${{ matrix.python-version }}
38+
conda install python=${{ matrix.python-version }}
3939
python -m pip install --upgrade pip
4040
pip install -e .
4141
pip install black

.github/workflows/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v2
15-
- uses: conda-incubator/setup-miniconda@v2
14+
- uses: actions/checkout@v3
15+
- uses: conda-incubator/setup-miniconda@v3
1616
with:
1717
python-version: 3.9
1818
activate-environment: plassembler
1919
environment-file: build/environment.yaml
2020
auto-activate-base: false
21-
miniforge-variant: Mambaforge
2221
channels: conda-forge,bioconda,defaults
2322
channel-priority: strict
2423
auto-update-conda: true
25-
- name: Install project
24+
25+
- name: Install plassembler
2626
shell: bash -l {0}
2727
run: |
2828
python -m pip install -U pip

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "plassembler"
3-
version = "1.6.2" # change VERSION too
3+
version = "1.7.0" # change VERSION too
44
description = "Quickly and accurately assemble plasmids in hybrid sequenced bacterial isolates"
55
authors = ["George Bouras <george.bouras@adelaide.edu.au>"]
66
license = "MIT"

0 commit comments

Comments
 (0)