From b7b8ac59f99c3d9ac4de3c84dc19644be479484b Mon Sep 17 00:00:00 2001
From: Chris Kees <cekees@gmail.com>
Date: Sun, 24 Sep 2017 21:15:20 -0500
Subject: [PATCH] Rc1.4.0 (#607)

* modified version

* sphinx doc fixes (some circular imports and string formatting)
---
 doc/source/_templates/layout.html | 3 ++-
 proteus/Isosurface.pyx            | 3 ---
 proteus/MeshTools.py              | 6 +-----
 proteus/NonlinearSolvers.py       | 5 +++--
 proteus/TransportCoefficients.py  | 1 -
 proteus/__init__.py               | 2 +-
 setup.py                          | 2 +-
 7 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/doc/source/_templates/layout.html b/doc/source/_templates/layout.html
index 863f2379b2..8158c91dc8 100644
--- a/doc/source/_templates/layout.html
+++ b/doc/source/_templates/layout.html
@@ -104,11 +104,12 @@
      style="height:1in;"> A Python toolkit for computational methods and simulation</p>
     <div class="btn-group" role="group">
       <a class="btn btn-success"
-          href="https://github.com/erdc-cm/proteus/archive/1.3.3.tar.gz">
+          href="https://github.com/erdc-cm/proteus/archive/1.4.0.tar.gz">
             <span class="glyphicon glyphicon-download"></span> Download
       </a>
       <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
       <ul class="dropdown-menu">
+        <li><a https://github.com/erdc-cm/proteus/archive/1.4.0.tar.gz">Version 1.4.0</a></li>
         <li><a https://github.com/erdc-cm/proteus/archive/1.3.3.tar.gz">Version 1.3.3</a></li>
         <li><a https://github.com/erdc-cm/proteus/archive/1.3.2.tar.gz">Version 1.3.2</a></li>
         <li><a https://github.com/erdc-cm/proteus/archive/1.3.1.tar.gz">Version 1.3.1</a></li>
diff --git a/proteus/Isosurface.pyx b/proteus/Isosurface.pyx
index 3066b42f56..26aca0c8fc 100644
--- a/proteus/Isosurface.pyx
+++ b/proteus/Isosurface.pyx
@@ -2,9 +2,6 @@
 #cython: embedsignature=True
 """
 AuxiliaryVariables subclasses for extracting isosurfaces and contours
-
-.. inheritance-diagram:: proteus.Isosurface
-   :parts: 1
 """
 from collections import defaultdict, OrderedDict
 from itertools import product
diff --git a/proteus/MeshTools.py b/proteus/MeshTools.py
index 09cac7690b..02da59a624 100644
--- a/proteus/MeshTools.py
+++ b/proteus/MeshTools.py
@@ -6261,7 +6261,7 @@ def genMeshWithTetgen(polyfile,
    nbase : int
 
    Returns
-    -------
+   --------
    mesh : :class:`proteus.MeshTools.TetrahedralMesh`
        Simplex mesh
    """
@@ -6277,10 +6277,6 @@ def genMeshWithTetgen(polyfile,
                                 base=nbase)
    return mesh
 
-
-from proteus import default_n as dn
-from proteus import default_p as dp
-
 class MeshOptions:
     """
     Mesh options for the domain
diff --git a/proteus/NonlinearSolvers.py b/proteus/NonlinearSolvers.py
index cf9fd4e6ce..f213e8e2f5 100644
--- a/proteus/NonlinearSolvers.py
+++ b/proteus/NonlinearSolvers.py
@@ -635,7 +635,7 @@ def solve(self,u,r=None,b=None,par_u=None,par_r=None):
 
 class ExplicitLumpedMassMatrixShallowWaterEquationsSolver(Newton):
     """
-     This is a fake solver meant to be used with optimized code
+    This is a fake solver meant to be used with optimized code
     A simple iterative solver that is Newton's method
     if you give it the right Jacobian
     """
@@ -669,7 +669,7 @@ def solve(self,u,r=None,b=None,par_u=None,par_r=None):
 
 class ExplicitConsistentMassMatrixShallowWaterEquationsSolver(Newton):
     """
-     This is a fake solver meant to be used with optimized code
+    This is a fake solver meant to be used with optimized code
     A simple iterative solver that is Newton's method
     if you give it the right Jacobian
     """
@@ -2356,6 +2356,7 @@ class EikonalSolver:
        FMMEikonalSolver
        FSWEikonalSolver
 
+
     """
 #    TODO Feb 20
 #      Debug change in use truncation approach for positive and negative solutions
diff --git a/proteus/TransportCoefficients.py b/proteus/TransportCoefficients.py
index 4cff7226ec..66063b2c3c 100644
--- a/proteus/TransportCoefficients.py
+++ b/proteus/TransportCoefficients.py
@@ -9768,7 +9768,6 @@ def evaluate(self,t,c):
                                                         c[('dr',1,0)],
                                                         c[('dr',1,1)])
 
-from proteus import FemTools
 class ConservativeHeadRichardsMualemVanGenuchtenBlockHetV2withUpwind(TC_base):
     """
     version of Re where element material type id's used in evals
diff --git a/proteus/__init__.py b/proteus/__init__.py
index c09195409b..7b38e27bab 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -9,7 +9,7 @@
     import pkgutil
     __path__ = pkgutil.extend_path(__path__, __name__)
 
-__version__ = '1.3.3.dev0'
+__version__ = '1.4.0'
 
 __all__ = ["Archiver",
            "Domain",
diff --git a/setup.py b/setup.py
index 3b2db99454..3d7110f1e1 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@
         break
 
 setup(name='proteus',
-      version='1.3.3.dev0',
+      version='1.4.0',
       description='Python tools for multiphysics modeling',
       author='The Proteus Developers',
       author_email='proteus-dev@googlegroups.com',