diffpy · sbillinge · Jun 27, 2025 · Jun 14, 2025 · Jun 14, 2025 · Jun 15, 2025
diff --git a/src/diffpy/srfit/equation/literals/operators.py b/src/diffpy/srfit/equation/literals/operators.py
@@ -41,7 +41,7 @@ class Operator(Literal, OperatorABC):
     """Abstract class for specifying a general operator.
 
     This class provides several methods that are common to a derived
-    classes for concrete concrete operations.
+    classes for concrete operations.
 
     Class Attributes
     ----------------

diff --git a/tests/testbuilder.py → tests/test_builder.py b/tests/testbuilder.py → tests/test_builder.py
@@ -21,8 +21,8 @@
 
 import diffpy.srfit.equation.builder as builder
 import diffpy.srfit.equation.literals as literals
-from diffpy.srfit.tests.utils import _makeArgs
-from diffpy.srfit.tests.utils import noObserversInGlobalBuilders
+from .utils import _makeArgs
+from .utils import noObserversInGlobalBuilders
 
 
 class TestBuilder(unittest.TestCase):

diff --git a/tests/testcharacteristicfunctions.py → tests/test_characteristicfunctions.py b/tests/testcharacteristicfunctions.py → 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

diff --git a/tests/testconstraint.py → tests/test_constraint.py b/tests/testconstraint.py → tests/test_constraint.py
diff --git a/tests/testcontribution.py → tests/test_contribution.py b/tests/testcontribution.py → 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):

diff --git a/tests/testdiffpyparset.py → tests/test_diffpyparset.py b/tests/testdiffpyparset.py → 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

diff --git a/tests/testequation.py → tests/test_equation.py b/tests/testequation.py → 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):

diff --git a/tests/testfitrecipe.py → tests/test_fitrecipe.py b/tests/testfitrecipe.py → 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):

diff --git a/tests/testfitresults.py → tests/test_fitresults.py b/tests/testfitresults.py → 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):

diff --git a/tests/testliterals.py → tests/test_literals.py b/tests/testliterals.py → tests/test_literals.py
@@ -118,7 +118,7 @@ def testAddLiteral(self):
         """Test adding a literal to an operator node."""
         op = self.op
 
-        self.assertRaises(ValueError, op.getValue)
+        self.assertRaises(TypeError, op.getValue)
         op._value = 1
         self.assertEqual(op.getValue(), 1)
 
@@ -127,7 +127,7 @@ def testAddLiteral(self):
         b = literals.Argument(name = "b", value = 0)
 
         op.addLiteral(a)
-        self.assertRaises(ValueError, op.getValue)
+        self.assertRaises(TypeError, op.getValue)
 
         op.addLiteral(b)
         self.assertAlmostEqual(0, op.value)

diff --git a/tests/testobjcrystparset.py → tests/test_objcrystparset.py b/tests/testobjcrystparset.py → 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

diff --git a/tests/testparameter.py → tests/test_parameter.py b/tests/testparameter.py → tests/test_parameter.py
diff --git a/tests/testparameterset.py → tests/test_parameterset.py b/tests/testparameterset.py → tests/test_parameterset.py
diff --git a/tests/testpdf.py → tests/test_pdf.py b/tests/testpdf.py → 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
 

diff --git a/tests/testprofile.py → tests/test_profile.py b/tests/testprofile.py → 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):

diff --git a/tests/testprofilegenerator.py → tests/test_profilegenerator.py b/tests/testprofilegenerator.py → tests/test_profilegenerator.py
diff --git a/tests/testrecipeorganizer.py → tests/test_recipeorganizer.py b/tests/testrecipeorganizer.py → 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
 

diff --git a/tests/testrestraint.py → tests/test_restraint.py b/tests/testrestraint.py → tests/test_restraint.py
diff --git a/tests/testsas.py → tests/test_sas.py b/tests/testsas.py → tests/test_sas.py
@@ -20,8 +20,8 @@
 import numpy
 
 from diffpy.srfit.sas import SASGenerator, SASParser, SASProfile
-from diffpy.srfit.tests.utils import datafile
-from diffpy.srfit.tests.utils import has_sas, _msg_nosas
+from .utils import datafile
+from .utils import has_sas, _msg_nosas
 from diffpy.srfit.sas.sasimport import sasimport
 
 # ----------------------------------------------------------------------------

diff --git a/tests/testsgconstraints.py → tests/test_sgconstraints.py b/tests/testsgconstraints.py → tests/test_sgconstraints.py
@@ -19,9 +19,9 @@
 
 import numpy
 
-from diffpy.srfit.tests.utils import datafile
-from diffpy.srfit.tests.utils import has_pyobjcryst, _msg_nopyobjcryst
-from diffpy.srfit.tests.utils import has_structure, _msg_nostructure
+from .utils import datafile
+from .utils import has_pyobjcryst, _msg_nopyobjcryst
+from .utils import has_structure, _msg_nostructure
 
 # ----------------------------------------------------------------------------
 

diff --git a/tests/speedtest.py → tests/test_speed.py b/tests/speedtest.py → tests/test_speed.py
@@ -23,7 +23,7 @@
 import diffpy.srfit.equation.visitors as visitors
 import diffpy.srfit.equation.literals as literals
 
-from diffpy.srfit.tests.utils import _makeArgs
+from .utils import _makeArgs
 
 x = numpy.arange(0, 20, 0.05)
 

diff --git a/tests/testtagmanager.py → tests/test_tagmanager.py b/tests/testtagmanager.py → tests/test_tagmanager.py
diff --git a/tests/testvisitors.py → tests/test_visitors.py b/tests/testvisitors.py → tests/test_visitors.py
@@ -19,7 +19,7 @@
 
 import diffpy.srfit.equation.visitors as visitors
 import diffpy.srfit.equation.literals as literals
-from diffpy.srfit.tests.utils import _makeArgs
+from .utils import _makeArgs
 
 class TestValidator(unittest.TestCase):
 
@@ -194,7 +194,7 @@ def testSimpleFunction(self):
         self.assertTrue(plus2.hasObserver(mult._flush))
 
         # plus2 has no arguments yet. Verify this.
-        self.assertRaises(ValueError, mult.getValue)
+        self.assertRaises(TypeError, mult.getValue)
         # Add the arguments to plus2.
         plus2.addLiteral(v4)
         plus2.addLiteral(v5)

diff --git a/tests/testweakrefcallable.py → tests/test_weakrefcallable.py b/tests/testweakrefcallable.py → tests/test_weakrefcallable.py
diff --git a/tests/utils.py b/tests/utils.py
@@ -20,7 +20,7 @@
 
 import diffpy.srfit.equation.literals as literals
 from diffpy.srfit.sas.sasimport import sasimport
-from diffpy.srfit.tests import logger
+from . import logger
 
 
 # Resolve availability of optional third-party packages.