Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rel/0.14.0 #2292

Merged
merged 9 commits into from
Nov 22, 2017
Merged

Rel/0.14.0 #2292

merged 9 commits into from
Nov 22, 2017

Conversation

mgxd
Copy link
Member

@mgxd mgxd commented Nov 20, 2017

Fixes #2234 .

Please review and let me know if anything is missing

@effigies
Copy link
Member

I think that mailmap needs to be almost entirely reverted. If I remember correctly, the first entry of each row is the "correct" name/email, and the second entry is an alias.

@satra
Copy link
Member

satra commented Nov 20, 2017

@mgxd - for mailmap easiest is to check who is not in mailmap and only add those to the relevant places.

for zenodo i did something like this and then hand edited:

import json
from fuzzywuzzy import fuzz, process
with open('contributors-lines.txt', 'rt') as fp:
    data = [' '.join(val.strip().split()[1:-1]) for val in fp.readlines() if '%' in val]
with open('.zenodo.json', 'rt') as fp:
    zenodo = json.load(fp)
zen_names = [' '.join(val['name'].split(',')[::-1]).strip() for val in zenodo['creators']]
name_matches = []
for ele in data:
    matches = process.extract(ele, zen_names, scorer=fuzz.token_sort_ratio, limit=2)
    if matches[0][1] > 80:
        #val = (ele, matches[0], zen_names.index(matches[0][0]))
        val = zenodo['creators'][zen_names.index(matches[0][0])]
    else:
        #val = (ele, matches, None)
        val = [ele]
        for match in matches:
            val.append(zenodo['creators'][zen_names.index(match[0])])
    name_matches.append(val)
zenodo['creators'] = name_matches
with open('zenodo.json', 'wt') as fp:
    fp.write(json.dumps(zenodo, indent=2, sort_keys=True))

for contributor lines i used something from the web like git-line-summary or some such.

CHANGES Outdated

0.14.0 (November 20, 2017)
==========================
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i would also put a URL to the milestone page so every PR can be seen.

@satra
Copy link
Member

satra commented Nov 22, 2017

can you change travis.yml as well in this PR?
we can then merge this and tag master to test pypi deployment - we can include the other PRs in rc2

@mgxd
Copy link
Member Author

mgxd commented Nov 22, 2017

ready to try it out?

@mgxd mgxd merged commit 98cffc7 into nipy:master Nov 22, 2017
@mgxd mgxd deleted the rel/0.14.0 branch November 29, 2017 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants