NMODL PYTHONPATH fixes (#333)

* Fix PYTHONPATH for new NMODL pythonpath
* Added sympy --analytic flag on NMODL build on the CI

Author: iomaganaris

.travis.yml

@@ -32,7 +32,6 @@ matrix:
     - os: linux
       dist: xenial
       env:
-        - cmake_option="-DCORENRN_ENABLE_NMODL=ON"
         - PYTHON_VERSION=3.6.7  # for nmodl pip3 install
         - USE_NMODL=ON
     - os: osx
@@ -54,7 +53,6 @@ matrix:
     - os: osx
       osx_image: xcode10.2
       env:
-        - cmake_option="-DCORENRN_ENABLE_NMODL=ON"
         - USE_NMODL=ON
     - os: linux
       dist: xenial
@@ -119,7 +117,7 @@ before_install:
     fi
   # install NMODL dependencies
   - if [[ "$USE_NMODL" == "ON" || "$USE_ISPC" == "ON" ]]; then
-        pip3 install jinja2 pyyaml pytest sympy;
+        pip3 install jinja2 pyyaml pytest "sympy<1.6";
     fi
   - if [ -n "$GCC_VERSION" ]; then
         export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}";
@@ -148,6 +146,9 @@ script:
   - if [[ "$USE_ISPC" == "ON" ]]; then
         cmake -DCORENRN_ENABLE_ISPC=ON -DCMAKE_ISPC_COMPILER=../ispc/bin/ispc
               -DCMAKE_INSTALL_PREFIX=$HOME/CoreNeuron -DPYTHON_EXECUTABLE=$(which python3) ..;
+    elif [[ "$USE_NMODL" == "ON" ]]; then
+        cmake -DCORENRN_ENABLE_NMODL=ON -DCORENRN_NMODL_FLAGS="sympy --analytic"
+              -DCMAKE_INSTALL_PREFIX=$HOME/CoreNeuron -DPYTHON_EXECUTABLE=$(which python3) ..;
     else
         cmake ${cmake_option} -DCMAKE_INSTALL_PREFIX=$HOME/CoreNeuron -DPYTHON_EXECUTABLE=$(which python3) ..;
     fi

coreneuron/CMakeLists.txt

@@ -59,7 +59,7 @@ include(NmodlHelper)
 # Command for MOD to CPP conversion
 # =============================================================================
 set(CORENRN_NMODL_COMMAND env "MODLUNIT=${NMODL_UNITS_FILE}"
-                              "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_BINARY_DIR}/lib/python"
+                              "PYTHONPATH=${CORENRN_NMODL_PYTHONPATH}"
                               ${CORENRN_NMODL_BINARY})
 
 if(${CORENRN_ENABLE_ISPC})