Skip to content

Commit de95cb5

Browse files
authored
Merge pull request #912 from bids-standard/rel/0.15.5
REL: 0.15.5
2 parents 6f81c1e + d0ab64b commit de95cb5

File tree

3 files changed

+47
-18
lines changed

3 files changed

+47
-18
lines changed

.zenodo.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@
8989
"name": "Appelhoff, Stefan",
9090
"orcid": "0000-0001-8002-0877"
9191
},
92+
{
93+
"name": "Papadopoulos Orfanos, Dimitri"
94+
},
9295
{
9396
"affiliation": "Department of Psychology, Stanford University",
9497
"name": "Goncalves, Mathias",
@@ -104,9 +107,6 @@
104107
"name": "Hayot-Sasson, Valérie",
105108
"orcid": "0000-0002-4830-4535"
106109
},
107-
{
108-
"name": "Papadopoulos Orfanos, Dimitri"
109-
},
110110
{
111111
"affiliation": "MRC Cognition and Brain Sciences Unit",
112112
"name": "Carlin, Johan",

CHANGELOG.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
Changelog
22
=========
33

4+
Version 0.15.5 (November 07, 2022)
5+
----------------------------------
6+
7+
Bug-fix release in 0.15.x series.
8+
9+
* FIX: Use kwargs for DataFrame.pivot() (#913)
10+
* ENH: Add transformation history to ``BIDSStatsModelsNodeOutput`` (#905)
11+
* ENH: Update examples, add to sphinx, and convert to .md (#908)
12+
* ENH: More helpful __repr__ in modeling (#906)
13+
* MNT: Update git submodules (#911)
14+
* MNT: Bump peter-evans/create-pull-request from 3 to 4 (#904)
15+
* CI: Automatically update GitHub Actions in the future (#903)
16+
417
Version 0.15.4 (October 08, 2022)
518
---------------------------------
619

tools/prep_zenodo.py

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,18 @@
99
def decommify(name):
1010
return ' '.join(name.split(', ')[::-1])
1111

12+
1213
# Users who have asked not to be cited at this time
1314
# XXX We should add a shortlog since the most recent tag and explicitly note
1415
# that a blacklisted user has contributed again recently, and verify they still
1516
# do not want to be cited.
16-
blacklist = {'Cecile Madjar', 'Matthew Wardrop', 'Peter Van Dyken', 'github-actions[bot]'}
17+
blacklist = {
18+
'Cecile Madjar',
19+
'Matthew Wardrop',
20+
'Peter Van Dyken',
21+
'github-actions[bot]',
22+
'dependabot[bot]',
23+
}
1724

1825
# List of repositories whose commits should be counted as contributions
1926
codependents = [('https://github.com/grabbles/grabbit.git', '0.2.6')]
@@ -27,12 +34,16 @@ def decommify(name):
2734
zenodo = json.loads(zenodo_file.read_text()) if zenodo_file.exists() else {}
2835

2936
orig_creators = zenodo.get('creators', [])
30-
creator_map = {decommify(creator['name']): creator
31-
for creator in orig_creators}
37+
creator_map = {
38+
decommify(creator['name']): creator for creator in orig_creators
39+
}
3240

3341
shortlog = run(['git', 'shortlog', '-ns', f'{origin_commit}..'], stdout=PIPE)
34-
counts = [line.split('\t', 1)[::-1]
35-
for line in shortlog.stdout.decode().split('\n') if line]
42+
counts = [
43+
line.split('\t', 1)[::-1]
44+
for line in shortlog.stdout.decode().split('\n')
45+
if line
46+
]
3647

3748
# Get additional commit counts from dependencies
3849
with TemporaryDirectory() as tmpdir:
@@ -46,19 +57,21 @@ def decommify(name):
4657
try:
4758
clone = run(['git', 'clone', '-q', repo, repo_dir], check=True)
4859
except CalledProcessError as err:
49-
raise RuntimeError("Could not clone {}".format(repo)) from err
60+
raise RuntimeError(f'Could not clone {repo}') from err
5061

5162
if ref is None:
5263
tag = run(['git', '-C', repo_dir, 'tag'], stdout=PIPE)
5364
# latest tag
5465
ref = tag.stdout.decode().strip().rsplit('\n', 1)[1]
5566

5667
dep_shortlog = run(
57-
['git', '-C', repo_dir, 'shortlog', '-ns', ref],
58-
stdout=PIPE)
59-
counts.extend(line.split('\t', 1)[::-1]
60-
for line in dep_shortlog.stdout.decode().split('\n')
61-
if line)
68+
['git', '-C', repo_dir, 'shortlog', '-ns', ref], stdout=PIPE
69+
)
70+
counts.extend(
71+
line.split('\t', 1)[::-1]
72+
for line in dep_shortlog.stdout.decode().split('\n')
73+
if line
74+
)
6275

6376
commit_counts = {}
6477
for committer, commits in counts:
@@ -67,9 +80,12 @@ def decommify(name):
6780
# Stable sort:
6881
# Number of commits in reverse order
6982
# Ties broken by alphabetical order of first name
70-
committers = [committer
71-
for committer, _ in sorted(commit_counts.items(),
72-
key=lambda x: (-x[1], x[0]))]
83+
committers = [
84+
committer
85+
for committer, _ in sorted(
86+
commit_counts.items(), key=lambda x: (-x[1], x[0])
87+
)
88+
]
7389

7490
# Tal to the top
7591
first_author = 'Tal Yarkoni'
@@ -81,7 +97,7 @@ def decommify(name):
8197
creator_map.get(committer, {'name': committer})
8298
for committer in committers
8399
if committer not in blacklist
84-
]
100+
]
85101

86102
zenodo['creators'] = creators
87103
zenodo_file.write_text(json.dumps(zenodo, indent=2, ensure_ascii=False) + '\n')

0 commit comments

Comments
 (0)