From 4e2ddeed862bb2311e4aa02da0c7101b4da973bb Mon Sep 17 00:00:00 2001 From: Nicholas Rejack Date: Thu, 17 Mar 2016 16:57:14 -0400 Subject: [PATCH 1/2] Fixing check for input file in redi.py. Now log the file's location only if it's there. --- redi/redi.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/redi/redi.py b/redi/redi.py index e67cbe1..fae159a 100755 --- a/redi/redi.py +++ b/redi/redi.py @@ -179,11 +179,10 @@ def main(): # print input_file_path # sys.exit(0) - # say something nice to the people. - logger.info("Using file passed in via -f switch. File name: " + input_file_path) - # check to see if a file was passed in - if (input_file_path != ""): + if (input_file_path != None): + # say something nice to the people. + logger.info("Using file passed in via -f switch. File name: " + input_file_path) # check to make sure its a file if os.path.isfile(input_file_path): #check to see if you can read it From 7aa3c64998fe0d222619968d72fd855be7d5b5db Mon Sep 17 00:00:00 2001 From: Nicholas Rejack Date: Thu, 17 Mar 2016 16:59:11 -0400 Subject: [PATCH 2/2] Bumping version numbers for hotfix 0.15.2 --- CHANGELOG | 7 +++++++ docs/conf.py | 4 ++-- setup.py | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2015adf..3c20d2e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +2016-03-17 v0.15.2 + + * Summary: Hotfix to fix logging behavior when input file is not present. + +* Fixing check for input file in redi.py. Now log the file's location only if it's there. (Nicholas Rejack) +* Update README.md (Nicholas Rejack) + 2016-03-17 v0.15.1 * Summary: RED-I now accepts a file as input from the command line, using -f FILENAME. diff --git a/docs/conf.py b/docs/conf.py index 28498f7..e85117a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -61,9 +61,9 @@ # built documents. # # The short X.Y version. -version = '0.15.1' +version = '0.15.2' # The full version, including alpha/beta/rc tags. -release = '0.15.1' +release = '0.15.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index b07a3e7..5cf0154 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name='redi', - version='0.15.1', + version='0.15.2', author='https://www.ctsi.ufl.edu/research/study-development/informatics-consulting/', author_email='ctsit@ctsi.ufl.edu', packages=find_packages(exclude=['test']),