Skip to content

Commit cb6ab71

Browse files
[pre-commit.ci] auto fixes from pre-commit hooks
1 parent 2878173 commit cb6ab71

17 files changed

Lines changed: 18 additions & 24 deletions

docs/examples/crystalpdf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"""
2626

2727
import numpy
28-
from diffpy.structure import Structure
2928
from gaussianrecipe import scipyOptimize
3029

3130
from diffpy.srfit.fitbase import (
@@ -36,6 +35,7 @@
3635
ProfileParser,
3736
)
3837
from diffpy.srfit.pdf import PDFGenerator
38+
from diffpy.structure import Structure
3939

4040
######
4141
# Example Code

docs/examples/simplepdf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"""
2020

2121
from crystalpdf import plotResults
22-
from diffpy.structure import Structure
2322
from gaussianrecipe import scipyOptimize
2423

2524
from diffpy.srfit.fitbase import FitRecipe, FitResults
2625
from diffpy.srfit.pdf import PDFContribution
26+
from diffpy.structure import Structure
2727

2828
######
2929
# Example Code

src/diffpy/srfit/equation/builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@
8383

8484
import numpy
8585
import six
86-
from diffpy.utils._deprecator import build_deprecation_message, deprecated
8786

8887
import diffpy.srfit.equation.literals as literals
8988
from diffpy.srfit.equation.equationmod import Equation
9089
from diffpy.srfit.equation.literals.literal import Literal
90+
from diffpy.utils._deprecator import build_deprecation_message, deprecated
9191

9292
__all__ = [
9393
"EquationFactory",

src/diffpy/srfit/fitbase/constraint.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222

2323
__all__ = ["Constraint"]
2424

25-
from diffpy.utils._deprecator import build_deprecation_message, deprecated
26-
2725
from diffpy.srfit.exceptions import SrFitError
2826
from diffpy.srfit.fitbase.validatable import Validatable
27+
from diffpy.utils._deprecator import build_deprecation_message, deprecated
2928

3029
base = "diffpy.srfit.fitbase.constraint.Constraint"
3130
removal_version = "4.0.0"

src/diffpy/srfit/fitbase/fitcontribution.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@
2424

2525
__all__ = ["FitContribution"]
2626

27-
from diffpy.utils._deprecator import build_deprecation_message, deprecated
28-
2927
from diffpy.srfit.exceptions import SrFitError
3028
from diffpy.srfit.fitbase.parameter import ParameterProxy
3129
from diffpy.srfit.fitbase.parameterset import ParameterSet
3230
from diffpy.srfit.fitbase.profile import Profile
3331
from diffpy.srfit.fitbase.recipeorganizer import get_equation_from_string
32+
from diffpy.utils._deprecator import build_deprecation_message, deprecated
3433

3534
base = "diffpy.srfit.fitbase.FitContribution"
3635
removal_version = "4.0.0"

src/diffpy/srfit/fitbase/fitrecipe.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939

4040
import matplotlib.pyplot as plt
4141
from bg_mpl_stylesheets.styles import all_styles
42-
from diffpy.utils._deprecator import build_deprecation_message, deprecated
4342
from numpy import array, concatenate, dot, sqrt
4443

4544
import diffpy.srfit.util.inpututils as utils
@@ -48,6 +47,7 @@
4847
from diffpy.srfit.fitbase.recipeorganizer import RecipeOrganizer
4948
from diffpy.srfit.interface import _fitrecipe_interface
5049
from diffpy.srfit.util.tagmanager import TagManager
50+
from diffpy.utils._deprecator import build_deprecation_message, deprecated
5151

5252
plt.style.use(all_styles["bg-style"])
5353

src/diffpy/srfit/fitbase/fitresults.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
from collections import OrderedDict
2929

3030
import numpy
31-
from diffpy.utils._deprecator import build_deprecation_message, deprecated
3231

3332
from diffpy.srfit.util import _DASHEDLINE
3433
from diffpy.srfit.util import sortKeyForNumericString as numstr
3534
from diffpy.srfit.util.inpututils import inputToString
35+
from diffpy.utils._deprecator import build_deprecation_message, deprecated
3636

3737
fitresults_base = "diffpy.srfit.fitbase.FitResults"
3838
removal_version = "4.0.0"

src/diffpy/srfit/fitbase/parameter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
from functools import wraps
2828

2929
import numpy
30-
from diffpy.utils._deprecator import build_deprecation_message, deprecated
3130

3231
from diffpy.srfit.equation.literals import Argument
3332
from diffpy.srfit.exceptions import SrFitError
3433
from diffpy.srfit.fitbase.validatable import Validatable
3534
from diffpy.srfit.interface import _parameter_interface
3635
from diffpy.srfit.util.argbinders import bind2nd
3736
from diffpy.srfit.util.nameutils import validateName
37+
from diffpy.utils._deprecator import build_deprecation_message, deprecated
3838

3939
parameter_base = "diffpy.srfit.fitbase.Parameter"
4040
removal_version = "4.0.0"

src/diffpy/srfit/fitbase/parameterset.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424

2525
from collections import OrderedDict
2626

27-
from diffpy.utils._deprecator import build_deprecation_message, deprecated
28-
2927
from diffpy.srfit.fitbase.recipeorganizer import RecipeOrganizer
28+
from diffpy.utils._deprecator import build_deprecation_message, deprecated
3029

3130
base = "diffpy.srfit.fitbase.parameterset.ParameterSet"
3231
removal_version = "4.0.0"

src/diffpy/srfit/fitbase/profile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424

2525
import numpy
2626
import six
27-
from diffpy.utils._deprecator import build_deprecation_message, deprecated
2827

2928
from diffpy.srfit.exceptions import SrFitError
3029
from diffpy.srfit.fitbase.parameter import Parameter
3130
from diffpy.srfit.fitbase.validatable import Validatable
3231
from diffpy.srfit.util.observable import Observable
32+
from diffpy.utils._deprecator import build_deprecation_message, deprecated
3333

3434
# This is the roundoff tolerance for selecting bounds on arrays.
3535
epsilon = 1e-8

0 commit comments

Comments
 (0)