Merge branch 'hotfix/0.15.2' into develop

ctsit · Mar 17, 2016 · bc4c636 · bc4c636
2 parents 482101b + 7aa3c64
commit bc4c636
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git 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/README.md b/README.md
@@ -1,7 +1,7 @@
 RED-I Project
 =============
 
-<a href="http://dx.doi.org/10.5281/zenodo.17125"><img src="https://zenodo.org/badge/4064/ctsit/redi.svg"><a>
+<a href="https://zenodo.org/badge/latestdoi/4064/ctsit/redi"><img src="https://zenodo.org/badge/4064/ctsit/redi.svg" alt="10.5281/zenodo.47793"><a>
 [![Travis CI](https://api.travis-ci.org/ctsit/redi.svg?branch=master)](https://api.travis-ci.org/ctsit/redi.svg?branch=master)
 [![Version](https://pypip.in/v/redi/badge.png)](https://pypip.in/v/redi/badge.png)
 [![Coverage Status Master](https://coveralls.io/repos/ctsit/redi/badge.svg?branch=master)](https://coveralls.io/r/ctsit/redi?branch=master)

diff --git 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/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

diff --git 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']),