Merge commit 'a5122cfb'

moose-core/.travis/travis_build_linux.sh

@@ -31,7 +31,7 @@ PYTHON3="/usr/bin/python3"
 (
     # Old makefile based flow.
     python2 -m compileall -q .
-    if type python3 -c 'import sys' > /dev/null; then python3 -m compileall -q . ; fi
+    if type $PYTHON3 > /dev/null; then python3 -m compileall -q . ; fi
     # Traditional make.
     make 
     ## CMAKE based flow
@@ -46,7 +46,7 @@ PYTHON3="/usr/bin/python3"
 
     # This is only applicable on linux build.
     echo "Python3 support. Removed python2-networkx and install python3" 
-    if type $PYTHON3 -c 'import os' > /dev/null; then 
+    if type $PYTHON3 > /dev/null; then 
         sudo apt-get remove -qq python-networkx 
         sudo apt-get install -qq python3-networkx
         mkdir -p _GSL_BUILD2 && cd _GSL_BUILD2 && \

moose-core/VERSION

-3.1.1-126-g0d5fb79
+3.1.1-126-g0d5fb79
\ No newline at end of file

moose-core/biophysics/Makefile

@@ -42,7 +42,6 @@ OBJ = \
 	DifShell.o	\
 	DifBufferBase.o	\
 	DifBuffer.o	\
-	MMpump.o \
 	Leakage.o	\
 	VectorTable.o	\
 	MarkovRateTable.o	\
@@ -54,6 +53,7 @@ OBJ = \
 	VClamp.o	\
 
 
+	# MMpump.o  \
 	# LeakyIaF.o	\
 	# GapJunction.o	\
 	# Nernst.o	\

moose-core/python/moose/chemUtil/graphUtils.py

 import moose
-import pygraphviz as pgv
-#import networkx as nx
+
+pygraphvizFound_ = True
+try:
+    import pygraphviz as pgv
+except Exception as e:
+    pygraphvizFound_ = False
 
 def autoCoordinates(meshEntry,srcdesConnection):
+    global pygraphvizFound_ 
     positionInfo = {}
 
+    if not pygraphvizFound_:
+        print( '[warn] python-pygraphviz could not be found.' )
+        print( '\tMOOSE Install pygraphviz to use this feature' )
+        return positionInfo
+
     if meshEntry:
         #G = nx.Graph()
         G = pgv.AGraph()
@@ -67,7 +77,7 @@ def autoCoordinates(meshEntry,srcdesConnection):
             ann.x = float(valuelist[0])
             ann.y = float(valuelist[1])
 
-    return(positionInfo)
+    return positionInfo
 
 def find_index(value, key):
     """ Value.get(key) to avoid expection which would raise if empty value in dictionary for a given key """

moose-core/python/moose/moose.py

@@ -33,7 +33,13 @@ except Exception as e:
     print('\tError was %s' % e)
     genesisSupport_ = False
 
-import chemUtil.add_Delete_ChemicalSolver
+chemUtilSupport_ = True
+try:
+    import chemUtil.add_Delete_ChemicalSolver
+except Exception as e:
+    chemUtilSupport_ = False
+    print( 'Failed to import utility module chemUtil' )
+    print( '\tError was %s' % e )
 
 sequence_types = ['vector<double>',
                   'vector<int>',