Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
k1o0 authored Jun 25, 2024
2 parents d870708 + f894dce commit c51a762
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 12 deletions.
22 changes: 22 additions & 0 deletions alyx/data/fixtures/data.datasettype.json
Original file line number Diff line number Diff line change
Expand Up @@ -2286,5 +2286,27 @@
"description": "Bad channel detection outcome, 0 is good, 1 corresponds to dead or low amplitude channels, 2 corresponds to noisy channels, 3 corresponds to channels labeled as outside of the brain.",
"filename_pattern": ""
}
},
{
"model": "data.datasettype",
"pk": "2a0f78ff-bcc3-4780-8b00-0cb1280850aa",
"fields": {
"json": null,
"name": "passingSpikes.table",
"created_by": null,
"description": "A compressed table containing only the spikes belonging to passing units, to accelerate data loading.",
"filename_pattern": ""
}
},
{
"model": "data.datasettype",
"pk": "5137d09a-41b6-435f-aba5-c4a7e2b0d240",
"fields": {
"json": null,
"name": "rawImagingData.times",
"created_by": null,
"description": "The raw frame exposure times.",
"filename_pattern": ""
}
}
]
24 changes: 12 additions & 12 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.118
botocore==1.34.118
boto3==1.34.129
botocore==1.34.129
certifi==2024.6.2
cffi==1.16.0
charset-normalizer==3.3.2
Expand All @@ -12,7 +12,7 @@ coreapi==2.3.3
coreschema==0.0.4
coverage==7.5.3
coveralls==4.0.1
cryptography==42.0.7
cryptography==42.0.8
cycler==0.12.1
Django==4.2.13
django-admin-list-filter-dropdown==1.0.3
Expand All @@ -28,15 +28,15 @@ django-reversion==5.0.12
django-storages==1.14.3
django-structlog==8.1.0
django-test-without-migrations==0.6
djangorestframework==3.15.1
djangorestframework==3.15.2
docopt==0.6.2
docutils==0.20.1
drfdocs==0.0.11
flake8==7.0.0
flake8==7.1.0
fonttools==4.53.0
globus-cli==3.28.2
globus-cli==3.28.3
globus-sdk==3.41.0
iblutil==1.8.0
iblutil==1.10.0
idna==3.7
importlib_metadata==7.1.0
importlib_resources==6.4.0
Expand All @@ -53,12 +53,12 @@ mccabe==0.7.0
numba==0.58.1
numpy==1.24.4
ONE-api==2.7.0
packaging==24.0
packaging==24.1
pandas==2.0.3
pillow==10.3.0
psycopg2-binary==2.9.9
pyarrow==16.1.0
pycodestyle==2.11.1
pycodestyle==2.12.0
pycparser==2.22
pyflakes==3.2.0
PyJWT==2.8.0
Expand All @@ -75,9 +75,9 @@ sqlparse==0.5.0
structlog==24.2.0
tomli==2.0.1
tqdm==4.66.4
typing_extensions==4.12.1
typing_extensions==4.12.2
tzdata==2024.1
uritemplate==4.1.1
urllib3==1.26.18
urllib3==1.26.19
webdavclient3==3.14.6
zipp==3.19.1
zipp==3.19.2

0 comments on commit c51a762

Please sign in to comment.