merging pre-commit changes. test_builder.py now passing tests

Author: sbillinge

tests/conftest.py

@@ -1,16 +1,17 @@
-import json
-from pathlib import Path
 import importlib.resources
-import pytest
+import json
 import logging
-
 from functools import lru_cache
+from pathlib import Path
+
+import pytest
 import diffpy.srfit.equation.literals as literals
 from diffpy.srfit.sas.sasimport import sasimport
 
 
 logger = logging.getLogger(__name__)
 
+
 @lru_cache()
 def has_sas():
     try:
@@ -20,36 +21,45 @@ def has_sas():
     except ImportError:
         return False
 
+
 # diffpy.structure
 @lru_cache()
 def has_diffpy_structure():
     _msg_nostructure = "No module named 'diffpy.structure'"
     try:
         import diffpy.structure as m
+
         del m
         return True
     except ImportError:
         return False
-        logger.warning("Cannot import diffpy.structure, Structure tests skipped.")
+        logger.warning(
+            "Cannot import diffpy.structure, Structure tests skipped."
+        )
+
 
 @lru_cache()
 def has_pyobjcryst():
     _msg_nopyobjcryst = "No module named 'pyobjcryst'"
     try:
         import pyobjcryst as m
+
         del m
         return True
     except ImportError:
         return False
         logger.warning("Cannot import pyobjcryst, pyobjcryst tests skipped.")
 
+
 # diffpy.srreal
 
+
 @lru_cache()
 def has_diffpy_srreal():
     _msg_nosrreal = "No module named 'diffpy.srreal'"
     try:
         import diffpy.srreal.pdfcalculator as m
+
         del m
         return True
     except ImportError:
@@ -61,14 +71,17 @@ def has_diffpy_srreal():
 def sas_available():
     return has_sas()
 
+
 @pytest.fixture(scope="session")
 def diffpy_structure_available():
     return has_diffpy_structure()
 
+
 @pytest.fixture(scope="session")
 def diffpy_srreal_available():
     return has_diffpy_srreal()
 
+
 @pytest.fixture(scope="session")
 def pyobjcryst_available():
     return has_pyobjcryst()
@@ -92,8 +105,12 @@ def user_filesystem(tmp_path):
 @pytest.fixture
 def datafile():
     """Fixture to load a test data file from the testdata package directory."""
+
     def _datafile(filename):
-        return importlib.resources.files("diffpy.srfit.tests.testdata").joinpath(filename)
+        return importlib.resources.files(
+            "diffpy.srfit.tests.testdata"
+        ).joinpath(filename)
+
     return _datafile
 
 @pytest.fixture(scope="session")

tests/test_sas.py

@@ -14,8 +14,8 @@
 ##############################################################################
 """Tests for sas package."""
 
-import pytest
 import numpy
+import pytest
 
 from diffpy.srfit.sas import SASGenerator, SASParser, SASProfile
 from diffpy.srfit.sas.sasimport import sasimport
@@ -24,6 +24,7 @@
 # FIXME: adjust sensitivity of the pytest.approx statements when ready to test
 # with sasview installed.
 
+
 def testParser(sas_available, datafile):
     if not sas_available:
         pytest.skip("sas package not available")
@@ -135,6 +136,7 @@ def test_generator(sas_available):
     assert 0 == pytest.approx(res)
     return
 
+
 def testGenerator2(sas_available, datafile):
     if not sas_available:
         pytest.skip("sas package not available")

tests/test_sgconstraints.py

@@ -18,7 +18,6 @@
 
 import numpy
 
-
 # ----------------------------------------------------------------------------
 
 

tests/utils.py

@@ -20,16 +20,13 @@
 
 import diffpy.srfit.equation.literals as literals
 from diffpy.srfit.sas.sasimport import sasimport
-
 from tests import logger
 
-
 # Helper functions for testing -----------------------------------------------
 
 
 
 
-
 def capturestdout(f, *args, **kwargs):
     """Capture the standard output from a call of function f."""
     savestdout = sys.stdout