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

Author: sbillinge

tests/test_characteristicfunctions.py

@@ -19,8 +19,8 @@
 import numpy
 import pytest
 
-from diffpy.srfit.sas.sasimport import sasimport
 import diffpy.srfit.pdf.characteristicfunctions as cf
+from diffpy.srfit.sas.sasimport import sasimport
 
 # Global variables to be assigned in setUp
 cf = None
@@ -48,6 +48,7 @@ def testSphere(sas_available):
     assert res == pytest.approx(0, abs=1e-4)
     return
 
+
 def testSpheroid(sas_available):
     if not sas_available:
         pytest.skip("sas package not available")
@@ -70,6 +71,7 @@ def testSpheroid(sas_available):
     assert res == pytest.approx(0, abs=1e-4)
     return
 
+
 def testShell(sas_available):
     if not sas_available:
         pytest.skip("sas package not available")
@@ -92,6 +94,7 @@ def testShell(sas_available):
     assert res == pytest.approx(0, abs=1e-4)
     return
 
+
 def testCylinder(sas_available):
     if not sas_available:
         pytest.skip("sas package not available")

tests/test_contribution.py

@@ -183,6 +183,7 @@ def test_registerFunction(self):
         self.assertEqual(6, fc.evaluate())
         return
 
+
 def testResidual(noObserversInGlobalBuilders):
     """Test the residual, which requires all other methods."""
     gen = ProfileGenerator("test")
@@ -244,9 +245,9 @@ def testResidual(noObserversInGlobalBuilders):
     fc.setEquation("2*I")
     fc.setResidualEquation("resv")
     chiv = fc.residual()
-    assert (dot(chiv, chiv) ==
-            pytest.approx(sum((2 * xobs - yobs) ** 2) / sum(yobs**2)))
-
+    assert dot(chiv, chiv) == pytest.approx(
+        sum((2 * xobs - yobs) ** 2) / sum(yobs**2)
+    )
 
     # Make a custom residual.
     fc.setResidualEquation("abs(eq-y)**0.5")
@@ -265,6 +266,7 @@ def testResidual(noObserversInGlobalBuilders):
     assert noObserversInGlobalBuilders
     return
 
+
 def test_setEquation(noObserversInGlobalBuilders):
     """Check replacement of removed parameters."""
     fc = FitContribution("test")
@@ -278,6 +280,7 @@ def test_setEquation(noObserversInGlobalBuilders):
     assert noObserversInGlobalBuilders
     return
 
+
 def test_getEquation(noObserversInGlobalBuilders):
     """Check getting the current profile simulation formula."""
     fc = FitContribution("test")
@@ -288,6 +291,5 @@ def test_getEquation(noObserversInGlobalBuilders):
     return
 
 
-
 if __name__ == "__main__":
     unittest.main()