Skip to content

Commit 83b3bfd

Browse files
authored
Merge branch 'master' into fix/retroicor
2 parents 4fad72f + 9e0e5a3 commit 83b3bfd

File tree

12 files changed

+351
-55
lines changed

12 files changed

+351
-55
lines changed

.all-contributorsrc

Lines changed: 49 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@
1515
"ideas"
1616
]
1717
},
18+
{
19+
"login": "ineschh",
20+
"name": "Inés Chavarría",
21+
"avatar_url": "https://avatars.githubusercontent.com/u/72545702?v=4",
22+
"profile": "https://github.com/ineschh",
23+
"contributions": [
24+
"infra"
25+
]
26+
},
1827
{
1928
"login": "eril892",
2029
"name": "Raphaël Fournier",
@@ -26,6 +35,20 @@
2635
"doc"
2736
]
2837
},
38+
{
39+
"login": "maestroque",
40+
"name": "George Kikas",
41+
"avatar_url": "https://avatars.githubusercontent.com/u/74024609?v=4",
42+
"profile": "https://github.com/maestroque",
43+
"contributions": [
44+
"code",
45+
"ideas",
46+
"infra",
47+
"bug",
48+
"test",
49+
"review"
50+
]
51+
},
2952
{
3053
"login": "TomasLenc",
3154
"name": "Tomas Lenc",
@@ -56,6 +79,16 @@
5679
"mentoring"
5780
]
5881
},
82+
{
83+
"login": "m-miedema",
84+
"name": "m-miedema",
85+
"avatar_url": "https://avatars.githubusercontent.com/u/39968233?v=4",
86+
"profile": "https://github.com/m-miedema",
87+
"contributions": [
88+
"review",
89+
"mentoring"
90+
]
91+
},
5992
{
6093
"login": "smoia",
6194
"name": "Stefano Moia",
@@ -80,6 +113,16 @@
80113
"code"
81114
]
82115
},
116+
{
117+
"login": "me-pic",
118+
"name": "Marie-Eve Picard",
119+
"avatar_url": "https://avatars.githubusercontent.com/u/77584086?v=4",
120+
"profile": "https://github.com/me-pic",
121+
"contributions": [
122+
"review",
123+
"infra"
124+
]
125+
},
83126
{
84127
"login": "tsalo",
85128
"name": "Taylor Salo",
@@ -92,12 +135,13 @@
92135
]
93136
},
94137
{
95-
"login": "ineschh",
96-
"name": "Inés Chavarría",
97-
"avatar_url": "https://avatars.githubusercontent.com/u/72545702?v=4",
98-
"profile": "https://github.com/ineschh",
138+
"login": "RayStick",
139+
"name": "Rachael Stickland",
140+
"avatar_url": "https://avatars.githubusercontent.com/u/50215726?v=4",
141+
"profile": "https://github.com/RayStick",
99142
"contributions": [
100-
"infra"
143+
"infra",
144+
"doc"
101145
]
102146
},
103147
{
@@ -110,29 +154,6 @@
110154
"review",
111155
"userTesting"
112156
]
113-
},
114-
{
115-
"login": "maestroque",
116-
"name": "George Kikas",
117-
"avatar_url": "https://avatars.githubusercontent.com/u/74024609?v=4",
118-
"profile": "https://github.com/maestroque",
119-
"contributions": [
120-
"code",
121-
"ideas",
122-
"infra",
123-
"bug",
124-
"review"
125-
]
126-
},
127-
{
128-
"login": "RayStick",
129-
"name": "Rachael Stickland",
130-
"avatar_url": "https://avatars.githubusercontent.com/u/50215726?v=4",
131-
"profile": "https://github.com/RayStick",
132-
"contributions": [
133-
"doc",
134-
"infra"
135-
]
136157
}
137158
],
138159
"contributorsPerLine": 8,

.github/config.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Configuration for welcome - https://github.com/behaviorbot/welcome
2+
3+
# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
4+
5+
# Comment to be posted to on first time issues
6+
newIssueWelcomeComment: >
7+
![Thank You Banner](https://raw.githubusercontent.com/physiopy/physiopy-test-workflows/master/welcome_banner.png)
8+
9+
🎉 Thank you for opening your first issue in this Physiopy repo! Please check our [contributor guide](https://physiopy.github.io/contributors-guide/) and follow the issue template.
10+
11+
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
12+
13+
# Comment to be posted to on PRs from first time contributors in your repository
14+
newPRWelcomeComment: >
15+
![Thank You Banner](https://raw.githubusercontent.com/physiopy/physiopy-test-workflows/master/welcome_banner.png)
16+
17+
🎉 Thanks for opening your first pull request in this Physiopy repo! Please check our [contributor guide](https://physiopy.github.io/contributors-guide/) and follow the PR template.
18+
19+
# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
20+
21+
# Comment to be posted to on pull requests merged by a first time user
22+
firstPRMergeComment: >
23+
![Thank You Banner](https://raw.githubusercontent.com/physiopy/physiopy-test-workflows/master/welcome_banner.png)
24+
25+
🎉 Congrats on merging your first pull request in this repo! We appreciate your contribution to the Physiopy community!
26+
:eyes: Please check that your contribution is correctly reported in the README of this repo and on [Physiopy's website](https://physiopy.github.io/community/team/)!

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v4.5.0
5+
rev: v4.6.0
66
hooks:
77
- id: trailing-whitespace
88
- id: end-of-file-fixer
@@ -11,15 +11,15 @@ repos:
1111
- id: check-case-conflict
1212
- id: check-merge-conflict
1313
- repo: https://github.com/psf/black
14-
rev: 23.10.0
14+
rev: 24.8.0
1515
hooks:
1616
- id: black
1717
- repo: https://github.com/pycqa/isort
18-
rev: 5.12.0
18+
rev: 5.13.2
1919
hooks:
2020
- id: isort
2121
- repo: https://github.com/pycqa/flake8
22-
rev: 6.1.0
22+
rev: 7.1.1
2323
hooks:
2424
- id: flake8
2525
- repo: https://github.com/pycqa/pydocstyle

0 commit comments

Comments
 (0)