Skip to content

Commit

Permalink
Main (#1026)
Browse files Browse the repository at this point in the history
* build: updates version number

* feat: adds qc schema json

* fix: updates schema version check to handle new core schemas

* ci: adds service account token to github actions

* bump schema version [skip actions]

* fix: updates broken github action

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
jtyoung84 and github-actions[bot] authored Aug 20, 2024
1 parent 26555a3 commit 3b66c23
Show file tree
Hide file tree
Showing 43 changed files with 39,734 additions and 31,708 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tag_and_publish_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
password: ${{ secrets.AIND_PYPI_TOKEN }}

upload_schemas_prod:
needs: publish
needs: tag_and_publish
runs-on: ubuntu-latest
permissions:
id-token: write
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
aws s3 sync $TEMP_DIR s3://${AWS_DATA_SCHEMA_BUCKET}/$S3_PREFIX
upload_diagrams:
needs: publish
needs: tag_and_publish
runs-on: ubuntu-latest
permissions:
id-token: write
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/update_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
OUTPUT_DIR: 'schemas'
steps:
- uses: actions/checkout@v3
with:
token: ${{ secrets.SERVICE_TOKEN }}
- name: Set up Python 3.8
uses: actions/setup-python@v3
with:
Expand Down Expand Up @@ -47,6 +49,8 @@ jobs:
continue-on-error: true
steps:
- uses: actions/checkout@v3
with:
token: ${{ secrets.SERVICE_TOKEN }}
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions examples/aibs_smartspim_instrument.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/instrument.py",
"schema_version": "0.10.28",
"schema_version": "0.10.29",
"instrument_id": "440_SmartSPIM2_20231004",
"modification_date": "2023-10-04",
"instrument_type": "SmartSPIM",
Expand Down Expand Up @@ -508,4 +508,4 @@
],
"daqs": [],
"notes": null
}
}
2 changes: 1 addition & 1 deletion examples/aibs_smartspim_procedures.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/procedures.py",
"schema_version": "0.13.14",
"schema_version": "0.13.15",
"subject_id": "651286",
"subject_procedures": [
{
Expand Down
4 changes: 2 additions & 2 deletions examples/aind_smartspim_instrument.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/instrument.py",
"schema_version": "0.10.28",
"schema_version": "0.10.29",
"instrument_id": "440_SmartSPIM1_20231004",
"modification_date": "2023-10-04",
"instrument_type": "SmartSPIM",
Expand Down Expand Up @@ -635,4 +635,4 @@
],
"daqs": [],
"notes": null
}
}
2 changes: 1 addition & 1 deletion examples/bergamo_ophys_session.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/session.py",
"schema_version": "0.3.4",
"schema_version": "0.3.5",
"protocol_id": [],
"experimenter_full_name": [
"John Doe"
Expand Down
2 changes: 1 addition & 1 deletion examples/data_description.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/data_description.py",
"schema_version": "0.13.11",
"schema_version": "0.13.12",
"license": "CC-BY-4.0",
"platform": {
"name": "Electrophysiology platform",
Expand Down
2 changes: 1 addition & 1 deletion examples/ephys_rig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/rig.py",
"schema_version": "0.5.4",
"schema_version": "0.5.5",
"rig_id": "323_EPHYS1_20231003",
"modification_date": "2023-10-03",
"mouse_platform": {
Expand Down
2 changes: 1 addition & 1 deletion examples/ephys_session.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/session.py",
"schema_version": "0.3.4",
"schema_version": "0.3.5",
"protocol_id": [],
"experimenter_full_name": [
"Max Quibble",
Expand Down
2 changes: 1 addition & 1 deletion examples/exaspim_acquisition.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/acquisition.py",
"schema_version": "0.6.20",
"schema_version": "0.6.21",
"protocol_id": [],
"experimenter_full_name": [
"###"
Expand Down
4 changes: 2 additions & 2 deletions examples/exaspim_instrument.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/instrument.py",
"schema_version": "0.10.28",
"schema_version": "0.10.29",
"instrument_id": "440_exaSPIM1-20231004",
"modification_date": "2023-10-04",
"instrument_type": "exaSPIM",
Expand Down Expand Up @@ -457,4 +457,4 @@
}
],
"notes": null
}
}
4 changes: 2 additions & 2 deletions examples/fip_behavior_rig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/rig.py",
"schema_version": "0.5.4",
"schema_version": "0.5.5",
"rig_id": "447_FIP-Behavior_20000101",
"modification_date": "2000-01-01",
"mouse_platform": {
Expand Down Expand Up @@ -945,4 +945,4 @@
}
],
"notes": null
}
}
4 changes: 2 additions & 2 deletions examples/fip_ophys_rig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/rig.py",
"schema_version": "0.5.4",
"schema_version": "0.5.5",
"rig_id": "428_FIP1_20231003",
"modification_date": "2023-10-03",
"mouse_platform": {
Expand Down Expand Up @@ -899,4 +899,4 @@
}
],
"notes": null
}
}
2 changes: 1 addition & 1 deletion examples/mri_session.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/session.py",
"schema_version": "0.3.4",
"schema_version": "0.3.5",
"protocol_id": [
"dx.doi.org/10.57824/protocols.io.bh7kl4n6"
],
Expand Down
2 changes: 1 addition & 1 deletion examples/multiplane_ophys_session.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/session.py",
"schema_version": "0.3.4",
"schema_version": "0.3.5",
"protocol_id": [],
"experimenter_full_name": [
"John Doe"
Expand Down
2 changes: 1 addition & 1 deletion examples/ophys_procedures.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/procedures.py",
"schema_version": "0.13.14",
"schema_version": "0.13.15",
"subject_id": "625100",
"subject_procedures": [
{
Expand Down
2 changes: 1 addition & 1 deletion examples/ophys_session.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/session.py",
"schema_version": "0.3.4",
"schema_version": "0.3.5",
"protocol_id": [],
"experimenter_full_name": [
"John Doe"
Expand Down
2 changes: 1 addition & 1 deletion examples/procedures.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/procedures.py",
"schema_version": "0.13.14",
"schema_version": "0.13.15",
"subject_id": "625100",
"subject_procedures": [
{
Expand Down
2 changes: 1 addition & 1 deletion examples/processing.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/processing.py",
"schema_version": "0.4.8",
"schema_version": "0.4.9",
"processing_pipeline": {
"data_processes": [
{
Expand Down
2 changes: 1 addition & 1 deletion examples/subject.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/subject.py",
"schema_version": "0.5.9",
"schema_version": "0.5.10",
"subject_id": "12345",
"sex": "Male",
"date_of_birth": "2022-11-22",
Expand Down
Loading

0 comments on commit 3b66c23

Please sign in to comment.