[pre-commit.ci] auto fixes from pre-commit hooks

Author: pre-commit-ci[bot]

Diff for: tests/test_builder.py

@@ -18,10 +18,10 @@
 import unittest
 
 import numpy
+from utils import _makeArgs, noObserversInGlobalBuilders
 
 import diffpy.srfit.equation.builder as builder
 import diffpy.srfit.equation.literals as literals
-from utils import _makeArgs, noObserversInGlobalBuilders
 
 
 class TestBuilder(unittest.TestCase):

Diff for: tests/test_characteristicfunctions.py

@@ -18,9 +18,9 @@
 import unittest
 
 import numpy
+from utils import _msg_nosas, has_sas
 
 from diffpy.srfit.sas.sasimport import sasimport
-from utils import _msg_nosas, has_sas
 
 # Global variables to be assigned in setUp
 cf = None

Diff for: tests/test_contribution.py

@@ -18,13 +18,13 @@
 import unittest
 
 from numpy import arange, array_equal, dot, sin
+from utils import noObserversInGlobalBuilders
 
 from diffpy.srfit.exceptions import SrFitError
 from diffpy.srfit.fitbase.fitcontribution import FitContribution
 from diffpy.srfit.fitbase.parameter import Parameter
 from diffpy.srfit.fitbase.profile import Profile
 from diffpy.srfit.fitbase.profilegenerator import ProfileGenerator
-from utils import noObserversInGlobalBuilders
 
 
 class TestContribution(unittest.TestCase):

Diff for: tests/test_diffpyparset.py

@@ -19,7 +19,6 @@
 import unittest
 
 import numpy
-
 from utils import _msg_nostructure, has_structure
 
 # Global variables to be assigned in setUp

Diff for: tests/test_equation.py

@@ -17,9 +17,10 @@
 
 import unittest
 
+from utils import _makeArgs, noObserversInGlobalBuilders
+
 import diffpy.srfit.equation.literals as literals
 from diffpy.srfit.equation import Equation
-from utils import _makeArgs, noObserversInGlobalBuilders
 
 
 class TestEquation(unittest.TestCase):

Diff for: tests/test_fitrecipe.py

@@ -18,12 +18,12 @@
 import unittest
 
 from numpy import array_equal, dot, linspace, pi, sin
+from utils import capturestdout
 
 from diffpy.srfit.fitbase.fitcontribution import FitContribution
 from diffpy.srfit.fitbase.fitrecipe import FitRecipe
 from diffpy.srfit.fitbase.parameter import Parameter
 from diffpy.srfit.fitbase.profile import Profile
-from utils import capturestdout
 
 
 class TestFitRecipe(unittest.TestCase):

Diff for: tests/test_fitresults.py

@@ -17,9 +17,10 @@
 
 import unittest
 
+from utils import datafile
+
 from diffpy.srfit.fitbase.fitrecipe import FitRecipe
 from diffpy.srfit.fitbase.fitresults import initializeRecipe
-from utils import datafile
 
 
 class TestInitializeRecipe(unittest.TestCase):

Diff for: tests/test_objcrystparset.py

@@ -18,7 +18,6 @@
 import unittest
 
 import numpy
-
 from utils import _msg_nopyobjcryst, has_pyobjcryst
 
 # Global variables to be assigned in setUp

Diff for: tests/test_pdf.py

@@ -20,16 +20,10 @@
 import unittest
 
 import numpy
+from utils import _msg_nosrreal, _msg_nostructure, datafile, has_srreal, has_structure
 
 from diffpy.srfit.exceptions import SrFitError
 from diffpy.srfit.pdf import PDFContribution, PDFGenerator, PDFParser
-from utils import (
-    _msg_nosrreal,
-    _msg_nostructure,
-    datafile,
-    has_srreal,
-    has_structure,
-)
 
 # ----------------------------------------------------------------------------
 

Diff for: tests/test_profile.py

@@ -20,10 +20,10 @@
 import unittest
 
 from numpy import allclose, arange, array, array_equal, ones_like
+from utils import datafile
 
 from diffpy.srfit.exceptions import SrFitError
 from diffpy.srfit.fitbase.profile import Profile
-from utils import datafile
 
 
 class TestProfile(unittest.TestCase):

Diff for: tests/test_recipeorganizer.py

@@ -18,6 +18,7 @@
 import unittest
 
 import numpy
+from utils import capturestdout
 
 from diffpy.srfit.equation.builder import EquationFactory
 from diffpy.srfit.fitbase.calculator import Calculator
@@ -27,7 +28,6 @@
     RecipeOrganizer,
     equationFromString,
 )
-from utils import capturestdout
 
 # ----------------------------------------------------------------------------
 

Diff for: tests/test_sas.py

@@ -18,10 +18,10 @@
 import unittest
 
 import numpy
+from utils import _msg_nosas, datafile, has_sas
 
 from diffpy.srfit.sas import SASGenerator, SASParser, SASProfile
 from diffpy.srfit.sas.sasimport import sasimport
-from utils import _msg_nosas, datafile, has_sas
 
 # ----------------------------------------------------------------------------
 

Diff for: tests/test_sgconstraints.py

@@ -18,7 +18,6 @@
 import unittest
 
 import numpy
-
 from utils import (
     _msg_nopyobjcryst,
     _msg_nostructure,

Diff for: tests/test_speed.py

@@ -20,10 +20,10 @@
 import random
 
 import numpy
+from utils import _makeArgs
 
 import diffpy.srfit.equation.literals as literals
 import diffpy.srfit.equation.visitors as visitors
-from utils import _makeArgs
 
 x = numpy.arange(0, 20, 0.05)
 

Diff for: tests/test_visitors.py

@@ -17,9 +17,10 @@
 
 import unittest
 
+from utils import _makeArgs
+
 import diffpy.srfit.equation.literals as literals
 import diffpy.srfit.equation.visitors as visitors
-from utils import _makeArgs
 
 
 class TestValidator(unittest.TestCase):

Diff for: tests/utils.py

@@ -15,13 +15,13 @@
 
 """Helper routines for testing."""
 
+import logging as logger
 import sys
 
 import six
 
 import diffpy.srfit.equation.literals as literals
 from diffpy.srfit.sas.sasimport import sasimport
-import logging as logger
 
 # Resolve availability of optional third-party packages.