Skip to content

Commit 4bc59e2

Browse files
committed
precommit fixes
1 parent 0552c75 commit 4bc59e2

File tree

8 files changed

+33
-47
lines changed

8 files changed

+33
-47
lines changed

Diff for: .codecov.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
coverage:
22
status:
3-
project: # more options at https://docs.codecov.com/docs/commit-status
3+
project: # more options at https://docs.codecov.com/docs/commit-status
44
default:
55
target: auto # use the coverage from the base commit, fail if coverage is lower
6-
threshold: 0% # allow the coverage to drop by
6+
threshold: 0% # allow the coverage to drop by
77

88
comment:
99
layout: " diff, flags, files"
1010
behavior: default
1111
require_changes: false
12-
require_base: false # [true :: must have a base report to post]
13-
require_head: false # [true :: must have a head report to post]
12+
require_base: false # [true :: must have a base report to post]
13+
require_head: false # [true :: must have a head report to post]
1414
hide_project_coverage: false # [true :: only show coverage on the git diff aka patch coverage]

Diff for: .github/workflows/build-wheel-release-upload.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
push:
66
tags:
7-
- '*' # Trigger on all tags initially, but tag and release privilege are verified in _build-wheel-release-upload.yml
7+
- "*" # Trigger on all tags initially, but tag and release privilege are verified in _build-wheel-release-upload.yml
88

99
jobs:
1010
release:

Diff for: .github/workflows/check-news-item.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Check for News
33
on:
44
pull_request_target:
55
branches:
6-
- main
6+
- main
77

88
jobs:
99
check-news-item:

Diff for: src/diffpy/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# See LICENSE.rst for license information.
1313
#
1414
##############################################################################
15-
1615
"""Blank namespace package for module diffpy."""
1716

1817

Diff for: src/diffpy/fourigui/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# See LICENSE.rst for license information.
1313
#
1414
##############################################################################
15-
1615
"""Tool for visualizing 3D diffraction and PDF Images."""
1716

1817
# package version

Diff for: src/diffpy/fourigui/fourigui.py

+24-35
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def __init__(self):
2121
self.initUI()
2222

2323
def initUI(self):
24-
"""Initialize the GUI for fourigui"""
24+
"""Initialize the GUI for fourigui."""
2525

