chore: add sasmodels imports inside test functions

Author: zmx27

tests/test_characteristicfunctions.py

@@ -18,7 +18,6 @@
 
 import numpy
 import pytest
-from sasmodels.sasview_model import find_model, load_standard_models
 
 import diffpy.srfit.pdf.characteristicfunctions as cf
 
@@ -38,6 +37,8 @@ def testSphere(sas_available):
         + "latest sasview API"
     )
 
+    from sasmodels.sasview_model import find_model, load_standard_models
+
     load_standard_models()
     radius = 25
     # Calculate sphere cf from SphereModel
@@ -66,6 +67,8 @@ def testSpheroid(sas_available):
         + "latest sasview API"
     )
 
+    from sasmodels.sasview_model import find_model, load_standard_models
+
     load_standard_models()
     prad = 20.9
     erad = 33.114
@@ -96,6 +99,8 @@ def testShell(sas_available):
         + "latest sasview API"
     )
 
+    from sasmodels.sasview_model import find_model, load_standard_models
+
     load_standard_models()
     radius = 19.2
     thickness = 7.8
@@ -125,6 +130,8 @@ def testCylinder(sas_available):
         + "remove skip when our code is refactored to use the "
         + "latest sasview API"
     )
+    from sasmodels.sasview_model import find_model, load_standard_models
+
     load_standard_models()
     """Make sure cylinder works over different r-ranges."""
     radius = 100

tests/test_sas.py

@@ -17,9 +17,6 @@
 import numpy
 import pytest
 
-# Use the updated SasView model API to load models
-from sasmodels.sasview_model import find_model, load_standard_models
-
 from diffpy.srfit.sas import SASGenerator, SASParser, SASProfile
 
 # ----------------------------------------------------------------------------
@@ -31,7 +28,6 @@ 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)
@@ -116,6 +112,8 @@ def testParser(sas_available, datafile):
 def test_generator(sas_available):
     if not sas_available:
         pytest.skip("sas package not available")
+    from sasmodels.sasview_model import find_model, load_standard_models
+
     load_standard_models()
     SphereModel = find_model("sphere")
     model = SphereModel()
@@ -144,6 +142,8 @@ def test_generator(sas_available):
 def testGenerator2(sas_available, datafile):
     if not sas_available:
         pytest.skip("sas package not available")
+    from sasmodels.sasview_model import find_model, load_standard_models
+
     load_standard_models()
     EllipsoidModel = find_model("ellipsoid")
     model = EllipsoidModel()