Skip to content

Commit 96ab5c7

Browse files
dbirmandbirman
committed
Merge branch 'main' into release-v2.3.2
2 parents dab10b7 + 6ebc45b commit 96ab5c7

24 files changed

+669
-128
lines changed

‎.github/workflows/update_docs.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ jobs:
5151
- uses: actions/checkout@v3
5252
with:
5353
token: ${{ secrets.SERVICE_TOKEN }}
54+
ref: ${{ github.ref }}
55+
- name: Pull latest changes
56+
run: git pull origin ${{ github.ref_name }}
5457
- name: Set up Python 3.10
5558
uses: actions/setup-python@v2
5659
with:

‎docs/source/aind_data_schema.components.rst‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
aind\_data\_schema.components package
2+
=====================================
3+
4+
Submodules
5+
----------
6+
7+
aind\_data\_schema.components.configs module
8+
--------------------------------------------
9+
10+
.. automodule:: aind_data_schema.components.configs
11+
:members:
12+
:undoc-members:
13+
:show-inheritance:
14+
15+
aind\_data\_schema.components.connections module
16+
------------------------------------------------
17+
18+
.. automodule:: aind_data_schema.components.connections
19+
:members:
20+
:undoc-members:
21+
:show-inheritance:
22+
23+
aind\_data\_schema.components.coordinates module
24+
------------------------------------------------
25+
26+
.. automodule:: aind_data_schema.components.coordinates
27+
:members:
28+
:undoc-members:
29+
:show-inheritance:
30+
31+
aind\_data\_schema.components.devices module
32+
--------------------------------------------
33+
34+
.. automodule:: aind_data_schema.components.devices
35+
:members:
36+
:undoc-members:
37+
:show-inheritance:
38+
39+
aind\_data\_schema.components.identifiers module
40+
------------------------------------------------
41+
42+
.. automodule:: aind_data_schema.components.identifiers
43+
:members:
44+
:undoc-members:
45+
:show-inheritance:
46+
47+
aind\_data\_schema.components.injection\_procedures module
48+
----------------------------------------------------------
49+
50+
.. automodule:: aind_data_schema.components.injection_procedures
51+
:members:
52+
:undoc-members:
53+
:show-inheritance:
54+
55+
aind\_data\_schema.components.measurements module
56+
-------------------------------------------------
57+
58+
.. automodule:: aind_data_schema.components.measurements
59+
:members:
60+
:undoc-members:
61+
:show-inheritance:
62+
63+
aind\_data\_schema.components.reagent module
64+
--------------------------------------------
65+
66+
.. automodule:: aind_data_schema.components.reagent
67+
:members:
68+
:undoc-members:
69+
:show-inheritance:
70+
71+
aind\_data\_schema.components.specimen\_procedures module
72+
---------------------------------------------------------
73+
74+
.. automodule:: aind_data_schema.components.specimen_procedures
75+
:members:
76+
:undoc-members:
77+
:show-inheritance:
78+
79+
aind\_data\_schema.components.stimulus module
80+
---------------------------------------------
81+
82+
.. automodule:: aind_data_schema.components.stimulus
83+
:members:
84+
:undoc-members:
85+
:show-inheritance:
86+
87+
aind\_data\_schema.components.subject\_procedures module
88+
--------------------------------------------------------
89+
90+
.. automodule:: aind_data_schema.components.subject_procedures
91+
:members:
92+
:undoc-members:
93+
:show-inheritance:
94+
95+
aind\_data\_schema.components.subjects module
96+
---------------------------------------------
97+
98+
.. automodule:: aind_data_schema.components.subjects
99+
:members:
100+
:undoc-members:
101+
:show-inheritance:
102+
103+
aind\_data\_schema.components.surgery\_procedures module
104+
--------------------------------------------------------
105+
106+
.. automodule:: aind_data_schema.components.surgery_procedures
107+
:members:
108+
:undoc-members:
109+
:show-inheritance:
110+
111+
aind\_data\_schema.components.wrappers module
112+
---------------------------------------------
113+
114+
.. automodule:: aind_data_schema.components.wrappers
115+
:members:
116+
:undoc-members:
117+
:show-inheritance:
118+
119+
Module contents
120+
---------------
121+
122+
.. automodule:: aind_data_schema.components
123+
:members:
124+
:undoc-members:
125+
:show-inheritance:

