From 4996bfe9cf03639e51b3daff63d8668a343e96eb Mon Sep 17 00:00:00 2001 From: Matthew Wakefield Date: Fri, 5 Jul 2019 12:50:42 +1000 Subject: [PATCH] 1.0.2 update version and test hashes update version number and test hashes that include version number written to output file. --- .travis.yml | 1 - setup.py | 4 +++- xenomapper/mappability.py | 4 ++-- xenomapper/tests/test_all.py | 6 +++--- xenomapper/tests/test_mappability.py | 4 ++-- xenomapper/tests/test_xenomapper.py | 10 +++++----- xenomapper/xenomapper.py | 4 ++-- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index fafdae9..ad5ae8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python matrix: include: - - python: "3.3" - python: "3.4" - python: "3.5" - python: "3.6" diff --git a/setup.py b/setup.py index b77dba3..a9abe65 100755 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name='XenoMapper', - version='1.0.1', + version='1.0.2', author='Matthew Wakefield', author_email='matthew.wakefield@unimelb.edu.au', packages=['xenomapper'], @@ -36,6 +36,8 @@ 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Intended Audience :: Science/Research', diff --git a/xenomapper/mappability.py b/xenomapper/mappability.py index fcf2fe0..96b8efc 100755 --- a/xenomapper/mappability.py +++ b/xenomapper/mappability.py @@ -26,10 +26,10 @@ from xenomapper.xenomapper import get_sam_header __author__ = "Matthew Wakefield" -__copyright__ = "Copyright 2011-2016 Matthew Wakefield, The Walter and Eliza Hall Institute and The University of Melbourne" +__copyright__ = "Copyright 2011-2019 Matthew Wakefield, The Walter and Eliza Hall Institute and The University of Melbourne" __credits__ = ["Matthew Wakefield",] __license__ = "GPLv3" -__version__ = "1.0.1" +__version__ = "1.0.2" __maintainer__ = "Matthew Wakefield" __email__ = "wakefield@wehi.edu.au" __status__ = "Development" diff --git a/xenomapper/tests/test_all.py b/xenomapper/tests/test_all.py index 87ff912..9d95e62 100755 --- a/xenomapper/tests/test_all.py +++ b/xenomapper/tests/test_all.py @@ -4,7 +4,7 @@ test_xenomapper.py Created by Matthew Wakefield on 2012-08-16. -Copyright (c) 2011-2016 Matthew Wakefield, The Walter and Eliza Hall Institute and The University of Melbourne. All rights reserved. +Copyright (c) 2011-2019 Matthew Wakefield, The Walter and Eliza Hall Institute and The University of Melbourne. All rights reserved. """ import unittest @@ -12,10 +12,10 @@ from xenomapper.tests.test_mappability import * __author__ = "Matthew Wakefield" -__copyright__ = "Copyright 2011-2016 Matthew Wakefield, The Walter and Eliza Hall Institute and The University of Melbourne" +__copyright__ = "Copyright 2011-2019 Matthew Wakefield, The Walter and Eliza Hall Institute and The University of Melbourne" __credits__ = ["Matthew Wakefield",] __license__ = "GPLv3" -__version__ = "1.0.1" +__version__ = "1.0.2" __maintainer__ = "Matthew Wakefield" __email__ = "wakefield@wehi.edu.au" __status__ = "Release/Stable" diff --git a/xenomapper/tests/test_mappability.py b/xenomapper/tests/test_mappability.py index cfc0eaa..b5a961e 100755 --- a/xenomapper/tests/test_mappability.py +++ b/xenomapper/tests/test_mappability.py @@ -16,10 +16,10 @@ __author__ = "Matthew Wakefield" -__copyright__ = "Copyright 2011-2016 Matthew Wakefield, The Walter and Eliza Hall Institute and The University of Melbourne" +__copyright__ = "Copyright 2011-2019 Matthew Wakefield, The Walter and Eliza Hall Institute and The University of Melbourne" __credits__ = ["Matthew Wakefield",] __license__ = "GPLv3" -__version__ = "1.0.1" +__version__ = "1.0.2" __maintainer__ = "Matthew Wakefield" __email__ = "wakefield@wehi.edu.au" __status__ = "Development/Beta" diff --git a/xenomapper/tests/test_xenomapper.py b/xenomapper/tests/test_xenomapper.py index 88a53c0..9be7112 100755 --- a/xenomapper/tests/test_xenomapper.py +++ b/xenomapper/tests/test_xenomapper.py @@ -14,10 +14,10 @@ from pkg_resources import resource_stream __author__ = "Matthew Wakefield" -__copyright__ = "Copyright 2011-2016 Matthew Wakefield, The Walter and Eliza Hall Institute and The University of Melbourne" +__copyright__ = "Copyright 2011-2019 Matthew Wakefield, The Walter and Eliza Hall Institute and The University of Melbourne" __credits__ = ["Matthew Wakefield",] __license__ = "GPLv3" -__version__ = "1.0.1" +__version__ = "1.0.2" __maintainer__ = "Matthew Wakefield" __email__ = "wakefield@wehi.edu.au" __status__ = "Production/Stable" @@ -90,7 +90,7 @@ def test_consistent_output_SE(self): len(test_unassigned_outfile.getvalue().split('\n'))-4) #26 lines of header in this file self.assertEqual(cat_counts['unassigned'], len(test_unassigned_outfile.getvalue().split('\n'))-4) #26 lines of header in this file - self.assertEqual(hashlib.sha224(test_primary_specific_outfile.getvalue().encode('latin-1')).hexdigest(),'24107f7addcbfde7180e57965734e0e99481286f3b99e97d815613fb') + self.assertEqual(hashlib.sha224(test_primary_specific_outfile.getvalue().encode('latin-1')).hexdigest(),'381325b12dd9a9cd3afdd72eeb16b23cc92ddd16f675bb21bb21e08e') sam1.close() sam2.close() pass @@ -122,7 +122,7 @@ def test_consistent_output_PE(self): self.assertEqual(sum([cat_counts[x] for x in cat_counts if 'secondary_multi' in x \ and not 'primary_multi' in x and not 'primary_specific' in x and not 'secondary_specific' in x])*2, len(test_secondary_multi_outfile.getvalue().split('\n'))-1) - self.assertEqual(hashlib.sha224(test_primary_specific_outfile.getvalue().encode('latin-1')).hexdigest(),'85b2499215d91e8ef8115e81bbe745c6095772340bdd548a2bbc7d09') + self.assertEqual(hashlib.sha224(test_primary_specific_outfile.getvalue().encode('latin-1')).hexdigest(),'64c0e24bf141c5aa3bb0993c73b34cdfe630a504ac424843f746918d') sam1.close() sam2.close() pass @@ -155,7 +155,7 @@ def test_consistent_output_conservative_PE(self): len(test_secondary_specific_outfile.getvalue().split('\n'))-27) #26 lines of header in this file self.assertEqual(cat_counts[('unassigned', 'unassigned')]*2, len(test_unassigned_outfile.getvalue().split('\n'))-1) - self.assertEqual(hashlib.sha224(test_primary_specific_outfile.getvalue().encode('latin-1')).hexdigest(),'5c201ba8ef87f20a11d14fbdbf091c2d7c45267707227122c77ffd26') + self.assertEqual(hashlib.sha224(test_primary_specific_outfile.getvalue().encode('latin-1')).hexdigest(),'c4de3de755092c8f9ff1eb2cd360a502d74ebd4c1e65ed282515ed3e') sam1.close() sam2.close() pass diff --git a/xenomapper/xenomapper.py b/xenomapper/xenomapper.py index 26579ce..9f38f5e 100755 --- a/xenomapper/xenomapper.py +++ b/xenomapper/xenomapper.py @@ -25,10 +25,10 @@ from copy import copy __author__ = "Matthew Wakefield" -__copyright__ = "Copyright 2011-2016 Matthew Wakefield, The Walter and Eliza Hall Institute and The University of Melbourne" +__copyright__ = "Copyright 2011-2019 Matthew Wakefield, The Walter and Eliza Hall Institute and The University of Melbourne" __credits__ = ["Matthew Wakefield",] __license__ = "GPL" -__version__ = "1.0.1" +__version__ = "1.0.2" __maintainer__ = "Matthew Wakefield" __email__ = "wakefield@wehi.edu.au" __status__ = "Production/Stable"