Skip to content

Commit 656b484

Browse files
[pre-commit.ci] auto fixes from pre-commit hooks
1 parent 59bd537 commit 656b484

File tree

7 files changed

+10
-28
lines changed

7 files changed

+10
-28
lines changed

Diff for: src/diffpy/morph/morph_helpers/__init__.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@
1414
"""List of helpers for certain morphing operations
1515
(currently only used for smear)."""
1616

17-
from diffpy.morph.morph_helpers.transformpdftordf import (
18-
TransformXtalPDFtoRDF,
19-
)
20-
from diffpy.morph.morph_helpers.transformrdftopdf import (
21-
TransformXtalRDFtoPDF,
22-
)
17+
from diffpy.morph.morph_helpers.transformpdftordf import TransformXtalPDFtoRDF
18+
from diffpy.morph.morph_helpers.transformrdftopdf import TransformXtalRDFtoPDF
2319

2420
# List of helpers
2521
morph_helpers = [

Diff for: src/diffpy/morph/morphapp.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
from pathlib import Path
2020

2121
import diffpy.morph.morph_helpers as helpers
22-
import diffpy.morph.morphs as morphs
2322
import diffpy.morph.morph_io as io
23+
import diffpy.morph.morphs as morphs
2424
import diffpy.morph.pdfplot as pdfplot
2525
import diffpy.morph.refine as refine
2626
import diffpy.morph.tools as tools

Diff for: tests/test_morph_func.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import numpy as np
55

6-
from diffpy.morph.morph_api import morph_default_config, morph
6+
from diffpy.morph.morph_api import morph, morph_default_config
77
from tests.test_morphstretch import heaviside
88

99

Diff for: tests/test_morphpdftordf.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
import numpy
77
import pytest
88

9-
from diffpy.morph.morph_helpers.transformpdftordf import (
10-
TransformXtalPDFtoRDF,
11-
)
9+
from diffpy.morph.morph_helpers.transformpdftordf import TransformXtalPDFtoRDF
1210

1311
# useful variables
1412
thisfile = locals().get("__file__", "file.py")

Diff for: tests/test_morphrdftopdf.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
import numpy
77
import pytest
88

9-
from diffpy.morph.morph_helpers.transformrdftopdf import (
10-
TransformXtalRDFtoPDF,
11-
)
9+
from diffpy.morph.morph_helpers.transformrdftopdf import TransformXtalRDFtoPDF
1210

1311
# useful variables
1412
thisfile = locals().get("__file__", "file.py")

Diff for: tests/test_pdfplot.py

+2-8
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
import matplotlib.pyplot as plt
66
import numpy as np
77

8-
from diffpy.morph.morph_api import (
9-
morph_default_config,
10-
morph,
11-
plot_morph,
12-
)
8+
from diffpy.morph.morph_api import morph, morph_default_config, plot_morph
139
from tests.test_morphstretch import heaviside
1410

1511

@@ -23,9 +19,7 @@ def test_plot_morph():
2319
x_morph = x_target.copy()
2420
y_morph = heaviside(x_target, lb * (1 + stretch), ub * (1 + stretch))
2521
cfg = morph_default_config(stretch=0.1) # off init
26-
morph_rv = morph(
27-
x_morph, y_morph, x_target, y_target, verbose=True, **cfg
28-
)
22+
morph_rv = morph(x_morph, y_morph, x_target, y_target, verbose=True, **cfg)
2923
chain = morph_rv["morph_chain"]
3024
fig, ax = plt.subplots()
3125
l_list = plot_morph(chain, ax)

Diff for: tests/test_refine.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@
66
import numpy
77
import pytest
88

9-
from diffpy.morph.morph_helpers.transformpdftordf import (
10-
TransformXtalPDFtoRDF,
11-
)
12-
from diffpy.morph.morph_helpers.transformrdftopdf import (
13-
TransformXtalRDFtoPDF,
14-
)
9+
from diffpy.morph.morph_helpers.transformpdftordf import TransformXtalPDFtoRDF
10+
from diffpy.morph.morph_helpers.transformrdftopdf import TransformXtalRDFtoPDF
1511
from diffpy.morph.morphs.morphchain import MorphChain
1612
from diffpy.morph.morphs.morphscale import MorphScale
1713
from diffpy.morph.morphs.morphsmear import MorphSmear

0 commit comments

Comments
 (0)