Skip to content

Commit

Permalink
Merge pull request #3 from ECRL/dev
Browse files Browse the repository at this point in the history
Bug fix
  • Loading branch information
tjkessler authored Jun 10, 2019
2 parents 7b9d8fb + 7417b85 commit ccb694f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion padelpy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from padelpy.wrapper import padeldescriptor
from padelpy.functions import from_mdl, from_smiles
__version__ = '0.1.4'
__version__ = '0.1.5'
4 changes: 3 additions & 1 deletion padelpy/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
# padelpy/functions.py
# v.0.1.4
# v.0.1.5
# Developed in 2019 by Travis Kessler <[email protected]>
#
# Contains various functions commonly used with PaDEL-Descriptor
Expand Down Expand Up @@ -57,6 +57,7 @@ def from_smiles(smiles: str, output_csv: str=None, descriptors: bool=True,
fingerprints=fingerprints,
maxruntime=1000*timeout
)
break
except RuntimeError as exception:
if attempt == 2:
remove('{}.smi'.format(timestamp))
Expand Down Expand Up @@ -122,6 +123,7 @@ def from_mdl(mdl_file: str, output_csv: str=None, descriptors: bool=True,
fingerprints=fingerprints,
maxruntime=1000*timeout
)
break
except RuntimeError as exception:
if attempt == 2:
if not save_csv:
Expand Down
2 changes: 1 addition & 1 deletion padelpy/wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
# padelpy/wrapper.py
# v.0.1.4
# v.0.1.5
# Developed in 2019 by Travis Kessler <[email protected]>
#
# Contains the `padeldescriptor` function, a wrapper for PaDEL-Descriptor
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='padelpy',
version='0.1.4',
version='0.1.5',
description='A Python wrapper for PaDEL-Descriptor',
url='https://github.com/ecrl/padelpy',
author='Travis Kessler',
Expand Down

0 comments on commit ccb694f

Please sign in to comment.