ruff set isort.split-on-trailing-comma = false

unsplit existing 1-line imports astral-sh/ruff#4153
lbluque · May 23, 2023 · e726376 · e726376
1 parent 9c7ff46
commit e726376
Show file tree

Hide file tree

Showing 67 changed files with 84 additions and 359 deletions.
diff --git a/dev_scripts/chemenv/check_new_coordination_geometry.py b/dev_scripts/chemenv/check_new_coordination_geometry.py
@@ -2,12 +2,8 @@
 
 import logging
 
-from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import (
-    AllCoordinationGeometries,
-)
-from pymatgen.analysis.chemenv.coordination_environments.coordination_geometry_finder import (
-    LocalGeometryFinder,
-)
+from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import AllCoordinationGeometries
+from pymatgen.analysis.chemenv.coordination_environments.coordination_geometry_finder import LocalGeometryFinder
 
 allcg = AllCoordinationGeometries()
 

diff --git a/dev_scripts/chemenv/explicit_permutations_plane_algorithm.py b/dev_scripts/chemenv/explicit_permutations_plane_algorithm.py
@@ -10,9 +10,7 @@
 
 import numpy as np
 
-from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import (
-    AllCoordinationGeometries,
-)
+from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import AllCoordinationGeometries
 from pymatgen.analysis.chemenv.coordination_environments.coordination_geometry_finder import (
     AbstractGeometry,
     LocalGeometryFinder,

diff --git a/dev_scripts/chemenv/get_plane_permutations_optimized.py b/dev_scripts/chemenv/get_plane_permutations_optimized.py
@@ -16,9 +16,7 @@
 import numpy as np
 import tabulate
 
-from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import (
-    AllCoordinationGeometries,
-)
+from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import AllCoordinationGeometries
 from pymatgen.analysis.chemenv.coordination_environments.coordination_geometry_finder import (
     AbstractGeometry,
     LocalGeometryFinder,

diff --git a/dev_scripts/chemenv/plane_multiplicity.py b/dev_scripts/chemenv/plane_multiplicity.py
@@ -4,9 +4,7 @@
 
 from __future__ import annotations
 
-from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import (
-    AllCoordinationGeometries,
-)
+from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import AllCoordinationGeometries
 
 __author__ = "David Waroquiers"
 __copyright__ = "Copyright 2012, The Materials Project"

diff --git a/dev_scripts/chemenv/strategies/multi_weights_strategy_parameters.py b/dev_scripts/chemenv/strategies/multi_weights_strategy_parameters.py
@@ -20,9 +20,7 @@
     NormalizedAngleDistanceNbSetWeight,
     SelfCSMNbSetWeight,
 )
-from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import (
-    AllCoordinationGeometries,
-)
+from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import AllCoordinationGeometries
 from pymatgen.analysis.chemenv.coordination_environments.coordination_geometry_finder import (
     AbstractGeometry,
     LocalGeometryFinder,

diff --git a/dev_scripts/chemenv/test_algos.py b/dev_scripts/chemenv/test_algos.py
@@ -11,9 +11,7 @@
 
 import numpy as np
 
-from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import (
-    AllCoordinationGeometries,
-)
+from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import AllCoordinationGeometries
 from pymatgen.analysis.chemenv.coordination_environments.coordination_geometry_finder import (
     AbstractGeometry,
     LocalGeometryFinder,

diff --git a/dev_scripts/chemenv/test_algos_all_geoms.py b/dev_scripts/chemenv/test_algos_all_geoms.py
@@ -8,9 +8,7 @@
 from math import factorial
 from random import shuffle
 
-from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import (
-    AllCoordinationGeometries,
-)
+from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import AllCoordinationGeometries
 from pymatgen.analysis.chemenv.coordination_environments.coordination_geometry_finder import (
     AbstractGeometry,
     LocalGeometryFinder,

diff --git a/pymatgen/analysis/chemenv/connectivity/structure_connectivity.py b/pymatgen/analysis/chemenv/connectivity/structure_connectivity.py
@@ -11,15 +11,9 @@
 import numpy as np
 from monty.json import MSONable, jsanitize
 
-from pymatgen.analysis.chemenv.connectivity.connected_components import (
-    ConnectedComponent,
-)
-from pymatgen.analysis.chemenv.connectivity.environment_nodes import (
-    get_environment_node,
-)
-from pymatgen.analysis.chemenv.coordination_environments.structure_environments import (
-    LightStructureEnvironments,
-)
+from pymatgen.analysis.chemenv.connectivity.connected_components import ConnectedComponent
+from pymatgen.analysis.chemenv.connectivity.environment_nodes import get_environment_node
+from pymatgen.analysis.chemenv.coordination_environments.structure_environments import LightStructureEnvironments
 
 __author__ = "David Waroquiers"
 __copyright__ = "Copyright 2012, The Materials Project"

diff --git a/pymatgen/analysis/chemenv/connectivity/tests/test_connected_components.py b/pymatgen/analysis/chemenv/connectivity/tests/test_connected_components.py
@@ -8,19 +8,11 @@
 import numpy as np
 import pytest
 
-from pymatgen.analysis.chemenv.connectivity.connected_components import (
-    ConnectedComponent,
-)
-from pymatgen.analysis.chemenv.connectivity.connectivity_finder import (
-    ConnectivityFinder,
-)
+from pymatgen.analysis.chemenv.connectivity.connected_components import ConnectedComponent
+from pymatgen.analysis.chemenv.connectivity.connectivity_finder import ConnectivityFinder
 from pymatgen.analysis.chemenv.connectivity.environment_nodes import EnvironmentNode
-from pymatgen.analysis.chemenv.coordination_environments.chemenv_strategies import (
-    SimplestChemenvStrategy,
-)
-from pymatgen.analysis.chemenv.coordination_environments.coordination_geometry_finder import (
-    LocalGeometryFinder,
-)
+from pymatgen.analysis.chemenv.coordination_environments.chemenv_strategies import SimplestChemenvStrategy
+from pymatgen.analysis.chemenv.coordination_environments.coordination_geometry_finder import LocalGeometryFinder
 from pymatgen.analysis.chemenv.coordination_environments.structure_environments import (
     LightStructureEnvironments,
     StructureEnvironments,

diff --git a/pymatgen/analysis/chemenv/connectivity/tests/test_structure_connectivity.py b/pymatgen/analysis/chemenv/connectivity/tests/test_structure_connectivity.py
@@ -3,15 +3,9 @@
 import json
 import os
 
-from pymatgen.analysis.chemenv.connectivity.connectivity_finder import (
-    ConnectivityFinder,
-)
-from pymatgen.analysis.chemenv.connectivity.structure_connectivity import (
-    StructureConnectivity,
-)
-from pymatgen.analysis.chemenv.coordination_environments.chemenv_strategies import (
-    SimplestChemenvStrategy,
-)
+from pymatgen.analysis.chemenv.connectivity.connectivity_finder import ConnectivityFinder
+from pymatgen.analysis.chemenv.connectivity.structure_connectivity import StructureConnectivity
+from pymatgen.analysis.chemenv.coordination_environments.chemenv_strategies import SimplestChemenvStrategy
 from pymatgen.analysis.chemenv.coordination_environments.structure_environments import (
     LightStructureEnvironments,
     StructureEnvironments,

diff --git a/pymatgen/analysis/chemenv/coordination_environments/chemenv_strategies.py b/pymatgen/analysis/chemenv/coordination_environments/chemenv_strategies.py
@@ -14,16 +14,10 @@
 from monty.json import MSONable
 from scipy.stats import gmean
 
-from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import (
-    AllCoordinationGeometries,
-)
-from pymatgen.analysis.chemenv.coordination_environments.voronoi import (
-    DetailedVoronoiContainer,
-)
+from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import AllCoordinationGeometries
+from pymatgen.analysis.chemenv.coordination_environments.voronoi import DetailedVoronoiContainer
 from pymatgen.analysis.chemenv.utils.chemenv_errors import EquivalentSiteSearchError
-from pymatgen.analysis.chemenv.utils.coordination_geometry_utils import (
-    get_lower_and_upper_f,
-)
+from pymatgen.analysis.chemenv.utils.coordination_geometry_utils import get_lower_and_upper_f
 from pymatgen.analysis.chemenv.utils.defs_utils import AdditionalConditions
 from pymatgen.analysis.chemenv.utils.func_utils import (
     CSMFiniteRatioFunction,

diff --git a/pymatgen/analysis/chemenv/coordination_environments/coordination_geometry_finder.py b/pymatgen/analysis/chemenv/coordination_environments/coordination_geometry_finder.py
@@ -23,9 +23,7 @@
 from numpy.linalg import norm, svd
 
 from pymatgen.analysis.bond_valence import BVAnalyzer
-from pymatgen.analysis.chemenv.coordination_environments.chemenv_strategies import (
-    MultiWeightsChemenvStrategy,
-)
+from pymatgen.analysis.chemenv.coordination_environments.chemenv_strategies import MultiWeightsChemenvStrategy
 from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import (
     EXPLICIT_PERMUTATIONS,
     SEPARATION_PLANE,
@@ -36,9 +34,7 @@
     LightStructureEnvironments,
     StructureEnvironments,
 )
-from pymatgen.analysis.chemenv.coordination_environments.voronoi import (
-    DetailedVoronoiContainer,
-)
+from pymatgen.analysis.chemenv.coordination_environments.voronoi import DetailedVoronoiContainer
 from pymatgen.analysis.chemenv.utils.coordination_geometry_utils import (
     Plane,
     collinear,

diff --git a/pymatgen/analysis/chemenv/coordination_environments/structure_environments.py b/pymatgen/analysis/chemenv/coordination_environments/structure_environments.py
@@ -11,12 +11,8 @@
 import numpy as np
 from monty.json import MontyDecoder, MSONable, jsanitize
 
-from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import (
-    AllCoordinationGeometries,
-)
-from pymatgen.analysis.chemenv.coordination_environments.voronoi import (
-    DetailedVoronoiContainer,
-)
+from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import AllCoordinationGeometries
+from pymatgen.analysis.chemenv.coordination_environments.voronoi import DetailedVoronoiContainer
 from pymatgen.analysis.chemenv.utils.chemenv_errors import ChemenvError
 from pymatgen.analysis.chemenv.utils.defs_utils import AdditionalConditions
 from pymatgen.core.periodic_table import Element, Species

diff --git a/...gen/analysis/chemenv/coordination_environments/tests/test_coordination_geometry_finder.py b/...gen/analysis/chemenv/coordination_environments/tests/test_coordination_geometry_finder.py
@@ -6,9 +6,7 @@
 import numpy as np
 import pytest
 
-from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import (
-    AllCoordinationGeometries,
-)
+from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import AllCoordinationGeometries
 from pymatgen.analysis.chemenv.coordination_environments.coordination_geometry_finder import (
     AbstractGeometry,
     LocalGeometryFinder,

diff --git a/pymatgen/analysis/chemenv/coordination_environments/tests/test_read_write.py b/pymatgen/analysis/chemenv/coordination_environments/tests/test_read_write.py
@@ -18,16 +18,12 @@
     SelfCSMNbSetWeight,
     SimplestChemenvStrategy,
 )
-from pymatgen.analysis.chemenv.coordination_environments.coordination_geometry_finder import (
-    LocalGeometryFinder,
-)
+from pymatgen.analysis.chemenv.coordination_environments.coordination_geometry_finder import LocalGeometryFinder
 from pymatgen.analysis.chemenv.coordination_environments.structure_environments import (
     LightStructureEnvironments,
     StructureEnvironments,
 )
-from pymatgen.analysis.chemenv.coordination_environments.voronoi import (
-    DetailedVoronoiContainer,
-)
+from pymatgen.analysis.chemenv.coordination_environments.voronoi import DetailedVoronoiContainer
 from pymatgen.core.structure import Structure
 from pymatgen.util.testing import PymatgenTest
 

diff --git a/pymatgen/analysis/chemenv/coordination_environments/tests/test_voronoi.py b/pymatgen/analysis/chemenv/coordination_environments/tests/test_voronoi.py
@@ -7,9 +7,7 @@
 import numpy as np
 from monty.tempfile import ScratchDir
 
-from pymatgen.analysis.chemenv.coordination_environments.voronoi import (
-    DetailedVoronoiContainer,
-)
+from pymatgen.analysis.chemenv.coordination_environments.voronoi import DetailedVoronoiContainer
 from pymatgen.core.lattice import Lattice
 from pymatgen.core.structure import Structure
 from pymatgen.util.testing import PymatgenTest

diff --git a/pymatgen/analysis/chemenv/coordination_environments/tests/test_weights.py b/pymatgen/analysis/chemenv/coordination_environments/tests/test_weights.py
@@ -17,9 +17,7 @@
     NormalizedAngleDistanceNbSetWeight,
     SelfCSMNbSetWeight,
 )
-from pymatgen.analysis.chemenv.coordination_environments.structure_environments import (
-    StructureEnvironments,
-)
+from pymatgen.analysis.chemenv.coordination_environments.structure_environments import StructureEnvironments
 from pymatgen.util.testing import PymatgenTest
 
 __author__ = "waroquiers"

diff --git a/pymatgen/analysis/chemenv/utils/defs_utils.py b/pymatgen/analysis/chemenv/utils/defs_utils.py
@@ -6,9 +6,7 @@
 
 from typing import TYPE_CHECKING
 
-from pymatgen.analysis.chemenv.utils.coordination_geometry_utils import (
-    is_anion_cation_bond,
-)
+from pymatgen.analysis.chemenv.utils.coordination_geometry_utils import is_anion_cation_bond
 
 if TYPE_CHECKING:
     from pymatgen.core import Structure

diff --git a/pymatgen/analysis/chemenv/utils/scripts_utils.py b/pymatgen/analysis/chemenv/utils/scripts_utils.py
@@ -9,9 +9,7 @@
 
 import numpy as np
 
-from pymatgen.analysis.chemenv.coordination_environments.chemenv_strategies import (
-    SimplestChemenvStrategy,
-)
+from pymatgen.analysis.chemenv.coordination_environments.chemenv_strategies import SimplestChemenvStrategy
 from pymatgen.analysis.chemenv.coordination_environments.coordination_geometries import (
     UNCLEAR_ENVIRONMENT_SYMBOL,
     AllCoordinationGeometries,
@@ -20,9 +18,7 @@
     AbstractGeometry,
     LocalGeometryFinder,
 )
-from pymatgen.analysis.chemenv.utils.chemenv_errors import (
-    NeighborsNotComputedChemenvError,
-)
+from pymatgen.analysis.chemenv.utils.chemenv_errors import NeighborsNotComputedChemenvError
 from pymatgen.analysis.chemenv.utils.coordination_geometry_utils import rotateCoords
 from pymatgen.core.sites import PeriodicSite
 from pymatgen.core.structure import Molecule

diff --git a/pymatgen/analysis/chemenv/utils/tests/test_graph_utils.py b/pymatgen/analysis/chemenv/utils/tests/test_graph_utils.py
@@ -4,11 +4,7 @@
 import pytest
 
 from pymatgen.analysis.chemenv.connectivity.environment_nodes import EnvironmentNode
-from pymatgen.analysis.chemenv.utils.graph_utils import (
-    MultiGraphCycle,
-    SimpleGraphCycle,
-    get_delta,
-)
+from pymatgen.analysis.chemenv.utils.graph_utils import MultiGraphCycle, SimpleGraphCycle, get_delta
 from pymatgen.util.testing import PymatgenTest
 
 __author__ = "waroquiers"

diff --git a/pymatgen/analysis/elasticity/elastic.py b/pymatgen/analysis/elasticity/elastic.py
@@ -18,13 +18,7 @@
 
 from pymatgen.analysis.elasticity.strain import Strain
 from pymatgen.analysis.elasticity.stress import Stress
-from pymatgen.core.tensors import (
-    DEFAULT_QUAD,
-    SquareTensor,
-    Tensor,
-    TensorCollection,
-    get_uvec,
-)
+from pymatgen.core.tensors import DEFAULT_QUAD, SquareTensor, Tensor, TensorCollection, get_uvec
 from pymatgen.core.units import Unit
 
 if TYPE_CHECKING:

diff --git a/pymatgen/analysis/elasticity/tests/test_strain.py b/pymatgen/analysis/elasticity/tests/test_strain.py
@@ -6,12 +6,7 @@
 import numpy as np
 import pytest
 
-from pymatgen.analysis.elasticity.strain import (
-    Deformation,
-    DeformedStructureSet,
-    Strain,
-    convert_strain_to_deformation,
-)
+from pymatgen.analysis.elasticity.strain import Deformation, DeformedStructureSet, Strain, convert_strain_to_deformation
 from pymatgen.core.lattice import Lattice
 from pymatgen.core.structure import Structure
 from pymatgen.core.tensors import Tensor

diff --git a/pymatgen/analysis/interfaces/__init__.py b/pymatgen/analysis/interfaces/__init__.py
@@ -5,8 +5,5 @@
 from __future__ import annotations
 
 from pymatgen.analysis.interfaces.coherent_interfaces import CoherentInterfaceBuilder
-from pymatgen.analysis.interfaces.substrate_analyzer import (
-    SubstrateAnalyzer,
-    SubstrateMatch,
-)
+from pymatgen.analysis.interfaces.substrate_analyzer import SubstrateAnalyzer, SubstrateMatch
 from pymatgen.analysis.interfaces.zsl import ZSLGenerator, ZSLMatch
diff --git a/pymatgen/analysis/magnetism/analyzer.py b/pymatgen/analysis/magnetism/analyzer.py
@@ -21,13 +21,8 @@
 from pymatgen.electronic_structure.core import Magmom
 from pymatgen.symmetry.analyzer import SpacegroupAnalyzer
 from pymatgen.symmetry.groups import SpaceGroup
-from pymatgen.transformations.advanced_transformations import (
-    MagOrderingTransformation,
-    MagOrderParameterConstraint,
-)
-from pymatgen.transformations.standard_transformations import (
-    AutoOxiStateDecorationTransformation,
-)
+from pymatgen.transformations.advanced_transformations import MagOrderingTransformation, MagOrderParameterConstraint
+from pymatgen.transformations.standard_transformations import AutoOxiStateDecorationTransformation
 
 if TYPE_CHECKING:
     from pymatgen.util.typing import VectorLike

diff --git a/pymatgen/analysis/magnetism/jahnteller.py b/pymatgen/analysis/magnetism/jahnteller.py
@@ -11,10 +11,7 @@
 import numpy as np
 
 from pymatgen.analysis.bond_valence import BVAnalyzer
-from pymatgen.analysis.local_env import (
-    LocalStructOrderParams,
-    get_neighbors_of_site_with_index,
-)
+from pymatgen.analysis.local_env import LocalStructOrderParams, get_neighbors_of_site_with_index
 from pymatgen.core.periodic_table import Species, get_el_sp
 from pymatgen.symmetry.analyzer import SpacegroupAnalyzer
 

diff --git a/pymatgen/analysis/structure_prediction/dopant_predictor.py b/pymatgen/analysis/structure_prediction/dopant_predictor.py
@@ -8,9 +8,7 @@
 
 import numpy as np
 
-from pymatgen.analysis.structure_prediction.substitution_probability import (
-    SubstitutionPredictor,
-)
+from pymatgen.analysis.structure_prediction.substitution_probability import SubstitutionPredictor
 from pymatgen.core.periodic_table import Element, Species
 
 

diff --git a/pymatgen/analysis/structure_prediction/substitutor.py b/pymatgen/analysis/structure_prediction/substitutor.py
@@ -14,9 +14,7 @@
 from pymatgen.alchemy.filters import RemoveDuplicatesFilter, RemoveExistingFilter
 from pymatgen.alchemy.materials import TransformedStructure
 from pymatgen.alchemy.transmuters import StandardTransmuter
-from pymatgen.analysis.structure_prediction.substitution_probability import (
-    SubstitutionProbability,
-)
+from pymatgen.analysis.structure_prediction.substitution_probability import SubstitutionProbability
 from pymatgen.core.periodic_table import get_el_sp
 from pymatgen.transformations.standard_transformations import SubstitutionTransformation
 

diff --git a/pymatgen/analysis/structure_prediction/tests/test_volume_predictor.py b/pymatgen/analysis/structure_prediction/tests/test_volume_predictor.py
@@ -7,10 +7,7 @@
 import pytest
 from pytest import approx
 
-from pymatgen.analysis.structure_prediction.volume_predictor import (
-    DLSVolumePredictor,
-    RLSVolumePredictor,
-)
+from pymatgen.analysis.structure_prediction.volume_predictor import DLSVolumePredictor, RLSVolumePredictor
 from pymatgen.core import Structure
 from pymatgen.util.testing import PymatgenTest