diff --git a/.zenodo.json b/.zenodo.json index 41bf18dbc..cf95c8be6 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -89,6 +89,9 @@ "name": "Appelhoff, Stefan", "orcid": "0000-0001-8002-0877" }, + { + "name": "Papadopoulos Orfanos, Dimitri" + }, { "affiliation": "Department of Psychology, Stanford University", "name": "Goncalves, Mathias", @@ -104,9 +107,6 @@ "name": "Hayot-Sasson, Valérie", "orcid": "0000-0002-4830-4535" }, - { - "name": "Papadopoulos Orfanos, Dimitri" - }, { "affiliation": "MRC Cognition and Brain Sciences Unit", "name": "Carlin, Johan", diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3de6df56b..2294bb26e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,19 @@ Changelog ========= +Version 0.15.5 (November 07, 2022) +---------------------------------- + +Bug-fix release in 0.15.x series. + +* FIX: Use kwargs for DataFrame.pivot() (#913) +* ENH: Add transformation history to ``BIDSStatsModelsNodeOutput`` (#905) +* ENH: Update examples, add to sphinx, and convert to .md (#908) +* ENH: More helpful __repr__ in modeling (#906) +* MNT: Update git submodules (#911) +* MNT: Bump peter-evans/create-pull-request from 3 to 4 (#904) +* CI: Automatically update GitHub Actions in the future (#903) + Version 0.15.4 (October 08, 2022) --------------------------------- diff --git a/tools/prep_zenodo.py b/tools/prep_zenodo.py index bde0c7823..f396792b6 100755 --- a/tools/prep_zenodo.py +++ b/tools/prep_zenodo.py @@ -9,11 +9,18 @@ def decommify(name): return ' '.join(name.split(', ')[::-1]) + # Users who have asked not to be cited at this time # XXX We should add a shortlog since the most recent tag and explicitly note # that a blacklisted user has contributed again recently, and verify they still # do not want to be cited. -blacklist = {'Cecile Madjar', 'Matthew Wardrop', 'Peter Van Dyken', 'github-actions[bot]'} +blacklist = { + 'Cecile Madjar', + 'Matthew Wardrop', + 'Peter Van Dyken', + 'github-actions[bot]', + 'dependabot[bot]', +} # List of repositories whose commits should be counted as contributions codependents = [('https://github.com/grabbles/grabbit.git', '0.2.6')] @@ -27,12 +34,16 @@ def decommify(name): zenodo = json.loads(zenodo_file.read_text()) if zenodo_file.exists() else {} orig_creators = zenodo.get('creators', []) -creator_map = {decommify(creator['name']): creator - for creator in orig_creators} +creator_map = { + decommify(creator['name']): creator for creator in orig_creators +} shortlog = run(['git', 'shortlog', '-ns', f'{origin_commit}..'], stdout=PIPE) -counts = [line.split('\t', 1)[::-1] - for line in shortlog.stdout.decode().split('\n') if line] +counts = [ + line.split('\t', 1)[::-1] + for line in shortlog.stdout.decode().split('\n') + if line +] # Get additional commit counts from dependencies with TemporaryDirectory() as tmpdir: @@ -46,7 +57,7 @@ def decommify(name): try: clone = run(['git', 'clone', '-q', repo, repo_dir], check=True) except CalledProcessError as err: - raise RuntimeError("Could not clone {}".format(repo)) from err + raise RuntimeError(f'Could not clone {repo}') from err if ref is None: tag = run(['git', '-C', repo_dir, 'tag'], stdout=PIPE) @@ -54,11 +65,13 @@ def decommify(name): ref = tag.stdout.decode().strip().rsplit('\n', 1)[1] dep_shortlog = run( - ['git', '-C', repo_dir, 'shortlog', '-ns', ref], - stdout=PIPE) - counts.extend(line.split('\t', 1)[::-1] - for line in dep_shortlog.stdout.decode().split('\n') - if line) + ['git', '-C', repo_dir, 'shortlog', '-ns', ref], stdout=PIPE + ) + counts.extend( + line.split('\t', 1)[::-1] + for line in dep_shortlog.stdout.decode().split('\n') + if line + ) commit_counts = {} for committer, commits in counts: @@ -67,9 +80,12 @@ def decommify(name): # Stable sort: # Number of commits in reverse order # Ties broken by alphabetical order of first name -committers = [committer - for committer, _ in sorted(commit_counts.items(), - key=lambda x: (-x[1], x[0]))] +committers = [ + committer + for committer, _ in sorted( + commit_counts.items(), key=lambda x: (-x[1], x[0]) + ) +] # Tal to the top first_author = 'Tal Yarkoni' @@ -81,7 +97,7 @@ def decommify(name): creator_map.get(committer, {'name': committer}) for committer in committers if committer not in blacklist - ] +] zenodo['creators'] = creators zenodo_file.write_text(json.dumps(zenodo, indent=2, ensure_ascii=False) + '\n')