diff --git a/examples/fodo.py b/examples/fodo.py index 3384be6..5d8430e 100644 --- a/examples/fodo.py +++ b/examples/fodo.py @@ -6,10 +6,10 @@ # Add the parent directory to sys.path sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "../src/"))) -from pals_schema.MagneticMultipoleParameters import MagneticMultipoleParameters -from pals_schema.Drift import Drift -from pals_schema.Quadrupole import Quadrupole -from pals_schema.BeamLine import BeamLine +from pals.MagneticMultipoleParameters import MagneticMultipoleParameters +from pals.Drift import Drift +from pals.Quadrupole import Quadrupole +from pals.BeamLine import BeamLine def main(): diff --git a/pyproject.toml b/pyproject.toml index bc3c9c0..62041ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pals_schema" -version = "0.1.1" +version = "0.2.0" dependencies = [ "pydantic", "pyyaml", @@ -47,3 +47,6 @@ test = ["pytest"] Documentation = "https://pals-project.readthedocs.io" Repository = "https://github.com/campa-consortium/pals-python" Issues = "https://github.com/campa-consortium/pals-python/issues" + +[tool.setuptools.packages.find] +where = ["src"] \ No newline at end of file diff --git a/src/pals_schema/BaseElement.py b/src/pals/BaseElement.py similarity index 100% rename from src/pals_schema/BaseElement.py rename to src/pals/BaseElement.py diff --git a/src/pals_schema/BeamLine.py b/src/pals/BeamLine.py similarity index 95% rename from src/pals_schema/BeamLine.py rename to src/pals/BeamLine.py index f2dd400..76c271b 100644 --- a/src/pals_schema/BeamLine.py +++ b/src/pals/BeamLine.py @@ -1,10 +1,10 @@ from pydantic import ConfigDict, Field, model_validator from typing import Annotated, List, Literal, Union -from pals_schema.BaseElement import BaseElement -from pals_schema.ThickElement import ThickElement -from pals_schema.Drift import Drift -from pals_schema.Quadrupole import Quadrupole +from pals.BaseElement import BaseElement +from pals.ThickElement import ThickElement +from pals.Drift import Drift +from pals.Quadrupole import Quadrupole class BeamLine(BaseElement): diff --git a/src/pals_schema/Drift.py b/src/pals/Drift.py similarity index 100% rename from src/pals_schema/Drift.py rename to src/pals/Drift.py diff --git a/src/pals_schema/MagneticMultipoleParameters.py b/src/pals/MagneticMultipoleParameters.py similarity index 100% rename from src/pals_schema/MagneticMultipoleParameters.py rename to src/pals/MagneticMultipoleParameters.py diff --git a/src/pals_schema/Quadrupole.py b/src/pals/Quadrupole.py similarity index 100% rename from src/pals_schema/Quadrupole.py rename to src/pals/Quadrupole.py diff --git a/src/pals_schema/ThickElement.py b/src/pals/ThickElement.py similarity index 100% rename from src/pals_schema/ThickElement.py rename to src/pals/ThickElement.py diff --git a/src/pals_schema/__init__.py b/src/pals/__init__.py similarity index 100% rename from src/pals_schema/__init__.py rename to src/pals/__init__.py diff --git a/tests/test_schema.py b/tests/test_schema.py index 3b8fd90..34202be 100644 --- a/tests/test_schema.py +++ b/tests/test_schema.py @@ -8,12 +8,12 @@ from pydantic import ValidationError -from pals_schema.MagneticMultipoleParameters import MagneticMultipoleParameters -from pals_schema.BaseElement import BaseElement -from pals_schema.ThickElement import ThickElement -from pals_schema.Drift import Drift -from pals_schema.Quadrupole import Quadrupole -from pals_schema.BeamLine import BeamLine +from pals.MagneticMultipoleParameters import MagneticMultipoleParameters +from pals.BaseElement import BaseElement +from pals.ThickElement import ThickElement +from pals.Drift import Drift +from pals.Quadrupole import Quadrupole +from pals.BeamLine import BeamLine def test_BaseElement():