reorder imports

gflex/base.py

@@ -17,13 +17,17 @@
 along with gFlex.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-import sys, os
 import configparser
+import os
+import sys
+import warnings
+
 import numpy as np
 from matplotlib import pyplot as plt
-import warnings
+
 from ._version import __version__
 
+
 class Utility:
 
   """
@@ -428,8 +432,8 @@ def xyzinterp(self, x, y, z, titletext):
     if self.Verbose:
       print("Starting to interpolate grid for plotting -- can be a slow process!")
 
-    from scipy.interpolate import griddata
     import numpy.ma as ma
+    from scipy.interpolate import griddata
 
     # define grid.
     xmin = np.min(self.xw)
@@ -809,6 +813,7 @@ def outputDeflections(self):
           save(self.wOutFile,self.w)
         else:
           from numpy import savetxt
+
           # Shouldn't need more than mm precision, at very most
           savetxt(self.wOutFile,self.w,fmt='%.3f')
           if self.Verbose:

gflex/f1d.py

@@ -17,9 +17,10 @@
 along with gFlex.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from gflex.base import Flexure
 from scipy.sparse import spdiags
-from scipy.sparse.linalg import spsolve, isolve
+from scipy.sparse.linalg import isolve, spsolve
+
+from gflex.base import Flexure
 
 
 class F1D(Flexure):

gflex/f2d.py

@@ -17,10 +17,12 @@
 along with gFlex.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from gflex.base import Flexure
 import scipy
 from scipy.special import kei
 
+from gflex.base import Flexure
+
+
 # class F2D inherits Flexure and overrides __init__ therefore setting up the same
 # three parameters as class Isostasy; and it then sets up more parameters specific
 # to its own type of simulation.

gflex/gflex.py

@@ -21,6 +21,7 @@
 
 import os.path
 import sys
+
 from gflex.f1d import F1D
 from gflex.f2d import F2D
 

input/grid2D.py

@@ -1,9 +1,10 @@
 #! /usr/bin/env python
 
-import gflex
 import numpy as np
 from matplotlib import pyplot as plt
 
+import gflex
+
 flex = gflex.F2D()
 
 flex.Quiet = False

input/run_in_script_1D.py

@@ -1,9 +1,10 @@
 #! /usr/bin/env python
 
-import gflex
 import numpy as np
 from matplotlib import pyplot as plt
 
+import gflex
+
 flex = gflex.F1D()
 
 flex.Quiet = True

input/run_in_script_2D.py

@@ -1,9 +1,10 @@
 #! /usr/bin/env python
 
-import gflex
 import numpy as np
 from matplotlib import pyplot as plt
 
+import gflex
+
 flex = gflex.F2D()
 
 flex.Quiet = False

input/test.py

@@ -1,9 +1,10 @@
 #! /usr/bin/env python
 
-import gflex
 import numpy as np
 from matplotlib import pyplot as plt
 
+import gflex
+
 flex = gflex.F1D()
 
 flex.Quiet = True

tests/test_1D_FD.py

@@ -1,9 +1,11 @@
 #! /usr/bin/env python
 
-import gflex
 import numpy as np
 from matplotlib import pyplot as plt
 
+import gflex
+
+
 def test_main():
     flex = gflex.f1d.F1D()
 

tests/test_1D_SAS.py

@@ -1,9 +1,11 @@
 #! /usr/bin/env python
 
-import gflex
 import numpy as np
 from matplotlib import pyplot as plt
 
+import gflex
+
+
 def test_main():
     flex = gflex.f2d.F1D()
 

tests/test_2D_FD.py

@@ -1,9 +1,11 @@
 #! /usr/bin/env python
 
-import gflex
 import numpy as np
 from matplotlib import pyplot as plt
 
+import gflex
+
+
 def test_main():
     flex = gflex.f2d.F2D()