Skip to content

Commit

Permalink
Merge pull request #857 from cortex-lab/dev
Browse files Browse the repository at this point in the history
Merge dev
  • Loading branch information
chris-langfield authored May 6, 2024
2 parents fbc9501 + aadfa12 commit 58a3a1f
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 5 deletions.
12 changes: 12 additions & 0 deletions alyx/data/fixtures/data.dataformat.json
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,17 @@
"matlab_loader_function": "",
"python_loader_function": "sparse.load_npz"
}
},
{
"model": "data.dataformat",
"pk": "f6474942-3f0e-4a68-89a1-64d8d600d953",
"fields": {
"json": "",
"name": "npz",
"description": "A zipped archive of NumPy objects.",
"file_extension": ".npz",
"matlab_loader_function": "",
"python_loader_function": "numpy.load"
}
}
]
44 changes: 44 additions & 0 deletions alyx/data/fixtures/data.datasettype.json
Original file line number Diff line number Diff line change
Expand Up @@ -2231,5 +2231,49 @@
"description": "The start and end times of the laser stimulation period.",
"filename_pattern": ""
}
},
{
"model": "data.datasettype",
"pk": "c2eae195-624d-4ff5-a533-01d78caf5805",
"fields": {
"json": null,
"name": "waveforms.traces",
"created_by": null,
"description": "Snippets of lightly preprocessed waveforms from spikes, organized by unit.",
"filename_pattern": ""
}
},
{
"model": "data.datasettype",
"pk": "482dc8e6-0fda-4c9b-877d-f114ef75a9ff",
"fields": {
"json": null,
"name": "waveforms.templates",
"created_by": null,
"description": "Medians of unit waveforms.",
"filename_pattern": ""
}
},
{
"model": "data.datasettype",
"pk": "ff5867ab-cd28-4fde-9baa-142e2bc2f4fc",
"fields": {
"json": null,
"name": "waveforms.table",
"created_by": null,
"description": "Table containing the sample index, cluster id, and peak channel id for each waveform extracted.",
"filename_pattern": ""
}
},
{
"model": "data.datasettype",
"pk": "be70b6ac-7635-4554-9615-e40277a138ae",
"fields": {
"json": null,
"name": "waveforms.channels",
"created_by": null,
"description": "Array containing the channel ids for each waveform.",
"filename_pattern": ""
}
}
]
10 changes: 5 additions & 5 deletions requirements_frozen.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
asgiref==3.8.1
backports.zoneinfo==0.2.1
boto3==1.34.96
botocore==1.34.96
boto3==1.34.97
botocore==1.34.97
certifi==2024.2.2
cffi==1.16.0
charset-normalizer==3.3.2
Expand Down Expand Up @@ -34,8 +34,8 @@ docutils==0.20.1
drfdocs==0.0.11
flake8==7.0.0
fonttools==4.51.0
globus-cli==3.27.0
globus-sdk==3.39.0
globus-cli==3.28.2
globus-sdk==3.41.0
iblutil==1.8.0
idna==3.7
importlib_metadata==7.1.0
Expand Down Expand Up @@ -74,7 +74,7 @@ six==1.16.0
sqlparse==0.5.0
structlog==24.1.0
tomli==2.0.1
tqdm==4.66.2
tqdm==4.66.4
typing_extensions==4.11.0
tzdata==2024.1
uritemplate==4.1.1
Expand Down

0 comments on commit 58a3a1f

Please sign in to comment.