‎docs/source/aind_data_schema.core.rst‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
aind\_data\_schema.core package
2+
===============================
3+
4+
Submodules
5+
----------
6+
7+
aind\_data\_schema.core.acquisition module
8+
------------------------------------------
9+
10+
.. automodule:: aind_data_schema.core.acquisition
11+
:members:
12+
:undoc-members:
13+
:show-inheritance:
14+
15+
aind\_data\_schema.core.data\_description module
16+
------------------------------------------------
17+
18+
.. automodule:: aind_data_schema.core.data_description
19+
:members:
20+
:undoc-members:
21+
:show-inheritance:
22+
23+
aind\_data\_schema.core.instrument module
24+
-----------------------------------------
25+
26+
.. automodule:: aind_data_schema.core.instrument
27+
:members:
28+
:undoc-members:
29+
:show-inheritance:
30+
31+
aind\_data\_schema.core.metadata module
32+
---------------------------------------
33+
34+
.. automodule:: aind_data_schema.core.metadata
35+
:members:
36+
:undoc-members:
37+
:show-inheritance:
38+
39+
aind\_data\_schema.core.model module
40+
------------------------------------
41+
42+
.. automodule:: aind_data_schema.core.model
43+
:members:
44+
:undoc-members:
45+
:show-inheritance:
46+
47+
aind\_data\_schema.core.procedures module
48+
-----------------------------------------
49+
50+
.. automodule:: aind_data_schema.core.procedures
51+
:members:
52+
:undoc-members:
53+
:show-inheritance:
54+
55+
aind\_data\_schema.core.processing module
56+
-----------------------------------------
57+
58+
.. automodule:: aind_data_schema.core.processing
59+
:members:
60+
:undoc-members:
61+
:show-inheritance:
62+
63+
aind\_data\_schema.core.quality\_control module
64+
-----------------------------------------------
65+
66+
.. automodule:: aind_data_schema.core.quality_control
67+
:members:
68+
:undoc-members:
69+
:show-inheritance:
70+
71+
aind\_data\_schema.core.subject module
72+
--------------------------------------
73+
74+
.. automodule:: aind_data_schema.core.subject
75+
:members:
76+
:undoc-members:
77+
:show-inheritance:
78+
79+
Module contents
80+
---------------
81+
82+
.. automodule:: aind_data_schema.core
83+
:members:
84+
:undoc-members:
85+
:show-inheritance:

‎docs/source/aind_data_schema.rst‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
aind\_data\_schema package
2+
==========================
3+
4+
Subpackages
5+
-----------
6+
7+
.. toctree::
8+
:maxdepth: 4
9+
10+
aind_data_schema.components
11+
aind_data_schema.core
12+
aind_data_schema.utils
13+
14+
Submodules
15+
----------
16+
17+
aind\_data\_schema.base module
18+
------------------------------
19+
20+
.. automodule:: aind_data_schema.base
21+
:members:
22+
:undoc-members:
23+
:show-inheritance:
24+
25+
Module contents
26+
---------------
27+
28+
.. automodule:: aind_data_schema
29+
:members:
30+
:undoc-members:
31+
:show-inheritance:

‎docs/source/aind_data_schema.utils.rst‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
aind\_data\_schema.utils package
2+
================================
3+
4+
Submodules
5+
----------
6+
7+
aind\_data\_schema.utils.compatibility\_check module
8+
----------------------------------------------------
9+
10+
.. automodule:: aind_data_schema.utils.compatibility_check
11+
:members:
12+
:undoc-members:
13+
:show-inheritance:
14+
15+
aind\_data\_schema.utils.examples\_generator module
16+
---------------------------------------------------
17+
18+
.. automodule:: aind_data_schema.utils.examples_generator
19+
:members:
20+
:undoc-members:
21+
:show-inheritance:
22+
23+
aind\_data\_schema.utils.exceptions module
24+
------------------------------------------
25+
26+
.. automodule:: aind_data_schema.utils.exceptions
27+
:members:
28+
:undoc-members:
29+
:show-inheritance:
30+
31+
aind\_data\_schema.utils.json\_writer module
32+
--------------------------------------------
33+
34+
.. automodule:: aind_data_schema.utils.json_writer
35+
:members:
36+
:undoc-members:
37+
:show-inheritance:
38+
39+
aind\_data\_schema.utils.merge module
40+
-------------------------------------
41+
42+
.. automodule:: aind_data_schema.utils.merge
43+
:members:
44+
:undoc-members:
45+
:show-inheritance:
46+
47+
aind\_data\_schema.utils.schema\_version\_bump module
48+
-----------------------------------------------------
49+
50+
.. automodule:: aind_data_schema.utils.schema_version_bump
51+
:members:
52+
:undoc-members:
53+
:show-inheritance:
54+
55+
aind\_data\_schema.utils.validators module
56+
------------------------------------------
57+
58+
.. automodule:: aind_data_schema.utils.validators
59+
:members:
60+
:undoc-members:
61+
:show-inheritance:
62+
63+
Module contents
64+
---------------
65+
66+
.. automodule:: aind_data_schema.utils
67+
:members:
68+
:undoc-members:
69+
:show-inheritance:

‎docs/source/modules.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
src
2+
===
3+
4+
.. toctree::
5+
:maxdepth: 4
6+
7+
aind_data_schema

‎pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ readme = "README.md"
1414
dynamic = ["version"]
1515

1616
dependencies = [
17-
'aind-data-schema-models>=5,<6',
17+
'aind-data-schema-models>=4.2.11,<5',
1818
'pydantic>=2.7, <2.12',
19+
'semver'
1920
]
2021

2122
[project.optional-dependencies]
@@ -24,7 +25,6 @@ dev = [
2425
'pydantic>=2.7, !=2.9.0, !=2.9.1',
2526
'scipy',
2627
'dictdiffer',
27-
'semver'
2828
]
2929

3030
linters = [

0 commit comments

Comments
 (0)