fix: rename test_data back to testdata and import utils locally

Author: sbillinge

tests/test_characteristicfunctions.py

@@ -19,7 +19,7 @@
 
 import numpy
 
-from diffpy.srfit.tests.utils import has_sas, _msg_nosas
+from .utils import has_sas, _msg_nosas
 from diffpy.srfit.sas.sasimport import sasimport
 
 # Global variables to be assigned in setUp

tests/test_contribution.py

@@ -24,7 +24,7 @@
 from diffpy.srfit.fitbase.profile import Profile
 from diffpy.srfit.fitbase.parameter import Parameter
 from diffpy.srfit.exceptions import SrFitError
-from diffpy.srfit.tests.utils import noObserversInGlobalBuilders
+from .utils import noObserversInGlobalBuilders
 
 
 class TestContribution(unittest.TestCase):

tests/test_diffpyparset.py

@@ -20,7 +20,7 @@
 
 import numpy
 
-from diffpy.srfit.tests.utils import has_structure, _msg_nostructure
+from .utils import has_structure, _msg_nostructure
 
 # Global variables to be assigned in setUp
 Atom = Lattice = Structure = DiffpyStructureParSet = None

tests/test_equation.py

@@ -19,8 +19,8 @@
 
 import diffpy.srfit.equation.literals as literals
 from diffpy.srfit.equation import Equation
-from diffpy.srfit.tests.utils import _makeArgs
-from diffpy.srfit.tests.utils import noObserversInGlobalBuilders
+from .utils import _makeArgs
+from .utils import noObserversInGlobalBuilders
 
 
 class TestEquation(unittest.TestCase):

tests/test_fitrecipe.py

@@ -23,7 +23,7 @@
 from diffpy.srfit.fitbase.fitcontribution import FitContribution
 from diffpy.srfit.fitbase.profile import Profile
 from diffpy.srfit.fitbase.parameter import Parameter
-from diffpy.srfit.tests.utils import capturestdout
+from .utils import capturestdout
 
 
 class TestFitRecipe(unittest.TestCase):

tests/test_fitresults.py

@@ -19,7 +19,7 @@
 
 from diffpy.srfit.fitbase.fitrecipe import FitRecipe
 from diffpy.srfit.fitbase.fitresults import initializeRecipe
-from diffpy.srfit.tests.utils import datafile
+from .utils import datafile
 
 
 class TestInitializeRecipe(unittest.TestCase):

tests/test_objcrystparset.py

@@ -19,7 +19,7 @@
 
 import numpy
 
-from diffpy.srfit.tests.utils import has_pyobjcryst, _msg_nopyobjcryst
+from .utils import has_pyobjcryst, _msg_nopyobjcryst
 
 # Global variables to be assigned in setUp
 ObjCrystCrystalParSet = spacegroups = None

tests/test_pdf.py

@@ -21,9 +21,9 @@
 
 import numpy
 
-from diffpy.srfit.tests.utils import datafile
-from diffpy.srfit.tests.utils import has_srreal, _msg_nosrreal
-from diffpy.srfit.tests.utils import has_structure, _msg_nostructure
+from .utils import datafile
+from .utils import has_srreal, _msg_nosrreal
+from .utils import has_structure, _msg_nostructure
 from diffpy.srfit.pdf import PDFGenerator, PDFParser, PDFContribution
 from diffpy.srfit.exceptions import SrFitError
 

tests/test_profile.py

@@ -23,7 +23,7 @@
 
 from diffpy.srfit.fitbase.profile import Profile
 from diffpy.srfit.exceptions import SrFitError
-from diffpy.srfit.tests.utils import datafile
+from .utils import datafile
 
 
 class TestProfile(unittest.TestCase):

tests/test_recipeorganizer.py

@@ -23,7 +23,7 @@
 from diffpy.srfit.fitbase.recipeorganizer import equationFromString
 from diffpy.srfit.fitbase.recipeorganizer import RecipeContainer
 from diffpy.srfit.fitbase.recipeorganizer import RecipeOrganizer
-from diffpy.srfit.tests.utils import capturestdout
+from .utils import capturestdout
 
 import numpy