diff --git a/moose-core/.travis/travis_build_linux.sh b/moose-core/.travis/travis_build_linux.sh index 302dd129a703d0eeb221c4153b754f6556693275..cf3399695355795695fe42b8d668b8baa80e2d21 100755 --- a/moose-core/.travis/travis_build_linux.sh +++ b/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 && \ diff --git a/moose-core/VERSION b/moose-core/VERSION index cf525b4c904fb05aac1f5f451638b5549126c3f3..498dab1f0ef5ca79fb07efae9f6df24223b7108e 100644 --- a/moose-core/VERSION +++ b/moose-core/VERSION @@ -1 +1 @@ -3.1.1-126-g0d5fb79 \ No newline at end of file +3.1.1-126-g0d5fb79 diff --git a/moose-core/biophysics/Makefile b/moose-core/biophysics/Makefile index bdd2a109a84b5f517f7c07a01c159ce971d3dce4..6659630cea1751622c725f27a6a9142bf277384f 100644 --- a/moose-core/biophysics/Makefile +++ b/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 \ diff --git a/moose-core/python/moose/chemUtil/graphUtils.py b/moose-core/python/moose/chemUtil/graphUtils.py index 1d9ee1d550d05576191ef141c963359dbeb52c2f..5bf05f54ace749c62ded010dc3c05f11efda52c9 100644 --- a/moose-core/python/moose/chemUtil/graphUtils.py +++ b/moose-core/python/moose/chemUtil/graphUtils.py @@ -1,10 +1,20 @@ 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 """ diff --git a/moose-core/python/moose/moose.py b/moose-core/python/moose/moose.py index cda22e8f7b15c42b27cd0086991260d719c503d9..904d6c32e19f45d0cefe06e07d6f3854ca7699d0 100644 --- a/moose-core/python/moose/moose.py +++ b/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>',