mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Merge pull request #10225 from mvdbeek/decrease_pysam_verbository
[20.05] Decrease pysam verbosity
This commit is contained in:
@@ -33,6 +33,9 @@ from galaxy.util.checkers import is_bz2, is_gzip
|
||||
from . import data, dataproviders
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
# pysam 0.16.0.1 emits logs containing the word 'Error', this can confuse the stdout/stderr checkers.
|
||||
# Can be be removed once https://github.com/pysam-developers/pysam/issues/939 is resolved.
|
||||
pysam.set_verbosity(0)
|
||||
|
||||
# Currently these supported binary data types must be manually set on upload
|
||||
|
||||
@@ -489,9 +492,9 @@ class Bam(BamNative):
|
||||
# we start another process and discard stderr.
|
||||
if index_flag == '-b':
|
||||
# IOError: No such file or directory: '-b' if index_flag is set to -b (pysam 0.15.4)
|
||||
cmd = ['python', '-c', "import pysam; pysam.index('%s', '%s')" % (file_name, index_name)]
|
||||
cmd = ['python', '-c', "import pysam; pysam.set_verbosity(0); pysam.index('{}', '{}')".format(file_name, index_name)]
|
||||
else:
|
||||
cmd = ['python', '-c', "import pysam; pysam.index('%s', '%s', '%s')" % (index_flag, file_name, index_name)]
|
||||
cmd = ['python', '-c', "import pysam; pysam.set_verbosity(0); pysam.index('{}', '{}', '{}')".format(index_flag, file_name, index_name)]
|
||||
with open(os.devnull, 'w') as devnull:
|
||||
subprocess.check_call(cmd, stderr=devnull, shell=False)
|
||||
needs_sorting = False
|
||||
|
||||
@@ -27,6 +27,9 @@ from galaxy.visualization.data_providers.cigar import get_ref_based_read_seq_and
|
||||
# Utility functions.
|
||||
#
|
||||
|
||||
# pysam 0.16.0.1 emits logs containing the word 'Error', this can confuse the stdout/stderr checkers.
|
||||
# Can be be removed once https://github.com/pysam-developers/pysam/issues/939 is resolved.
|
||||
pysam.set_verbosity(0)
|
||||
PYSAM_INDEX_SYMLINK_NECESSARY = packaging.version.parse(pysam.__version__) <= packaging.version.parse('0.13.0')
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user