chore: add sasmodels to requirements folder and move load_standard_models() into the test functions

Author: zmx27

tests/test_characteristicfunctions.py

@@ -22,8 +22,6 @@
 
 import diffpy.srfit.pdf.characteristicfunctions as cf
 
-load_standard_models()
-
 # # Global variables to be assigned in setUp
 # cf = None
 # Fixme: remove this code if imports don't break on testing
@@ -39,6 +37,8 @@ def testSphere(sas_available):
         + "remove skip when our code is refactored to use the "
         + "latest sasview API"
     )
+
+    load_standard_models()
     radius = 25
     # Calculate sphere cf from SphereModel
     SphereModel = find_model("sphere")
@@ -65,6 +65,8 @@ def testSpheroid(sas_available):
         + "remove skip when our code is refactored to use the "
         + "latest sasview API"
     )
+
+    load_standard_models()
     prad = 20.9
     erad = 33.114
     # Calculate cf from EllipsoidModel
@@ -93,6 +95,8 @@ def testShell(sas_available):
         + "remove skip when our code is refactored to use the "
         + "latest sasview API"
     )
+
+    load_standard_models()
     radius = 19.2
     thickness = 7.8
     # Calculate cf from VesicleModel
@@ -121,6 +125,7 @@ def testCylinder(sas_available):
         + "remove skip when our code is refactored to use the "
         + "latest sasview API"
     )
+    load_standard_models()
     """Make sure cylinder works over different r-ranges."""
     radius = 100
     length = 30

tests/test_sas.py

@@ -22,8 +22,6 @@
 
 from diffpy.srfit.sas import SASGenerator, SASParser, SASProfile
 
-load_standard_models()
-
 # ----------------------------------------------------------------------------
 # FIXME: adjust sensitivity of the pytest.approx statements when ready to test
 # with sasview installed.
@@ -33,6 +31,7 @@ def testParser(sas_available, datafile):
     if not sas_available:
         pytest.skip("sas package not available")
 
+    load_standard_models()
     data = datafile("sas_ascii_test_1.txt")
     parser = SASParser()
     parser.parseFile(data)
@@ -117,6 +116,7 @@ def testParser(sas_available, datafile):
 def test_generator(sas_available):
     if not sas_available:
         pytest.skip("sas package not available")
+    load_standard_models()
     SphereModel = find_model("sphere")
     model = SphereModel()
     gen = SASGenerator("sphere", model)
@@ -144,6 +144,7 @@ def test_generator(sas_available):
 def testGenerator2(sas_available, datafile):
     if not sas_available:
         pytest.skip("sas package not available")
+    load_standard_models()
     EllipsoidModel = find_model("ellipsoid")
     model = EllipsoidModel()
     gen = SASGenerator("ellipsoid", model)