Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:

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

steps:
- uses: "actions/checkout@v3"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v3
with:
python-version: 3.9
python-version: 3.12
activate-environment: plassembler
environment-file: build/environment.yaml
auto-activate-base: false
channels: conda-forge,bioconda,defaults
channel-priority: strict
auto-update-conda: true
auto-update-conda: true

- name: Install plassembler
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "plassembler"
version = "1.8.1" # change VERSION too
version = "1.8.2" # change VERSION too
description = "Quickly and accurately assemble plasmids in hybrid sequenced bacterial isolates"
authors = ["George Bouras <george.bouras@adelaide.edu.au>"]
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion src/plassembler/utils/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.8.1
1.8.2
11 changes: 10 additions & 1 deletion src/plassembler/utils/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from loguru import logger

from plassembler.utils.cleanup import remove_directory
from plassembler.utils.util import get_version


def check_db_installation(db_dir: Path, force: bool, install_flag: bool):
Expand Down Expand Up @@ -75,8 +76,16 @@ def get_database_zenodo(db_dir: Path):
db_url = "https://zenodo.org/record/10158040/files/201123_plassembler_v1.5.0_databases.tar.gz"
requiredmd5 = "3a24bacc05bb857dc044fc6662b58db7"

version = get_version().strip()

headers = {
"User-Agent": f"plassembler/{version} (contact: george.bouras@adelaide.edu.au)"
}

try:
with tar_path.open("wb") as fh_out, requests.get(db_url, stream=True) as resp:
with tar_path.open("wb") as fh_out, requests.get(
db_url, stream=True, headers=headers
) as resp:
total_length = resp.headers.get("content-length")
if total_length is not None: # content length header is set
total_length = int(total_length)
Expand Down
4 changes: 2 additions & 2 deletions src/plassembler/utils/run_canu.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def run_canu_correct(
tool="canu -correct",
input="",
output="",
params=f" -p canu -d {canu_output_dir} genomeSize={total_flye_plasmid_length}m maxInputCoverage={coverage} stopOnLowCoverage=1 maxThreads={threads} -{canu_nano_or_pacbio} correctedErrorRate={corrected_error_rate} {longreads}",
params=f" -p canu -d {canu_output_dir} genomeSize={total_flye_plasmid_length}m maxInputCoverage={coverage} stopOnLowCoverage=1 maxThreads={threads} useGrid=false -{canu_nano_or_pacbio} correctedErrorRate={corrected_error_rate} {longreads}",
logdir=logdir,
outfile="",
)
Expand Down Expand Up @@ -69,7 +69,7 @@ def run_canu(
tool="canu",
input="",
output="",
params=f" -p canu -d {canu_output_dir} genomeSize={total_flye_plasmid_length}m maxInputCoverage={coverage} stopOnLowCoverage=1 maxThreads={threads} -{canu_nano_or_pacbio} correctedErrorRate={corrected_error_rate} {longreads}",
params=f" -p canu -d {canu_output_dir} genomeSize={total_flye_plasmid_length}m maxInputCoverage={coverage} stopOnLowCoverage=1 maxThreads={threads} useGrid=false -{canu_nano_or_pacbio} correctedErrorRate={corrected_error_rate} {longreads}",
logdir=logdir,
outfile="",
)
Expand Down