Skip to content

Commit d5568c9

Browse files
authored
Merge branch 'master' into relzenodo
2 parents 6581388 + b0e6744 commit d5568c9

File tree

10 files changed

+703
-620
lines changed

10 files changed

+703
-620
lines changed

.all-contributorsrc

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@
192192
"login": "ali_khan",
193193
"name": "Ali Khan"
194194
},
195+
{
196+
"contributions": [
197+
"tool"
198+
],
199+
"login": "alizee_wickenheiser",
200+
"name": "Alizee Wickenheiser"
201+
},
195202
{
196203
"contributions": [
197204
"userTesting"
@@ -443,6 +450,14 @@
443450
"login": "carlo_miniussi",
444451
"name": "Carlo Miniussi"
445452
},
453+
{
454+
"contributions": [
455+
"data",
456+
"tool"
457+
],
458+
"login": "cecile_madjar",
459+
"name": "Cecile Madjar"
460+
},
446461
{
447462
"contributions": [
448463
"doc"
@@ -1002,7 +1017,8 @@
10021017
"tool",
10031018
"eventOrganizing",
10041019
"fundingFinding",
1005-
"infra"
1020+
"infra",
1021+
"talk"
10061022
],
10071023
"login": "francopestilli",
10081024
"name": "Franco Pestilli",
@@ -1461,6 +1477,13 @@
14611477
"name": "Jeanette Mumford",
14621478
"profile": "https://jeanettemumford.org/"
14631479
},
1480+
{
1481+
"contributions": [
1482+
"tool"
1483+
],
1484+
"login": "jefferson_casimir",
1485+
"name": "Jefferson Casimir"
1486+
},
14641487
{
14651488
"contributions": [
14661489
"doc"
@@ -1799,6 +1822,13 @@
17991822
"name": "Kurt Schilling",
18001823
"profile": "https://github.com/schillkg"
18011824
},
1825+
{
1826+
"contributions": [
1827+
"tool"
1828+
],
1829+
"login": "laetitia_fesselier",
1830+
"name": "Laetitia Fesselier"
1831+
},
18021832
{
18031833
"contributions": [
18041834
"financial"
@@ -2728,6 +2758,17 @@
27282758
"login": "stephan_bickel",
27292759
"name": "Stephan Bickel"
27302760
},
2761+
{
2762+
"contributions": [
2763+
"bug",
2764+
"code",
2765+
"question",
2766+
"tool",
2767+
"userTesting"
2768+
],
2769+
"login": "smeisler",
2770+
"name": "Steven Meisler"
2771+
},
27312772
{
27322773
"avatar_url": "https://avatars.githubusercontent.com/u/11152799?v=4",
27332774
"contributions": [
@@ -2987,6 +3028,14 @@
29873028
"name": "Tristan Glatard",
29883029
"profile": "https://github.com/glatard"
29893030
},
3031+
{
3032+
"contributions": [
3033+
"data",
3034+
"tool"
3035+
],
3036+
"login": "tyler_collins",
3037+
"name": "Tyler Collins"
3038+
},
29903039
{
29913040
"contributions": [
29923041
"doc"
@@ -3091,7 +3140,14 @@
30913140
"tool",
30923141
"question",
30933142
"bug",
3094-
"code"
3143+
"code",
3144+
"data",
3145+
"fundingFinding",
3146+
"ideas",
3147+
"plugin",
3148+
"review",
3149+
"userTesting",
3150+
"infra"
30953151
],
30963152
"login": "yarikoptic",
30973153
"name": "Yaroslav O. Halchenko",

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
- id: check-added-large-files
1414
- id: check-case-conflict
1515
- repo: https://github.com/psf/black
16-
rev: 23.10.1
16+
rev: 23.11.0
1717
hooks:
1818
- id: black
1919
files: ^tools/(?!schemacode)
@@ -38,7 +38,7 @@ repos:
3838
- id: flake8
3939
args: [--config=tools/schemacode/setup.cfg]
4040
- repo: https://github.com/pre-commit/mirrors-prettier
41-
rev: v3.0.3
41+
rev: v3.1.0
4242
hooks:
4343
- id: prettier
4444
files: src/schema/.*/.*\.yaml
@@ -48,7 +48,7 @@ repos:
4848
- id: codespell
4949
args: ["--config=.codespellrc", "--dictionary=-", "--dictionary=.codespell_dict"]
5050
- repo: https://github.com/pre-commit/mirrors-mypy
51-
rev: v1.6.1
51+
rev: v1.7.0
5252
hooks:
5353
- id: mypy
5454
# Sync with project.optional-dependencies.typing

.tributors

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,14 @@
174174
],
175175
"name": "Ali Khan"
176176
},
177+
"alizee_wickenheiser": {
178+
"affiliation": "LORIS, MCIN, Montreal Neurological Institute, McGill University",
179+
"contributions": [
180+
"tool"
181+
],
182+
"email": "[email protected]",
183+
"name": "Alizee Wickenheiser"
184+
},
177185
"ana_fouto": {
178186
"contributions": [
179187
"userTesting"
@@ -407,6 +415,15 @@
407415
"name": "Carlo Miniussi",
408416
"orcid": "0000-0002-5436-4745"
409417
},
418+
"cecile_madjar": {
419+
"affiliation": "LORIS, MCIN, Montreal Neurological Institute, McGill University",
420+
"contributions": [
421+
"data",
422+
"tool"
423+
],
424+
"email": "[email protected]",
425+
"name": "Cecile Madjar"
426+
},
410427
"chloé_pasturel": {
411428
"contributions": [
412429
"doc"
@@ -953,7 +970,8 @@
953970
"tool",
954971
"eventOrganizing",
955972
"fundingFinding",
956-
"infra"
973+
"infra",
974+
"talk"
957975
],
958976
"name": "Franco Pestilli"
959977
},
@@ -1401,6 +1419,14 @@
14011419
"name": "Jeanette Mumford",
14021420
"publish_email": false
14031421
},
1422+
"jefferson_casimir": {
1423+
"affiliation": "LORIS, MCIN, Montreal Neurological Institute, McGill University",
1424+
"contributions": [
1425+
"tool"
1426+
],
1427+
"email": "[email protected]",
1428+
"name": "Jefferson Casimir"
1429+
},
14041430
"jeffrey_g_ojemann": {
14051431
"contributions": [
14061432
"doc"
@@ -1737,6 +1763,14 @@
17371763
],
17381764
"name": "Kurt Schilling"
17391765
},
1766+
"laetitia_fesselier": {
1767+
"affiliation": "LORIS, MCIN, Montreal Neurological Institute, McGill University",
1768+
"contributions": [
1769+
"tool"
1770+
],
1771+
"email": "[email protected]",
1772+
"name": "Laetitia Fesselier"
1773+
},
17401774
"laura_and_john_arnold_foundation": {
17411775
"contributions": [
17421776
"financial"
@@ -2649,6 +2683,20 @@
26492683
],
26502684
"name": "Stephan Bickel"
26512685
},
2686+
"smeisler": {
2687+
"affiliation": "Program in Speech and Hearing Bioscience and Technology, Harvard University",
2688+
"contributions": [
2689+
"bug",
2690+
"code",
2691+
"question",
2692+
"tool",
2693+
"userTesting"
2694+
],
2695+
"email": "[email protected]",
2696+
"github": "smeisler",
2697+
"name": "Steven Meisler",
2698+
"orcid": "0000-0002-8888-1572"
2699+
},
26522700
"suyashdb": {
26532701
"blog": "https://www.linkedin.com/in/suyashb/",
26542702
"contributions": [
@@ -2907,6 +2955,15 @@
29072955
"name": "Tristan Glatard",
29082956
"orcid": "0000-0003-2620-5883"
29092957
},
2958+
"tyler_collins": {
2959+
"affiliation": "BrockU, LORIS, MCIN, Montreal Neurological Institute, McGill University",
2960+
"contributions": [
2961+
"data",
2962+
"tool"
2963+
],
2964+
"email": "[email protected]",
2965+
"name": "Tyler Collins"
2966+
},
29102967
"ulrike_bingel": {
29112968
"contributions": [
29122969
"doc"
@@ -3006,7 +3063,14 @@
30063063
"tool",
30073064
"question",
30083065
"bug",
3009-
"code"
3066+
"code",
3067+
"data",
3068+
"fundingFinding",
3069+
"ideas",
3070+
"plugin",
3071+
"review",
3072+
"userTesting",
3073+
"infra"
30103074
],
30113075
"email": "[email protected]",
30123076
"name": "Yaroslav O. Halchenko",

0 commit comments

Comments
 (0)