2626
self.loaded = False # denotes whether a dataset is loaded
2727
self.transformed = False # denotes whether dataset is Fourier transformed
@@ -254,11 +254,10 @@ def initUI(self):
254254
frame11.place(x=WIDTH // 2, y=HEIGHT // 2) # , height=HEIGHT//2, width=WIDTH//2)
255255

256256
def load_cube(self):
257-
"""
258-
loads 3D array in h5py file format from the filename input panel
259-
3D array is expected to be a reconstructed reciprocal scattering volume
260-
when executed, one slide perpendicular to the selected axis will be plotted in the plot panel
261-
"""
257+
"""Loads 3D array in h5py file format from the filename input panel 3D
258+
array is expected to be a reconstructed reciprocal scattering volume
259+
when executed, one slide perpendicular to the selected axis will be
260+
plotted in the plot panel."""
262261

263262
filename = self.filename_entry.get()
264263
f = h5py.File(filename, "r")
@@ -327,7 +326,7 @@ def load_cube(self):
327326
self.intensity_upd_global()
328327

329328
def plot_plane(self):
330-
"""update plotted plane perpendicular to the selected axis"""
329+
"""Update plotted plane perpendicular to the selected axis."""
331330
if self.axis.get() == 0:
332331
self.im.set_data(self.cube[self.plane_num.get(), :, :])
333332
elif self.axis.get() == 1:
@@ -339,7 +338,7 @@ def plot_plane(self):
339338
self.canvas.draw()
340339

341340
def colorrange_upd(self):
342-
"""change color range in plot"""
341+
"""Change color range in plot."""
343342
try:
344343
if self.colorbarmin.get() and self.colorbarmax.get():
345344
vmin = float(self.colorbarmin.get())
@@ -359,7 +358,8 @@ def colorrange_upd(self):
359358
self.plot_plane()
360359

361360
def intensity_upd_local(self):
362-
"""show local intensity minimum, maximum and sum of current plotted plane"""
361+
"""Show local intensity minimum, maximum and sum of current plotted
362+
plane."""
363363
if self.axis.get() == 0:
364364
plane = self.cube[self.plane_num.get(), :, :]
365365
elif self.axis.get() == 1:
@@ -373,7 +373,7 @@ def intensity_upd_local(self):
373373
self.localnanratio["text"] = f"{round(nan_ratio, 2)}"
374374

375375
def intensity_upd_global(self):
376-
"""Load global intensity minimum, maximum and sum of 3D array"""
376+
"""Load global intensity minimum, maximum and sum of 3D array."""
377377
self.intensity_upd_local()
378378
nan_ratio = np.count_nonzero(np.isnan(self.cube)) / self.cube.size
379379
self.globalmax["text"] = f"{np.format_float_scientific(np.nanmax(self.cube), 1)}"
@@ -382,10 +382,8 @@ def intensity_upd_global(self):
382382
self.globalnanratio["text"] = "{}".format(round(nan_ratio, 2))
383383

384384
def fft(self):
385-
"""
386-
Fourier transform 3D array from reciprocal to real space
387-
the origin of reciprocal and real space is expected to be the central voxel
388-
"""
385+
"""Fourier transform 3D array from reciprocal to real space the origin
386+
of reciprocal and real space is expected to be the central voxel."""
389387

390388
def perform_fft(fftholder):
391389
fftholder = np.nan_to_num(fftholder)
@@ -438,10 +436,9 @@ def perform_fft(fftholder):
438436
self.intensity_upd_global()
439437

440438
def ifft(self):
441-
"""
442-
Inverse Fourier transform 3D array from real to reciprocal space
443-
the origin of real and reciprocal space is expected to be the central voxel
444-
"""
439+
"""Inverse Fourier transform 3D array from real to reciprocal space the
440+
origin of real and reciprocal space is expected to be the central
441+
voxel."""
445442
if not self.cutoff.get():
446443
self.cube_real = self.cube
447444
self.cube = self.cube_reci
@@ -455,8 +452,7 @@ def ifft(self):
455452
self.intensity_upd_global()
456453

457454
def applycutoff(self):
458-
"""
459-
shape the reciprocal-space array
455+
"""Shape the reciprocal-space array.
460456
461457
reassign all voxels with distance smaller than qmin and greater than qmax
462458
to np.nan.
@@ -507,9 +503,8 @@ def applycutoff(self):
507503
self.intensity_upd_global()
508504

509505
def redocutuff(self):
510-
"""
511-
Redo the cutoff operation depending on the current space (real or reciprocal).
512-
"""
506+
"""Redo the cutoff operation depending on the current space (real or
507+
reciprocal)."""
513508
if self.space.get(): # in real space
514509
self.cube_realcut = self.cube
515510
if not self.transformed:
@@ -522,9 +517,8 @@ def redocutuff(self):
522517
self.intensity_upd_global()
523518

524519
def newcutoff(self):
525-
"""
526-
Apply a new cutoff based on the current space and cutoff settings.
527-
"""
520+
"""Apply a new cutoff based on the current space and cutoff
521+
settings."""
528522
if self.cutoff.get():
529523
if self.space.get() and self.transformed:
530524
self.cube = self.cube_real
@@ -535,9 +529,8 @@ def newcutoff(self):
535529
self.applycutoff()
536530

537531
def plot_next_plane(self):
538-
"""
539-
Plot the next plane in the dataset, looping back to the first if at the end.
540-
"""
532+
"""Plot the next plane in the dataset, looping back to the first if at
533+
the end."""
541534
n = self.plane_num.get()
542535
if n == len(self.cube[self.axis.get()]) - 1:
543536
n = 0
@@ -547,9 +540,7 @@ def plot_next_plane(self):
547540
self.plot_plane()
548541

549542
def animation(self):
550-
"""
551-
slices through the 3D array along the selected axis
552-
"""
543+
"""Slices through the 3D array along the selected axis."""
553544
try:
554545
if not self.anientry.get():
555546
anispeed = 1
@@ -563,9 +554,7 @@ def animation(self):
563554
self.plot_next_plane()
564555

565556
def multiple_funcs(*funcs):
566-
"""
567-
Executes multiple functions passed as arguments in sequence.
568-
"""
557+
"""Executes multiple functions passed as arguments in sequence."""
569558
for func in funcs:
570559
func
571560

Diff for: src/diffpy/fourigui/version.py

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# See LICENSE.rst for license information.
1313
#
1414
##############################################################################
15-
1615
"""Definition of __version__."""
1716

1817
# We do not use the other three variables, but can be added back if needed.

Diff for: tests/test_version.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
"""Unit tests for __version__.py
2-
"""
1+
"""Unit tests for __version__.py."""
32

43
import diffpy.fourigui
54

65

76
def test_package_version():
8-
"""Ensure the package version is defined and not set to the initial placeholder."""
7+
"""Ensure the package version is defined and not set to the initial
8+
placeholder."""
99
assert hasattr(diffpy.fourigui, "__version__")
1010
assert diffpy.fourigui.__version__ != "0.0.0"

0 commit comments

Comments
 (0)