On Mon, 30 Aug 2021 at 22:44, Aaron Meurer <[email protected]> wrote:
> On Mon, Aug 30, 2021 at 1:46 PM Oscar <[email protected]> wrote: > > > > Okay so here's a proposal: > > > > List all authors in .mailmap which can be sorted alphabetically by > primary name/email combination. New contributors have to add their name and > email address in there (plus any alternate name/email combinations used in > their commits). They should then run a script that sorts the file and > commit and push that change to .mailmap. CI checks that the mailmap lists > all authors and fails if not. Then at release time the AUTHORS file itself > is updated keeping the ordering system that is already in use. On the > release branch we can have CI fail if the AUTHORS file is not up to date > but new contributors don't usually open PRs for the release branch so > conflicts are unlikely. In future that would mean that merge conflicts > around the AUTHORS file are unlikely and we would always have an accurate > list of names of contributors. > > > > Does that sound reasonable? > > I think so. As long as the script is idempotent so that you can always > just run the script to make sure everything is sorted properly. I do > think making the script interactive would be even better, so that > people don't have to figure out how .mailmap works, but this should at > least fix the merge conflict problems. > For now a more immediate fix is just to disable this check in CI: https://github.com/sympy/sympy/pull/21987 I'll open a new PR once I have implemented a better approach but I think it would be good just to stop causing trouble for currently open PRs right now. Oscar -- You received this message because you are subscribed to the Google Groups "sympy" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/sympy/CAHVvXxQdcZyEKqO-sYkyvXTJFLwrWu6qZMRua%3DwpR0b1P7LVPw%40mail.gmail.com.
