Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/hotfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
susannasiebert committed Jul 18, 2019
2 parents 8375a13 + ac85e30 commit d174e33
Show file tree
Hide file tree
Showing 12 changed files with 3,068 additions and 150 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
# The short X.Y version.
version = '1.4'
# The full version, including alpha/beta/rc tags.
release = '1.4.2'
release = '1.4.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
10 changes: 8 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,14 @@ New in release |release|

This is a hotfix release. It fixes the following issues:

- This releases fixes a concurrency issue with pVACapi/pVACviz that would occurr when
users would try to visualize multiple files at the same time
- IEDB will output a warning if an epitope contains only amino acid symbols
that could also be nucleotides. This would cause an error during parsing of
the IEDB output files. This version updates the parser to ignore these
warnings.
- We added some improvements to pVACapi regarding database file read
speeds and transaction handling. This version also starts enforcing a file
size limit (14MB) for result files. Larger files will no longer be
visualizable in pVACviz since they take too long to load.

New in version |version|
------------------------
Expand Down
14 changes: 14 additions & 0 deletions docs/releases/1_4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,17 @@ This is a hotfix release. It fixes the following issues:

- This releases fixes a concurrency issue with pVACapi/pVACviz that would occurr when
users would try to visualize multiple files at the same time.

1.4.3
-----

This is a hotfix release. It fixes the following issues:

- IEDB will output a warning if an epitope contains only amino acid symbols
that could also be nucleotides. This would cause an error during parsing of
the IEDB output files. This version updates the parser to ignore these
warnings.
- We added some improvements to pVACapi regarding database file read
speeds and transaction handling. This version also starts enforcing a file
size limit (14MB) for result files. Larger files will no longer be
visualizable in pVACviz since they take too long to load.
2 changes: 2 additions & 0 deletions lib/output_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,8 @@ def parse_iedb_file(self, tsv_entries):
iedb_tsv_reader = csv.DictReader(reader, delimiter='\t')
(sample, method, remainder) = os.path.basename(input_iedb_file).split(".", 2)
for line in iedb_tsv_reader:
if "Warning: Potential DNA sequence(s)" in line['allele']:
continue
protein_label = int(line['seq_num'])
if 'core_peptide' in line and int(line['end']) - int(line['start']) == 8:
#Start and end refer to the position of the core peptide
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

setup(
name="pvactools",
version="1.4.2",
version="1.4.3",
packages=[
"tools",
"tools.pvacfuse",
Expand All @@ -80,7 +80,7 @@
install_requires=[
'PyVCF',
'requests',
'PyYAML',
'PyYAML>=5.1',
'connexion==1.4.2',
'biopython',
'networkx',
Expand Down
5 changes: 5 additions & 0 deletions tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -1172,6 +1172,11 @@ def check_res(result):

self.assertTrue(check_res(filtered_results))

def test_max_file_size(self):
with unittest.mock.patch('os.path.getsize', return_value=14*1024*1024):
from utils.pvacapi.controllers.utils import file_not_max
self.assertFalse(file_not_max('arbitrary/file/path'))

#pagination temporarily put on hold.
"""
def test_pagination(self):
Expand Down
Loading

0 comments on commit d174e33

Please sign in to comment.