Merge branch 'pkg_resources' of github.com:sbillinge/diffpy.srfit into pkg_resources

Author: sbillinge

tests/conftest.py

@@ -5,10 +5,10 @@
 from pathlib import Path
 
 import pytest
+
 import diffpy.srfit.equation.literals as literals
 from diffpy.srfit.sas.sasimport import sasimport
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -113,6 +113,7 @@ def _datafile(filename):
 
     return _datafile
 
+
 @pytest.fixture(scope="session")
 def make_args():
     def _makeArgs(num):
@@ -121,8 +122,10 @@ def _makeArgs(num):
             j = i + 1
             args.append(literals.Argument(name="v%i" % j, value=j))
         return args
+
     return _makeArgs
 
+
 @pytest.fixture(scope="session")
 def noObserversInGlobalBuilders():
     def _noObserversInGlobalBuilders():
@@ -139,4 +142,5 @@ def _noObserversInGlobalBuilders():
                 rv = False
                 break
         return rv
+
     return _noObserversInGlobalBuilders()

tests/test_builder.py

@@ -47,6 +47,7 @@ def testRegisterArg(make_args, noObserversInGlobalBuilders):
     assert noObserversInGlobalBuilders
     return
 
+
 def testRegisterOperator(make_args, noObserversInGlobalBuilders):
     """Try to use an operator without arguments in an equation."""
 
@@ -80,6 +81,7 @@ def testRegisterOperator(make_args, noObserversInGlobalBuilders):
     assert noObserversInGlobalBuilders
     return
 
+
 def testSwapping(make_args, noObserversInGlobalBuilders):
 
     def g1(v1, v2, v3, v4):
@@ -140,6 +142,7 @@ def g2(v1):
     assert noObserversInGlobalBuilders
     return
 
+
 def testParseEquation(noObserversInGlobalBuilders):
 
     from numpy import array_equal, divide, e, sin, sqrt
@@ -172,7 +175,6 @@ def testParseEquation(noObserversInGlobalBuilders):
     f = lambda x, sigma: sqrt(e ** (-0.5 * (x / sigma) ** 2))
     assert numpy.allclose(eq(), f(x, sigma))
 
-
     assert eq.args == [eq.x, eq.sigma]
 
     # Equation with constants
@@ -193,6 +195,7 @@ def testParseEquation(noObserversInGlobalBuilders):
     assert noObserversInGlobalBuilders
     return
 
+
 def test_parse_constant():
     """Verify parsing of constant numeric expressions."""
     factory = builder.EquationFactory()
@@ -204,6 +207,7 @@ def test_parse_constant():
         eq(3)
     return
 
+
 def testBuildEquation(noObserversInGlobalBuilders):
 
     from numpy import array_equal

tests/utils.py

@@ -25,8 +25,6 @@
 # Helper functions for testing -----------------------------------------------
 
 
-
-
 def capturestdout(f, *args, **kwargs):
     """Capture the standard output from a call of function f."""
     savestdout = sys.stdout