Skip to content

Commit

Permalink
refactor: move to _coordinax folder
Browse files Browse the repository at this point in the history
Signed-off-by: nstarman <nstarman@users.noreply.github.com>
  • Loading branch information
nstarman committed Aug 15, 2024
1 parent 0e7b570 commit 0e72dbe
Show file tree
Hide file tree
Showing 73 changed files with 235 additions and 210 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
[tool.ruff.lint.isort]
combine-as-imports = true
extra-standard-library = ["typing_extensions"]
known-first-party = ["dataclassish", "quaxed", "unxt"]
known-first-party = ["dataclassish", "quaxed", "unxt", "xmmutablemap"]
known-local-folder = ["coordinax"]


Expand Down
36 changes: 18 additions & 18 deletions src/coordinax/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@

from jaxtyping import install_import_hook

from . import (
from . import operators
from ._coordinax import (
_base,
_base_acc,
_base_pos,
Expand All @@ -23,23 +24,22 @@
_transform,
_typing,
_utils,
operators,
)
from ._base import *
from ._base_acc import *
from ._base_pos import *
from ._base_vel import *
from ._d1 import *
from ._d2 import *
from ._d3 import *
from ._d4 import *
from ._dn import *
from ._exceptions import *
from ._funcs import *
from ._space import *
from ._transform import *
from ._typing import *
from ._utils import *
from ._coordinax._base import *
from ._coordinax._base_acc import *
from ._coordinax._base_pos import *
from ._coordinax._base_vel import *
from ._coordinax._d1 import *
from ._coordinax._d2 import *
from ._coordinax._d3 import *
from ._coordinax._d4 import *
from ._coordinax._dn import *
from ._coordinax._exceptions import *
from ._coordinax._funcs import *
from ._coordinax._space import *
from ._coordinax._transform import *
from ._coordinax._typing import *
from ._coordinax._utils import *
from ._version import version as __version__
from .setup_package import RUNTIME_TYPECHECKER

Expand All @@ -62,7 +62,7 @@

# Interoperability
# Astropy
from ._interop import coordinax_interop_astropy # noqa: E402
from ._coordinax._interop import coordinax_interop_astropy # noqa: E402

# Runtime Typechecker
install_import_hook("coordinax", RUNTIME_TYPECHECKER)
Expand Down
1 change: 1 addition & 0 deletions src/coordinax/_coordinax/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"""Coordinax package."""
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
from dataclassish import field_items, field_values, replace
from unxt import Quantity, unitsystem

from ._typing import Unit
from ._utils import classproperty, full_shaped
from coordinax._typing import Unit

if TYPE_CHECKING:
from typing_extensions import Self
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from dataclassish import field_items
from unxt import Quantity

import coordinax._typing as ct
from . import _typing as ct
from ._base import AbstractVector
from ._mixins import AvalMixin
from ._utils import classproperty
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import quaxed.array_api as xp
from unxt import Quantity

from coordinax._typing import BatchableAngle, BatchableLength
from coordinax._coordinax._typing import BatchableAngle, BatchableLength

_0m = Quantity(0, "meter")
_0d = Quantity(0, "rad")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from unxt import Quantity

from coordinax._typing import BatchableAngle
from coordinax._coordinax._typing import BatchableAngle

_2pid = Quantity(360, "deg")

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
import quaxed.numpy as jnp
from unxt import Quantity

from coordinax._base import AbstractVector
from coordinax._base_acc import AbstractAcceleration
from coordinax._base_pos import AbstractPosition
from coordinax._base_vel import AbstractVelocity
from coordinax._utils import classproperty
from coordinax._coordinax._base import AbstractVector
from coordinax._coordinax._base_acc import AbstractAcceleration
from coordinax._coordinax._base_pos import AbstractPosition
from coordinax._coordinax._base_vel import AbstractVelocity
from coordinax._coordinax._utils import classproperty


class AbstractPosition1D(AbstractPosition):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
from quaxed import lax as qlax
from unxt import Quantity

import coordinax._typing as ct
import coordinax._coordinax._typing as ct
from .base import AbstractAcceleration1D, AbstractPosition1D, AbstractVelocity1D
from coordinax._base_pos import AbstractPosition
from coordinax._mixins import AvalMixin
from coordinax._utils import classproperty
from coordinax._coordinax._base_pos import AbstractPosition
from coordinax._coordinax._mixins import AvalMixin
from coordinax._coordinax._utils import classproperty


@final
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from .base import AbstractPosition1D
from .cartesian import CartesianAcceleration1D, CartesianPosition1D, CartesianVelocity1D
from coordinax._utils import full_shaped
from coordinax._coordinax._utils import full_shaped


@conversion_method(type_from=AbstractPosition1D, type_to=Quantity) # type: ignore[misc]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
from unxt import Quantity

from .cartesian import CartesianPosition1D
from coordinax._typing import TimeBatchOrScalar
from coordinax.operators._base import AbstractOperator, op_call_dispatch
from coordinax._coordinax._typing import TimeBatchOrScalar
from coordinax._coordinax.operators._base import AbstractOperator, op_call_dispatch

Q1: TypeAlias = Shaped[Quantity["length"], "*#batch 1"]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

from unxt import AbstractDistance, Distance, Quantity

import coordinax._typing as ct
import coordinax._coordinax._typing as ct
from .base import AbstractAcceleration1D, AbstractPosition1D, AbstractVelocity1D
from coordinax._checks import check_r_non_negative
from coordinax._utils import classproperty
from coordinax._coordinax._checks import check_r_non_negative
from coordinax._coordinax._utils import classproperty


@final
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
from .base import AbstractAcceleration1D, AbstractPosition1D, AbstractVelocity1D
from .cartesian import CartesianAcceleration1D, CartesianPosition1D, CartesianVelocity1D
from .radial import RadialAcceleration, RadialPosition, RadialVelocity
from coordinax._base_pos import AbstractPosition
from coordinax._base_vel import AbstractVelocity
from coordinax._coordinax._base_pos import AbstractPosition
from coordinax._coordinax._base_vel import AbstractVelocity

###############################################################################
# 1D
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

from abc import abstractmethod

from coordinax._base import AbstractVector
from coordinax._base_acc import AbstractAcceleration
from coordinax._base_pos import AbstractPosition
from coordinax._base_vel import AbstractVelocity
from coordinax._utils import classproperty
from coordinax._coordinax._base import AbstractVector
from coordinax._coordinax._base_acc import AbstractAcceleration
from coordinax._coordinax._base_pos import AbstractPosition
from coordinax._coordinax._base_vel import AbstractVelocity
from coordinax._coordinax._utils import classproperty


class AbstractPosition2D(AbstractPosition):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
from quaxed import lax as qlax
from unxt import Quantity

import coordinax._typing as ct
import coordinax._coordinax._typing as ct
from .base import AbstractAcceleration2D, AbstractPosition2D, AbstractVelocity2D
from coordinax._base_pos import AbstractPosition
from coordinax._mixins import AvalMixin
from coordinax._utils import classproperty
from coordinax._coordinax._base_pos import AbstractPosition
from coordinax._coordinax._mixins import AvalMixin
from coordinax._coordinax._utils import classproperty


@final
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from .base import AbstractPosition2D
from .cartesian import CartesianAcceleration2D, CartesianPosition2D, CartesianVelocity2D
from coordinax._utils import full_shaped
from coordinax._coordinax._utils import full_shaped

#####################################################################
# Quantity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
from unxt import Quantity

from .cartesian import CartesianPosition2D
from coordinax._typing import TimeBatchOrScalar
from coordinax.operators._base import AbstractOperator, op_call_dispatch
from coordinax._coordinax._typing import TimeBatchOrScalar
from coordinax._coordinax.operators._base import AbstractOperator, op_call_dispatch

Q2: TypeAlias = Shaped[Quantity["length"], "*#batch 2"]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
from dataclassish import replace
from unxt import AbstractDistance, Distance, Quantity

import coordinax._typing as ct
import coordinax._coordinax._typing as ct
from .base import AbstractAcceleration2D, AbstractPosition2D, AbstractVelocity2D
from coordinax._checks import check_azimuth_range, check_r_non_negative
from coordinax._converters import converter_azimuth_to_range
from coordinax._utils import classproperty
from coordinax._coordinax._checks import check_azimuth_range, check_r_non_negative
from coordinax._coordinax._converters import converter_azimuth_to_range
from coordinax._coordinax._utils import classproperty


@final
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from .base import AbstractPosition2D, AbstractVelocity2D
from .cartesian import CartesianAcceleration2D, CartesianPosition2D, CartesianVelocity2D
from .polar import PolarPosition, PolarVelocity
from coordinax._base_pos import AbstractPosition
from coordinax._coordinax._base_pos import AbstractPosition


@dispatch
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
from abc import abstractmethod
from typing_extensions import override

from coordinax._base import AbstractVector
from coordinax._base_acc import AbstractAcceleration
from coordinax._base_pos import AbstractPosition
from coordinax._base_vel import AbstractVelocity
from coordinax._utils import classproperty
from coordinax._coordinax._base import AbstractVector
from coordinax._coordinax._base_acc import AbstractAcceleration
from coordinax._coordinax._base_pos import AbstractPosition
from coordinax._coordinax._base_vel import AbstractVelocity
from coordinax._coordinax._utils import classproperty


class AbstractPosition3D(AbstractPosition):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
from dataclassish import field_items
from unxt import Quantity

import coordinax._typing as ct
import coordinax._coordinax._typing as ct
from .base import AbstractAcceleration3D, AbstractPosition3D, AbstractVelocity3D
from coordinax._base_pos import AbstractPosition
from coordinax._mixins import AvalMixin
from coordinax._utils import classproperty
from coordinax._coordinax._base_pos import AbstractPosition
from coordinax._coordinax._mixins import AvalMixin
from coordinax._coordinax._utils import classproperty


@final
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from .base import AbstractPosition3D
from .cartesian import CartesianAcceleration3D, CartesianPosition3D, CartesianVelocity3D
from coordinax._utils import full_shaped
from coordinax._coordinax._utils import full_shaped

#####################################################################
# Quantity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
import quaxed.array_api as xp
from unxt import Quantity

import coordinax._typing as ct
import coordinax._coordinax._typing as ct
from .base import AbstractAcceleration3D, AbstractPosition3D, AbstractVelocity3D
from coordinax._checks import check_azimuth_range, check_r_non_negative
from coordinax._converters import converter_azimuth_to_range
from coordinax._utils import classproperty
from coordinax._coordinax._checks import check_azimuth_range, check_r_non_negative
from coordinax._coordinax._converters import converter_azimuth_to_range
from coordinax._coordinax._utils import classproperty


@final
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
from unxt import Quantity

from .cartesian import CartesianPosition3D
from coordinax._typing import TimeBatchOrScalar
from coordinax.operators._base import AbstractOperator, op_call_dispatch
from coordinax._coordinax._typing import TimeBatchOrScalar
from coordinax._coordinax.operators._base import AbstractOperator, op_call_dispatch

Q3: TypeAlias = Shaped[Quantity["length"], "*#batch 3"]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@
from dataclassish import replace
from unxt import AbstractDistance, AbstractQuantity, Distance, Quantity

import coordinax._typing as ct
import coordinax._coordinax._typing as ct
from .base import AbstractAcceleration3D, AbstractPosition3D, AbstractVelocity3D
from coordinax._base_acc import AbstractAcceleration
from coordinax._checks import (
from coordinax._coordinax._base_acc import AbstractAcceleration
from coordinax._coordinax._checks import (
check_azimuth_range,
check_polar_range,
check_r_non_negative,
)
from coordinax._converters import converter_azimuth_to_range
from coordinax._utils import classproperty
from coordinax._coordinax._converters import converter_azimuth_to_range
from coordinax._coordinax._utils import classproperty

_90d = Quantity(90, "deg")
_180d = Quantity(180, "deg")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
SphericalPosition,
SphericalVelocity,
)
from coordinax._base_pos import AbstractPosition
from coordinax._coordinax._base_pos import AbstractPosition

###############################################################################
# 3D
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
from abc import abstractmethod
from typing import TYPE_CHECKING

from coordinax._base import AbstractVector
from coordinax._base_pos import AbstractPosition
from coordinax._utils import classproperty
from coordinax._coordinax._base import AbstractVector
from coordinax._coordinax._base_pos import AbstractPosition
from coordinax._coordinax._utils import classproperty

if TYPE_CHECKING:
from typing_extensions import Never
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from unxt import Quantity

from .spacetime import FourVector
from coordinax.operators._base import AbstractOperator, op_call_dispatch
from coordinax._coordinax.operators._base import AbstractOperator, op_call_dispatch


@op_call_dispatch
Expand Down
Loading

0 comments on commit 0e72dbe

Please sign in to comment.