Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add try/except around extraction to accommodate failing uncompression in pyani download #385

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+42 −5
Open

Add try/except around extraction to accommodate failing uncompression in pyani download #385

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
99ec32d
Add `try/except` around extraction to prevent `pyani` falling over
baileythegreen Mar 14, 2022
78df70b
Add test for failed extraction exception handling
baileythegreen Mar 29, 2022
98f71ac
Create and use new `PyaniDownloadException` to warn of extraction fai…
baileythegreen Mar 30, 2022
65f90b3
Rewrite and simplify test for failed archive extraction
baileythegreen Mar 30, 2022
76bf22c
Move output file location to `fixtures`, which is tracked
baileythegreen Mar 30, 2022
48119e4
Merge branch 'master' of https://github.com/widdowquinn/pyani into is…
baileythegreen Jun 21, 2022
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
20 changes: 17 additions & 3 deletions pyani/scripts/subcommands/subcmd_download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"""Provides the download subcommand for pyani."""

import logging
import subprocess

from argparse import Namespace
from typing import Dict, List, NamedTuple, Optional, Tuple
Expand Down Expand Up @@ -98,7 +99,9 @@ def dl_info_to_str(esummary, uid_class) -> str:


def download_data(
args: Namespace, api_key: Optional[str], asm_dict: Dict[str, List],
args: Namespace,
api_key: Optional[str],
asm_dict: Dict[str, List],
) -> Tuple[List, List, List]:
"""Download the accessions indicated in the passed dictionary.

Expand Down Expand Up @@ -131,7 +134,14 @@ def download_data(
exc_info=True,
)
skippedlist.append(
Skipped(tid, uid, "", "", None, "RefSeq",)
Skipped(
baileythegreen marked this conversation as resolved.
Show resolved Hide resolved
tid,
uid,
"",
"",
None,
"RefSeq",
)
) # pylint: disable=no-member
continue

Expand Down Expand Up @@ -182,7 +192,11 @@ def extract_genomes(args: Namespace, dlstatus: download.DLStatus, esummary) -> N
logger.warning("Output file %s exists, not extracting", ename)
else:
logger.debug("Extracting archive %s to %s", dlstatus.outfname, ename)
download.extract_contigs(dlstatus.outfname, ename)
try:
download.extract_contigs(dlstatus.outfname, ename)
except subprocess.CalledProcessError:
logger.warning("Could not extract %s; continuing", dlstatus.outfname)
pass

# Modify sequence ID header if Kraken option active
if args.kraken:
Expand Down