Skip to content

Commit

Permalink
MAINT: use absolute imports only
Browse files Browse the repository at this point in the history
  • Loading branch information
redeboer committed Mar 3, 2024
1 parent a6663c7 commit 6201fc3
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 38 deletions.
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,9 @@ ignore = [
]
task-tags = ["cspell"]

[tool.ruff.lint.flake8-tidy-imports]
ban-relative-imports = "all"

[tool.ruff.lint.isort]
split-on-trailing-comma = false

Expand Down
23 changes: 14 additions & 9 deletions src/qrules/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

import attrs

from . import io
from .combinatorics import InitialFacts, StateDefinition, create_initial_facts
from .conservation_rules import (
from qrules import io
from qrules.combinatorics import InitialFacts, StateDefinition, create_initial_facts
from qrules.conservation_rules import (
BaryonNumberConservation,
BottomnessConservation,
ChargeConservation,
Expand All @@ -45,17 +45,22 @@
parity_conservation,
spin_magnitude_conservation,
)
from .particle import ParticleCollection, load_pdg
from .quantum_numbers import InteractionProperties
from .settings import (
from qrules.particle import ParticleCollection, load_pdg
from qrules.quantum_numbers import InteractionProperties
from qrules.settings import (
ADDITIONAL_PARTICLES_DEFINITIONS_PATH,
InteractionType,
_halves_domain,
_int_domain,
)
from .solving import NodeSettings, QNResult, Rule, validate_full_solution
from .topology import MutableTransition, create_n_body_topology
from .transition import EdgeSettings, ProblemSet, ReactionInfo, StateTransitionManager
from qrules.solving import NodeSettings, QNResult, Rule, validate_full_solution
from qrules.topology import MutableTransition, create_n_body_topology
from qrules.transition import (
EdgeSettings,
ProblemSet,
ReactionInfo,
StateTransitionManager,
)


def check_reaction_violations( # noqa: C901, PLR0917
Expand Down
4 changes: 2 additions & 2 deletions src/qrules/argument_handling.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

import attrs

from .conservation_rules import (
from qrules.conservation_rules import (
ConservationRule,
EdgeQNConservationRule,
GraphElementRule,
)
from .quantum_numbers import EdgeQuantumNumber, NodeQuantumNumber, Parity
from qrules.quantum_numbers import EdgeQuantumNumber, NodeQuantumNumber, Parity

Scalar = Union[int, float]

Expand Down
6 changes: 3 additions & 3 deletions src/qrules/conservation_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
from attrs import define, field, frozen
from attrs.converters import optional

from .quantum_numbers import EdgeQuantumNumbers as EdgeQN
from .quantum_numbers import NodeQuantumNumbers as NodeQN
from .quantum_numbers import arange
from qrules.quantum_numbers import EdgeQuantumNumbers as EdgeQN
from qrules.quantum_numbers import NodeQuantumNumbers as NodeQN
from qrules.quantum_numbers import arange

if sys.version_info >= (3, 8):
from typing import Protocol
Expand Down
3 changes: 1 addition & 2 deletions src/qrules/io/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
import attrs
import yaml

from qrules.io import _dict, _dot
from qrules.particle import Particle, ParticleCollection
from qrules.topology import Topology

from . import _dict, _dot


def asdict(instance: object) -> dict:
if isinstance(instance, ParticleCollection):
Expand Down
4 changes: 2 additions & 2 deletions src/qrules/particle.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
from attrs.converters import optional
from attrs.validators import instance_of

from .conservation_rules import GellMannNishijimaInput, gellmann_nishijima
from .quantum_numbers import Parity, _to_fraction
from qrules.conservation_rules import GellMannNishijimaInput, gellmann_nishijima
from qrules.quantum_numbers import Parity, _to_fraction

if TYPE_CHECKING:
from IPython.lib.pretty import PrettyPrinter
Expand Down
11 changes: 7 additions & 4 deletions src/qrules/solving.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
from constraint import BacktrackingSolver, Constraint, Problem, Unassigned, Variable

from qrules._implementers import implement_pretty_repr

from .argument_handling import (
from qrules.argument_handling import (
GraphEdgePropertyMap,
GraphElementRule,
GraphNodePropertyMap,
Expand All @@ -31,8 +30,12 @@
Scalar,
get_required_qns,
)
from .quantum_numbers import EdgeQuantumNumber, EdgeQuantumNumbers, NodeQuantumNumber
from .topology import MutableTransition, Topology
from qrules.quantum_numbers import (
EdgeQuantumNumber,
EdgeQuantumNumbers,
NodeQuantumNumber,
)
from qrules.topology import MutableTransition, Topology

if sys.version_info >= (3, 10):
from typing import TypeAlias
Expand Down
10 changes: 5 additions & 5 deletions src/qrules/system_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@

import attrs

from .quantum_numbers import (
from qrules.quantum_numbers import (
EdgeQuantumNumber,
EdgeQuantumNumbers,
InteractionProperties,
NodeQuantumNumber,
NodeQuantumNumbers,
Parity,
)
from .settings import InteractionType
from .solving import GraphEdgePropertyMap, GraphNodePropertyMap, GraphSettings
from .topology import MutableTransition
from qrules.settings import InteractionType
from qrules.solving import GraphEdgePropertyMap, GraphNodePropertyMap, GraphSettings
from qrules.topology import MutableTransition

if TYPE_CHECKING:
from .particle import Particle, ParticleCollection, ParticleWithSpin
from qrules.particle import Particle, ParticleCollection, ParticleWithSpin

Check warning on line 24 in src/qrules/system_control.py

View check run for this annotation

Codecov / codecov/patch

src/qrules/system_control.py#L24

Added line #L24 was not covered by tests

_LOGGER = logging.getLogger(__name__)

Expand Down
17 changes: 8 additions & 9 deletions src/qrules/transition.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,35 @@
from tqdm.auto import tqdm

from qrules._implementers import implement_pretty_repr

from .combinatorics import (
from qrules.combinatorics import (
InitialFacts,
StateDefinition,
create_initial_facts,
ensure_nested_list,
match_external_edges,
permutate_topology_kinematically,
)
from .particle import (
from qrules.particle import (
Particle,
ParticleCollection,
ParticleWithSpin,
_to_float,
load_pdg,
)
from .quantum_numbers import (
from qrules.quantum_numbers import (
EdgeQuantumNumber,
EdgeQuantumNumbers,
InteractionProperties,
NodeQuantumNumber,
NodeQuantumNumbers,
)
from .settings import (
from qrules.settings import (
DEFAULT_INTERACTION_TYPES,
InteractionType,
NumberOfThreads,
create_interaction_settings,
)
from .solving import (
from qrules.solving import (
CSPSolver,
EdgeSettings,
GraphEdgePropertyMap,
Expand All @@ -56,7 +55,7 @@
QNProblemSet,
QNResult,
)
from .system_control import (
from qrules.system_control import (
GammaCheck,
InteractionDeterminator,
LeptonCheck,
Expand All @@ -67,7 +66,7 @@
find_particle,
remove_duplicate_solutions,
)
from .topology import (
from qrules.topology import (
FrozenDict,
MutableTransition,
Topology,
Expand All @@ -80,7 +79,7 @@
else:
from typing_extensions import TypeAlias
if TYPE_CHECKING:
from .topology import FrozenTransition
from qrules.topology import FrozenTransition

Check warning on line 82 in src/qrules/transition.py

View check run for this annotation

Codecov / codecov/patch

src/qrules/transition.py#L82

Added line #L82 was not covered by tests

_LOGGER = logging.getLogger(__name__)

Expand Down
3 changes: 1 addition & 2 deletions tests/unit/conservation_rules/test_clebsch_gordan.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
spin_conservation,
)
from qrules.particle import Spin

from .test_spin import __create_two_body_decay_spin_data
from tests.unit.conservation_rules.test_spin import __create_two_body_decay_spin_data

_SpinRuleInputType = Tuple[List[SpinEdgeInput], List[SpinEdgeInput], SpinNodeInput]

Expand Down

0 comments on commit 6201fc3

Please sign in to comment.