Skip to content

Commit 25f288f

Browse files
authored
Merge pull request #28 from stevenhua0320/pre-commit-fix
skpkg: Pre commit fix
2 parents f324598 + 648c559 commit 25f288f

File tree

12 files changed

+29
-19
lines changed

12 files changed

+29
-19
lines changed

.codespell/ignore_lines.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
;; Please include filenames and explanations for each ignored line.
2+
;; See https://docs.openverse.org/meta/codespell.html for docs.

.codespell/ignore_words.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
;; Please include explanations for each ignored word (lowercase).
2+
;; See https://docs.openverse.org/meta/codespell.html for docs.
3+
4+
;; abbreviation for "materials" often used in a journal title
5+
mater
6+
7+
;; Frobenius norm used in np.linalg.norm
8+
fro

LICENSE.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ prohibited. If you don’t know whether or not your anticipated use is under
88
a license, you must contact Prof. Simon Billinge at sb2896@columbia.edu.
99
Use of this software without a license is prohibited.
1010

11-
For more information please email Prof. Simon Billinge at sb2896@columbia.edu
11+
For more information please email Prof. Simon Billinge at sb2896@columbia.edu

requirements/conda.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ pyface
44
scipy
55
traits
66
pyfai
7-
matplotlib
7+
matplotlib

src/diffpy/srxplanargui/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See LICENSE.rst for license information.
1313
#
1414
##############################################################################
15-
"""xPDFsuite, a software for PDF transformation and visualization."""
15+
"""XPDFsuite, a software for PDF transformation and visualization."""
1616

1717
# package version
1818
from diffpy.srxplanargui.version import __version__ # noqa

src/diffpy/srxplanargui/calibration.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
import re
1717
import sys
1818

19-
from diffpy.srxconfutils.tools import module_exists_lower
20-
from diffpy.srxplanar.selfcalibrate import selfCalibrate
21-
from diffpy.srxplanar.srxplanar import SrXplanar
22-
from diffpy.srxplanar.srxplanarconfig import checkMax
2319
from pyface.api import ImageResource
2420
from traits.api import (
2521
Bool,
@@ -38,6 +34,10 @@
3834
from traitsui.api import Group, Handler, HGroup, Item, VGroup, View
3935
from traitsui.menu import CancelButton, OKButton
4036

37+
from diffpy.srxconfutils.tools import module_exists_lower
38+
from diffpy.srxplanar.selfcalibrate import selfCalibrate
39+
from diffpy.srxplanar.srxplanar import SrXplanar
40+
from diffpy.srxplanar.srxplanarconfig import checkMax
4141
from diffpy.srxplanargui.srxconfig import SrXconfig
4242

4343
ETSConfig.toolkit = "qt"

src/diffpy/srxplanargui/imageplot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ class AdvHint(HasTraits):
701701
compared to their local environment
702702
Average mask: Mask the pixels too bright or too dark
703703
compared to the average intensity at the similar diffraction angle.
704-
Currect calibration information is required."""
704+
Correct calibration information is required."""
705705
)
706706

707707
advhint_view = View(

src/diffpy/srxplanargui/live.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import os
1717
import sys
1818

19-
from diffpy.srxplanar.srxplanar import SrXplanar
2019
from pyface.api import GUI, ImageResource, SplashScreen
2120
from traits.api import Any, on_trait_change
2221
from traits.etsconfig.api import ETSConfig
@@ -32,6 +31,7 @@
3231
)
3332
from traitsui.menu import OKButton
3433

34+
from diffpy.srxplanar.srxplanar import SrXplanar
3535
from diffpy.srxplanargui.calibration import Calibration
3636
from diffpy.srxplanargui.help import SrXguiHelp
3737
from diffpy.srxplanargui.selectfiles import AddFiles

src/diffpy/srxplanargui/selectfiles.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
from diffpy.pdfgete.functs import sortKeyNumericString
5353

5454
from diffpy.srxplanar.loadimage import openImage, saveImage
55-
5655
from diffpy.srxplanargui.datacontainer import DataContainer
5756
from diffpy.srxplanargui.imageplot import ImagePlot
5857
from diffpy.srxplanargui.srxconfig import SrXconfig
@@ -94,7 +93,7 @@ class AddFiles(HasTraits):
9493

9594
srxconfig = Instance(SrXconfig)
9695

97-
# The currenty inputdir directory being searched:
96+
# The currently inputdir directory being searched:
9897
# inputdir = DelegatesTo('srxconfig')
9998
inputdir = Directory() # , entries = 10 )
10099

src/diffpy/srxplanargui/srxconfig.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,18 @@
1717
import os
1818

1919
import numpy as np
20+
from pyface.api import ImageResource
21+
from traits.api import Bool, Enum, Property, on_trait_change
22+
from traits.etsconfig.api import ETSConfig
23+
from traitsui.api import Group, Item, View
24+
2025
from diffpy.srxconfutils.configtraits import ConfigBaseTraits
2126
from diffpy.srxplanar.srxplanarconfig import (
2227
_description,
2328
_epilog,
2429
_optdatalist,
2530
checkMax,
2631
)
27-
from pyface.api import ImageResource
28-
from traits.api import Bool, Enum, Property, on_trait_change
29-
from traits.etsconfig.api import ETSConfig
30-
from traitsui.api import Group, Item, View
3132

3233
ETSConfig.toolkit = "qt"
3334

@@ -109,7 +110,7 @@ class SrXconfig(ConfigBaseTraits):
109110

110111
_optdatalist = _optdatalist
111112

112-
_defaultdata = {"configfile": [], "headertitle": "SrXgui configration"}
113+
_defaultdata = {"configfile": [], "headertitle": "SrXgui configuration"}
113114

114115
rotation = Property(
115116
depends_on="rotationd", fget=lambda self: np.radians(self.rotationd)

0 commit comments

Comments
 (0)