Merge pull request #22 from angelmadames/master

Update to version 1.1.2: Fix FANN libs search function.
FutureLinkCorporation · Dec 7, 2017 · 5f01fa1 · 5f01fa1
2 parents 471627c + a5297b9
commit 5f01fa1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,11 @@
 CHANGELOG
 =========
 
+1.1.2 - 2017-12-07
+
+  * Fix badly placed return value for nested conditional under FANN libs search function. 
+  * Fixed indentation for raise function under for loop.
+
 1.1.1 - 2017-12-07
 
   * Added '/usr/lib64' directory to FANN libs search function for setup.py.

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 from setuptools import setup, Extension, find_packages
 
 NAME = 'fann2'
-VERSION = '1.1.1'
+VERSION = '1.1.2'
 
 with open("README.rst") as f:
     LONG_DESCRIPTION = f.read()
@@ -63,15 +63,14 @@ def find_fann():
             if os.path.isdir(ver):
                 if find_x(ver):
                     return True
-            return True
         raise Exception("Couldn't find FANN source libs!")
     else:
         dirs = ['/lib', '/usr/lib', '/usr/lib64', '/usr/local/lib', '/usr/pkg/lib']
         for path in dirs:
             if os.path.isdir(path):
                 if find_x(path):
                     return True
-            raise Exception("Couldn't find FANN source libs!")
+        raise Exception("Couldn't find FANN source libs!")
 
 def find_swig():
     '''Find SWIG executable path'''