diff --git a/doc/conf.py b/doc/conf.py index fdd19ad..c67b629 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -57,7 +57,7 @@ version = '2.0' # The full version, including alpha/beta/rc tags. # Do not forget to update PyPi (setup.py) version -release = '2.0.4' +release = '2.0.5' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/isocor/__init__.py b/isocor/__init__.py index fe2e5f1..8be18f4 100644 --- a/isocor/__init__.py +++ b/isocor/__init__.py @@ -4,7 +4,7 @@ for conveniance. """ -__version__ = '2.0.4' +__version__ = '2.0.5' from isocor.mscorrectors import MetaboliteCorrectorFactory from isocor.mscorrectors import LowResMetaboliteCorrector, HighResMetaboliteCorrector diff --git a/isocor/ui/isocordb.py b/isocor/ui/isocordb.py index 5b0652c..a6909af 100644 --- a/isocor/ui/isocordb.py +++ b/isocor/ui/isocordb.py @@ -60,7 +60,7 @@ def registerIsopotes(self, isotopesfile=Path("Isotopes.dat")): if not isotopesfile.is_file(): raise ValueError( "Isotopes database not found in:\n'{}'.".format(isotopesfile)) - with open(str(isotopesfile), 'r') as fp: + with open(str(isotopesfile), 'r') as fp: # str for compatibility with Python3.5 self.dfIsotopes = pd.read_csv(fp) for i in ['element', 'mass', 'abundance']: if i not in self.dfIsotopes.columns: @@ -116,7 +116,7 @@ def registerMetabolitesDB(self, metabolitesfile=Path("Metabolites.dat")): def registerDatafile(self, datafile=Path("mydata.tsv")): if not Path(datafile).is_file(): raise ValueError("No data file selected.") - with open(datafile, 'r') as fp: + with open(str(datafile), 'r') as fp: self.dfDatafile = pd.read_csv(fp, delimiter='\t') for i in ['sample', 'metabolite', 'derivative', 'area', 'isotopologue']: if i not in self.dfDatafile.columns: diff --git a/setup.py b/setup.py index 24532ec..dbe4b34 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setuptools.setup( name="IsoCor", - version="2.0.4", + version="2.0.5", author="Pierre Millard, Baudoin Delépine, Matthieu Guionnet", author_email="millard@insa-toulouse.fr", description="IsoCor: Isotope Correction for mass spectrometry labeling experiments",