diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index db5cc13d..08e547e0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ repos: - repo: https://github.com/psf/black-pre-commit-mirror # Version can be updated by running "pre-commit autoupdate" - rev: 25.12.0 + rev: 26.1.0 hooks: - id: black ci: diff --git a/diffsims/generators/diffraction_generator.py b/diffsims/generators/diffraction_generator.py index 75661bd4..c3efd39d 100644 --- a/diffsims/generators/diffraction_generator.py +++ b/diffsims/generators/diffraction_generator.py @@ -41,7 +41,6 @@ lorentzian_precession, ) - __all__ = [ "AtomicDiffractionGenerator", "DiffractionGenerator", diff --git a/diffsims/generators/library_generator.py b/diffsims/generators/library_generator.py index c82785b9..b711a3ec 100644 --- a/diffsims/generators/library_generator.py +++ b/diffsims/generators/library_generator.py @@ -27,7 +27,6 @@ from diffsims.utils.sim_utils import get_points_in_sphere from diffsims.utils.vector_utils import get_angle_cartesian_vec - __all__ = [ "DiffractionLibraryGenerator", "VectorLibraryGenerator", diff --git a/diffsims/generators/rotation_list_generators.py b/diffsims/generators/rotation_list_generators.py index a72273e0..241be0de 100644 --- a/diffsims/generators/rotation_list_generators.py +++ b/diffsims/generators/rotation_list_generators.py @@ -32,7 +32,6 @@ beam_directions_grid_to_euler, ) - __all__ = [ "get_beam_directions_grid", "get_fundamental_zone_grid", diff --git a/diffsims/generators/sphere_mesh_generators.py b/diffsims/generators/sphere_mesh_generators.py index 1fd6040b..d4ad919f 100644 --- a/diffsims/generators/sphere_mesh_generators.py +++ b/diffsims/generators/sphere_mesh_generators.py @@ -22,7 +22,6 @@ from diffsims.utils.vector_utils import vectorised_spherical_polars_to_cartesians - __all__ = [ "beam_directions_grid_to_euler", "get_cube_mesh_vertices", diff --git a/diffsims/generators/zap_map_generator.py b/diffsims/generators/zap_map_generator.py index 30be3bab..681e469a 100644 --- a/diffsims/generators/zap_map_generator.py +++ b/diffsims/generators/zap_map_generator.py @@ -19,7 +19,6 @@ import numpy as np from transforms3d.euler import axangle2euler - __all__ = [ "corners_to_centroid_and_edge_centers", "generate_directional_simulations", diff --git a/diffsims/libraries/diffraction_library.py b/diffsims/libraries/diffraction_library.py index c81c1c55..6adf8b2f 100644 --- a/diffsims/libraries/diffraction_library.py +++ b/diffsims/libraries/diffraction_library.py @@ -20,7 +20,6 @@ import numpy as np - __all__ = [ "DiffractionLibrary", "load_DiffractionLibrary", diff --git a/diffsims/libraries/vector_library.py b/diffsims/libraries/vector_library.py index fddfaad1..d9bc038b 100644 --- a/diffsims/libraries/vector_library.py +++ b/diffsims/libraries/vector_library.py @@ -18,7 +18,6 @@ import pickle - __all__ = [ "DiffractionVectorLibrary", "load_VectorLibrary", @@ -48,10 +47,8 @@ def load_VectorLibrary(filename, safety=False): with open(filename, "rb") as handle: return pickle.load(handle) else: - raise RuntimeError( - "Unpickling is risky, turn safety to True if \ - trust the author of this content" - ) + raise RuntimeError("Unpickling is risky, turn safety to True if \ + trust the author of this content") class DiffractionVectorLibrary(dict): diff --git a/diffsims/pattern/detector_functions.py b/diffsims/pattern/detector_functions.py index 8d72bff1..2cc4cc62 100644 --- a/diffsims/pattern/detector_functions.py +++ b/diffsims/pattern/detector_functions.py @@ -24,7 +24,6 @@ from numpy.random import default_rng from scipy import ndimage as ndi - __all__ = [ "add_dead_pixels", "add_detector_offset", diff --git a/diffsims/sims/diffraction_simulation.py b/diffsims/sims/diffraction_simulation.py index 274e9528..fb369205 100644 --- a/diffsims/sims/diffraction_simulation.py +++ b/diffsims/sims/diffraction_simulation.py @@ -23,7 +23,6 @@ from diffsims.pattern.detector_functions import add_shot_and_point_spread from diffsims.utils import mask_utils - __all__ = [ "DiffractionSimulation", "ProfileSimulation", diff --git a/diffsims/structure_factor/structure_factor.py b/diffsims/structure_factor/structure_factor.py index aed9146d..6f748a15 100644 --- a/diffsims/structure_factor/structure_factor.py +++ b/diffsims/structure_factor/structure_factor.py @@ -25,7 +25,6 @@ get_doyleturner_atomic_scattering_factor, ) - rest_mass = physical_constants["atomic unit of mass"][0] # rest_mass = 9.109383709e-31 # Used by EMsoft diff --git a/diffsims/utils/atomic_diffraction_generator_utils.py b/diffsims/utils/atomic_diffraction_generator_utils.py index 8c82f41a..da939766 100644 --- a/diffsims/utils/atomic_diffraction_generator_utils.py +++ b/diffsims/utils/atomic_diffraction_generator_utils.py @@ -31,7 +31,6 @@ ) from diffsims.utils.generic_utils import to_mesh - __all__ = [ "get_diffraction_image", "grid2sphere", diff --git a/diffsims/utils/fourier_transform.py b/diffsims/utils/fourier_transform.py index bf540b0c..fd1f8ed6 100644 --- a/diffsims/utils/fourier_transform.py +++ b/diffsims/utils/fourier_transform.py @@ -28,7 +28,6 @@ from numpy.fft import fftfreq import numba - __all__ = [ "convolve", "fast_abs", diff --git a/diffsims/utils/generic_utils.py b/diffsims/utils/generic_utils.py index 3fa8759a..7c20d284 100644 --- a/diffsims/utils/generic_utils.py +++ b/diffsims/utils/generic_utils.py @@ -23,10 +23,10 @@ @author: Rob Tovey """ + from numpy import isscalar, zeros, array import numba - __all__ = [ "GLOBAL_BOOL", "get_grid", diff --git a/diffsims/utils/kinematic_simulation_utils.py b/diffsims/utils/kinematic_simulation_utils.py index 722fffc2..167f99e4 100644 --- a/diffsims/utils/kinematic_simulation_utils.py +++ b/diffsims/utils/kinematic_simulation_utils.py @@ -23,6 +23,7 @@ @author: Rob Tovey """ + from numpy import array, pi, sin, cos, empty from scipy.interpolate import interpn @@ -36,7 +37,6 @@ ) from diffsims.utils.generic_utils import to_mesh - __all__ = [ "get_diffraction_image", "grid2sphere", diff --git a/diffsims/utils/probe_utils.py b/diffsims/utils/probe_utils.py index d5ac84e5..8af1603a 100644 --- a/diffsims/utils/probe_utils.py +++ b/diffsims/utils/probe_utils.py @@ -21,6 +21,7 @@ @author: Rob Tovey """ + import numba from math import sqrt as c_sqrt from numpy import empty, maximum, sqrt, arange, pi, linspace, ones diff --git a/diffsims/utils/shape_factor_models.py b/diffsims/utils/shape_factor_models.py index 69cadc46..b8148d36 100644 --- a/diffsims/utils/shape_factor_models.py +++ b/diffsims/utils/shape_factor_models.py @@ -19,7 +19,6 @@ import numpy as np from scipy.integrate import quad - __all__ = [ "atanc", "binary", diff --git a/diffsims/utils/sim_utils.py b/diffsims/utils/sim_utils.py index 76118b78..eda90fee 100644 --- a/diffsims/utils/sim_utils.py +++ b/diffsims/utils/sim_utils.py @@ -28,7 +28,6 @@ from diffsims.utils.lobato_scattering_params import ATOMIC_SCATTERING_PARAMS_LOBATO from diffsims.structure_factor.atomic_scattering_parameters import get_element - __all__ = [ "acceleration_voltage_to_relativistic_mass", "acceleration_voltage_to_velocity", diff --git a/diffsims/utils/vector_utils.py b/diffsims/utils/vector_utils.py index 77fc6e23..c54d7278 100644 --- a/diffsims/utils/vector_utils.py +++ b/diffsims/utils/vector_utils.py @@ -20,7 +20,6 @@ import numpy as np - __all__ = [ "get_angle_cartesian", "get_angle_cartesian_vec", diff --git a/examples/creating_a_simulation_library/migration_guide.py b/examples/creating_a_simulation_library/migration_guide.py index 613572dd..c2069ff1 100644 --- a/examples/creating_a_simulation_library/migration_guide.py +++ b/examples/creating_a_simulation_library/migration_guide.py @@ -18,7 +18,6 @@ from diffsims.generators.diffraction_generator import DiffractionGenerator from diffsims.generators.library_generator import DiffractionLibraryGenerator - latt = Lattice(4, 4, 4, 90, 90, 90) atoms = [ Atom(atype="Al", xyz=[0.0, 0.0, 0.0], lattice=latt),