old command line executing and new module based executing are working

fine with python2 and python3 locally.

Author: Dilawar Singh

__main__.py

@@ -10,13 +10,13 @@
 __email__            = "dilawars@ncbs.res.in"
 __status__           = "Development"
 
-from FindSim import findSim
-from FindSim import runAllParallel
 
 def run():
+    from FindSim import findSim
     findSim.main()
 
 def run_parallel():
+    from FindSim import runAllParallel
     runAllParallel.main()
 
 if __name__ == '__main__':

requirements.txt

@@ -1,3 +1,6 @@
 numpy
 matplotlib
 networkx
+pymoose
+mpld3
+scipy

runAllParallel.py

@@ -35,8 +35,8 @@
 directory, computes their scores, and prints out basic stats of the scores.
 It can do this in parallel using Python's multiprocessing library.
 '''
+from __future__ import print_function, division
 
-from __future__ import print_function, division, absolute_import
 import numpy
 import argparse
 import os
@@ -45,13 +45,16 @@
 import time
 from multiprocessing import Pool
 
-# Python's pain (import and scripts). See  https://stackoverflow.com/a/49480246/1805129
+# Python 2/3 pain (import and scripts). See  https://stackoverflow.com/a/49480246/1805129
 # This 'hack' is here to make sure that `python runAllParallel.py` also works
 # and described in old documents. 
-if __package__ is None or __package__ == '':
-    import findSim
+if sys.version_info.major > 2:
+    if __package__ is None or __package__ == '':
+        import findSim
+    else:
+        from FindSim import findSim
 else:
-    from FindSim import findSim
+    import findSim
 
 resultCount = 0
 def reportReturn( result ):

test.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 set -e 
+set -x
 
 # virtualenv does not require --user
 PYTHON=$(which python)
@@ -14,7 +15,7 @@ if [ "$PYTHON_VERSION" -eq "27" ]; then
 else
     # $PYTHON -m pip uninstall matplotlib -y || echo "Failed to remove matplotlib"
     $PYTHON -m pip install matplotlib --upgrade 
-    $PYTHON -m pip install --upgrade 
+    $PYTHON -m pip install scipy --upgrade 
 fi
 
 # travis.yml should install FindSim