1.7.x (#1001)

* condense layers and reduce size of docker image

* fix version stuff

Dockerfile

@@ -11,13 +11,21 @@ ENV CXX mpicxx
 ENV F77 mpif77
 ENV F90 mpif90
 
-RUN cd proteus && git checkout 1.7.x && git pull && make N=4 develop
-RUN cd proteus && CC=gcc CXX=g++ ./linux/bin/pip install matplotlib
+RUN rm -rf proteus && \
+    git clone https://github.com/erdc/proteus && \
+    cd proteus && \
+    git checkout master && \
+    make N=4 develop && \
+    CC=gcc CXX=g++ ./linux/bin/pip3 install matplotlib && \
+    PATH=/home/$NB_USER/proteus/linux/bin:$PATH make jupyter && \
+    CC=gcc CXX=g++ PATH=/home/$NB_USER/proteus/linux/bin:$PATH ./linux/bin/pip3 install jupyterhub && \
+    rm -rf build && \
+    rm -rf air-water-vv && \
+    rm -rf .git && \
+    rm -rf stack/.git && \
+    rm -rf /home/$NB_USER/.cache 
 
 ENV PATH /home/$NB_USER/proteus/linux/bin:$PATH
-
-RUN cd proteus && PATH=/usr/bin:/usr/local/bin:$PATH make jupyter
-
 ENV LD_LIBRARY_PATH /home/$NB_USER/proteus/linux/lib:$LD_LIBRARY_PATH
 
 USER root

proteus/iproteus.py

@@ -22,7 +22,7 @@
 import proteus
 
 #remove blanket import statements until after Comm initialized for petsc4py
-from proteus import Profiling, Comm, version
+from proteus import Profiling, Comm
 from warnings import *
 import optparse
 import sys
@@ -224,8 +224,6 @@ def load_macros(filename,verbose=False):
     logDir = opts.dataDir
 
 log("Initializing Proteus")
-log("Stack Version: {0}".format(version.stack))
-log("Proteus Version: {0}".format(version.proteus))
 
 log("Initializing MPI")
 if opts.petscOptions is not None:

scripts/parun

@@ -21,7 +21,7 @@ import os
 import proteus
 
 #remove blanket import statements until after Comm initialized for petsc4py
-from proteus import Profiling, Comm, version, Context
+from proteus import Profiling, Comm, Context
 from warnings import *
 import optparse
 import sys
@@ -239,8 +239,6 @@ if opts.debug:
 log = Profiling.logEvent
 
 log("Initializing Proteus")
-log("Stack Commit: {0}".format(version.stack),0)
-log("Proteus Commit: {0}".format(version.proteus),0)
 
 log("Initializing MPI")
 if opts.petscOptions != None: