Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/fodo.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
5 changes: 4 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "pals_schema"
version = "0.1.1"
version = "0.2.0"
dependencies = [
"pydantic",
"pyyaml",
Expand Down Expand Up @@ -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"]
File renamed without changes.
8 changes: 4 additions & 4 deletions src/pals_schema/BeamLine.py → src/pals/BeamLine.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 6 additions & 6 deletions tests/test_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down