Skip to content

Commit dcd5b00

Browse files
authored
Merge pull request #11 from candleindark/change-support
Pin Pydantic dependency to below 2.10 and remove test associated with `aind_data_schema`
2 parents 7b9dbde + aa7afed commit dcd5b00

File tree

2 files changed

+26
-15
lines changed

2 files changed

+26
-15
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ classifiers = [
2828
]
2929
dependencies = [
3030
"linkml @ git+https://github.com/candleindark/linkml.git@bundle-error",
31-
"pydantic~=2.7",
31+
"pydantic>=2.7,<2.10",
3232
"typer",
3333
]
3434

tests/test_gen_linkml.py

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -119,24 +119,35 @@ class TestLinkmlGenerator:
119119
"models_and_enums",
120120
[
121121
["dandischema.models"],
122-
["aind_data_schema.components.coordinates"],
122+
# === Remove all tests associated with aind_data_schema until works for
123+
# dandischema is complete ===
124+
pytest.param(
125+
["aind_data_schema.components.coordinates"], marks=pytest.mark.xfail
126+
),
123127
# Naming conflict at this one
124-
# TODO: remove xfail mark once handling of the naming conflict is devised
125128
pytest.param(
126129
["aind_data_schema.components.devices"], marks=pytest.mark.xfail
127130
),
128-
["aind_data_schema.components.reagent"],
129-
["aind_data_schema.components.stimulus"],
130-
["aind_data_schema.components.tile"],
131-
["aind_data_schema.core.acquisition"],
132-
["aind_data_schema.core.data_description"],
133-
["aind_data_schema.core.instrument"],
134-
["aind_data_schema.core.metadata"],
135-
["aind_data_schema.core.procedures"],
136-
["aind_data_schema.core.processing"],
137-
["aind_data_schema.core.rig"],
138-
["aind_data_schema.core.session"],
139-
["aind_data_schema.core.subject"],
131+
pytest.param(
132+
["aind_data_schema.components.reagent"], marks=pytest.mark.xfail
133+
),
134+
pytest.param(
135+
["aind_data_schema.components.stimulus"], marks=pytest.mark.xfail
136+
),
137+
pytest.param(["aind_data_schema.components.tile"], marks=pytest.mark.xfail),
138+
pytest.param(
139+
["aind_data_schema.core.acquisition"], marks=pytest.mark.xfail
140+
),
141+
pytest.param(
142+
["aind_data_schema.core.data_description"], marks=pytest.mark.xfail
143+
),
144+
pytest.param(["aind_data_schema.core.instrument"], marks=pytest.mark.xfail),
145+
pytest.param(["aind_data_schema.core.metadata"], marks=pytest.mark.xfail),
146+
pytest.param(["aind_data_schema.core.procedures"], marks=pytest.mark.xfail),
147+
pytest.param(["aind_data_schema.core.processing"], marks=pytest.mark.xfail),
148+
pytest.param(["aind_data_schema.core.rig"], marks=pytest.mark.xfail),
149+
pytest.param(["aind_data_schema.core.session"], marks=pytest.mark.xfail),
150+
pytest.param(["aind_data_schema.core.subject"], marks=pytest.mark.xfail),
140151
# TODO: Add test cases with list containing multiple module names
141152
],
142153
indirect=True,

0 commit comments

Comments
 (0)