Bug 28386 - Replace dev_map.yaml from release_tools with .mailmap
Summary: Replace dev_map.yaml from release_tools with .mailmap
Status: Pushed to stable
Alias: None
Product: Koha
Classification: Unclassified
Component: Architecture, internals, and plumbing (show other bugs)
Version: master
Hardware: All All
: P5 - low enhancement (vote)
Assignee: Jonathan Druart
QA Contact: Testopia
URL:
Keywords:
Depends on: 26621
Blocks: 28442
  Show dependency treegraph
 
Reported: 2021-05-19 10:51 UTC by Jonathan Druart
Modified: 2021-06-09 00:50 UTC (History)
2 users (show)

See Also:
Change sponsored?: ---
Patch complexity: ---
Text to go in the release notes:
Version(s) released in:
21.05.00


Attachments
Bug 28386: Adjust .mailmap (59.71 KB, patch)
2021-05-19 12:27 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Some manual removals from contributors.yaml (1.96 KB, patch)
2021-05-19 12:27 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Remove unknown authors (1.32 KB, patch)
2021-05-19 12:27 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Update Nicole (6.30 KB, patch)
2021-05-19 12:27 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Update Kyle (8.68 KB, patch)
2021-05-19 12:27 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Meenakshi.R vs Meenakshi R (1.69 KB, patch)
2021-05-19 12:28 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Update Hector (1.56 KB, patch)
2021-05-19 12:28 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Add history_notes (1.62 KB, patch)
2021-05-19 12:28 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: [DO NOT PUSH] Update contributors using script (41.00 KB, patch)
2021-05-19 12:28 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: [DO NOT PUSH] Update history using script (135.52 KB, patch)
2021-05-19 12:28 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Disambiguate Séverine (to squash) (1.20 KB, patch)
2021-05-19 13:45 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Add sponsors to .mailmap (3.57 KB, patch)
2021-05-19 14:38 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Adjust .mailmap (59.77 KB, patch)
2021-05-20 15:21 UTC, Martin Renvoize
Details | Diff | Splinter Review
Bug 28386: Some manual removals from contributors.yaml (2.02 KB, patch)
2021-05-20 15:21 UTC, Martin Renvoize
Details | Diff | Splinter Review
Bug 28386: Remove unknown authors (1.38 KB, patch)
2021-05-20 15:21 UTC, Martin Renvoize
Details | Diff | Splinter Review
Bug 28386: Update Nicole (6.36 KB, patch)
2021-05-20 15:21 UTC, Martin Renvoize
Details | Diff | Splinter Review
Bug 28386: Update Kyle (8.74 KB, patch)
2021-05-20 15:21 UTC, Martin Renvoize
Details | Diff | Splinter Review
Bug 28386: Meenakshi.R vs Meenakshi R (1.75 KB, patch)
2021-05-20 15:21 UTC, Martin Renvoize
Details | Diff | Splinter Review
Bug 28386: Update Hector (1.62 KB, patch)
2021-05-20 15:21 UTC, Martin Renvoize
Details | Diff | Splinter Review
Bug 28386: Add history_notes (1.68 KB, patch)
2021-05-20 15:21 UTC, Martin Renvoize
Details | Diff | Splinter Review
Bug 28386: [DO NOT PUSH] Update contributors using script (41.06 KB, patch)
2021-05-20 15:22 UTC, Martin Renvoize
Details | Diff | Splinter Review
Bug 28386: [DO NOT PUSH] Update history using script (135.59 KB, patch)
2021-05-20 15:22 UTC, Martin Renvoize
Details | Diff | Splinter Review
Bug 28386: Disambiguate Séverine (to squash) (1.26 KB, patch)
2021-05-20 15:22 UTC, Martin Renvoize
Details | Diff | Splinter Review
Bug 28386: Add sponsors to .mailmap (3.63 KB, patch)
2021-05-20 15:22 UTC, Martin Renvoize
Details | Diff | Splinter Review
Bug 28386: fisheye is certainly Olwen (1.10 KB, patch)
2021-05-24 13:37 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Fix Pawel history notes (786 bytes, patch)
2021-05-24 13:37 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Update contributors using script (40.76 KB, patch)
2021-05-24 13:54 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Update history using script (135.62 KB, patch)
2021-05-24 13:54 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Add the 3 unknown authors back into the contributors list with a note (1.13 KB, patch)
2021-05-25 07:27 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Add the 3 unknown authors back into the contributors list with a note (1.13 KB, patch)
2021-05-25 07:30 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Add more disambiguations to .mailmap (4.49 KB, patch)
2021-05-25 14:24 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Add more disambiguations to .mailmap (5.20 KB, patch)
2021-05-25 14:38 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Disambiguate Tomas and Blou (1.77 KB, patch)
2021-05-26 10:31 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Remove _others_ from the contributor list (850 bytes, patch)
2021-05-27 12:41 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 28386: Sort authors by lastname || firstname (1.31 KB, patch)
2021-05-27 12:41 UTC, Jonathan Druart
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Jonathan Druart 2021-05-19 10:51:07 UTC
To generate the release notes, the history.txt and contributors.yaml files we are using a custom dev_map.yaml in the release_tools repo.

Instead we should improve our .mailmap and use it for that purpose (author's disambiguation)
Comment 1 Jonathan Druart 2021-05-19 12:27:43 UTC
Created attachment 121153 [details] [review]
Bug 28386: Adjust .mailmap

Again, we need to adjust our .mailmap
This time the goal is the use it in place of the dev_map.yaml we have in
the release tools.

This will be generated for the release notes, history.txt and
contributors.yaml file

This can be tested using:
  git check-mailmap "author <email>"

For instance:
  git check-mailmap "Wrong name <jonathan.druart@bugs.koha-community.org>"
Comment 2 Jonathan Druart 2021-05-19 12:27:47 UTC
Created attachment 121154 [details] [review]
Bug 28386: Some manual removals from contributors.yaml

Those are not real authors and should be removed from the
contributors.yaml file
Comment 3 Jonathan Druart 2021-05-19 12:27:50 UTC
Created attachment 121155 [details] [review]
Bug 28386: Remove unknown authors

Those 3 authors are not in the git history, we should remove them from
the author list.
However we could re-add them to the contributor list with a note saying
for instance they were part of the Catalyst Academy (need to double
check that first)
Comment 4 Jonathan Druart 2021-05-19 12:27:54 UTC
Created attachment 121156 [details] [review]
Bug 28386: Update Nicole

Need to match .mailmap
Comment 5 Jonathan Druart 2021-05-19 12:27:58 UTC
Created attachment 121157 [details] [review]
Bug 28386: Update Kyle

Need to match .mailmap
Comment 6 Jonathan Druart 2021-05-19 12:28:02 UTC
Created attachment 121158 [details] [review]
Bug 28386: Meenakshi.R vs Meenakshi R

Needs to match .mailmap
Comment 7 Jonathan Druart 2021-05-19 12:28:06 UTC
Created attachment 121159 [details] [review]
Bug 28386: Update Hector
Comment 8 Jonathan Druart 2021-05-19 12:28:09 UTC
Created attachment 121160 [details] [review]
Bug 28386: Add history_notes

The "developer" lines of history.txt will be regenerated using the git
history so we need to add this as a separate info.
See the release_tools changes for more info
Comment 9 Jonathan Druart 2021-05-19 12:28:14 UTC
Created attachment 121161 [details] [review]
Bug 28386: [DO NOT PUSH] Update contributors using script

This is an example of what will be regenerated.
It will need to be regenerated once it will be pushed
Comment 10 Jonathan Druart 2021-05-19 12:28:19 UTC
Created attachment 121162 [details] [review]
Bug 28386: [DO NOT PUSH] Update history using script

This is an example of what will be regenerated.
Comment 11 Jonathan Druart 2021-05-19 12:28:39 UTC
This must be tested with the merge requests linked with https://gitlab.com/koha-community/release-tools/-/issues/23
Comment 12 Jonathan Druart 2021-05-19 13:45:16 UTC
Created attachment 121177 [details] [review]
Bug 28386: Disambiguate Séverine (to squash)
Comment 13 Jonathan Druart 2021-05-19 14:38:20 UTC
Created attachment 121180 [details] [review]
Bug 28386: Add sponsors to .mailmap

They were in dev_map.yaml, we are cheating with the <sponsor> email but
it seems to work fine in my tests
Comment 14 Martin Renvoize 2021-05-20 15:21:33 UTC
Created attachment 121245 [details] [review]
Bug 28386: Adjust .mailmap

Again, we need to adjust our .mailmap
This time the goal is the use it in place of the dev_map.yaml we have in
the release tools.

This will be generated for the release notes, history.txt and
contributors.yaml file

This can be tested using:
  git check-mailmap "author <email>"

For instance:
  git check-mailmap "Wrong name <jonathan.druart@bugs.koha-community.org>"

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 15 Martin Renvoize 2021-05-20 15:21:37 UTC
Created attachment 121246 [details] [review]
Bug 28386: Some manual removals from contributors.yaml

Those are not real authors and should be removed from the
contributors.yaml file

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 16 Martin Renvoize 2021-05-20 15:21:41 UTC
Created attachment 121247 [details] [review]
Bug 28386: Remove unknown authors

Those 3 authors are not in the git history, we should remove them from
the author list.
However we could re-add them to the contributor list with a note saying
for instance they were part of the Catalyst Academy (need to double
check that first)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 17 Martin Renvoize 2021-05-20 15:21:44 UTC
Created attachment 121248 [details] [review]
Bug 28386: Update Nicole

Need to match .mailmap

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 18 Martin Renvoize 2021-05-20 15:21:47 UTC
Created attachment 121249 [details] [review]
Bug 28386: Update Kyle

Need to match .mailmap

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 19 Martin Renvoize 2021-05-20 15:21:51 UTC
Created attachment 121250 [details] [review]
Bug 28386: Meenakshi.R vs Meenakshi R

Needs to match .mailmap

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 20 Martin Renvoize 2021-05-20 15:21:54 UTC
Created attachment 121251 [details] [review]
Bug 28386: Update Hector

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 21 Martin Renvoize 2021-05-20 15:21:58 UTC
Created attachment 121252 [details] [review]
Bug 28386: Add history_notes

The "developer" lines of history.txt will be regenerated using the git
history so we need to add this as a separate info.
See the release_tools changes for more info

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 22 Martin Renvoize 2021-05-20 15:22:02 UTC
Created attachment 121253 [details] [review]
Bug 28386: [DO NOT PUSH] Update contributors using script

This is an example of what will be regenerated.
It will need to be regenerated once it will be pushed

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 23 Martin Renvoize 2021-05-20 15:22:06 UTC
Created attachment 121254 [details] [review]
Bug 28386: [DO NOT PUSH] Update history using script

This is an example of what will be regenerated.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 24 Martin Renvoize 2021-05-20 15:22:10 UTC
Created attachment 121255 [details] [review]
Bug 28386: Disambiguate Séverine (to squash)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 25 Martin Renvoize 2021-05-20 15:22:14 UTC
Created attachment 121256 [details] [review]
Bug 28386: Add sponsors to .mailmap

They were in dev_map.yaml, we are cheating with the <sponsor> email but
it seems to work fine in my tests

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment 26 Martin Renvoize 2021-05-20 15:24:28 UTC
Great work Jonathan, this is a massive improvement.

Signing off.
Comment 27 Victor Grousset/tuxayo 2021-05-22 23:14:41 UTC
Issue found :o

https://gitlab.com/koha-community/release-tools/-/merge_requests/20#note_582762743
Comment 28 Jonathan Druart 2021-05-23 14:22:39 UTC
Answered.
Comment 29 Victor Grousset/tuxayo 2021-05-23 15:07:13 UTC
It work! Thanks for finding the issue.
Comment 30 Jonathan Druart 2021-05-24 13:37:34 UTC
Created attachment 121329 [details] [review]
Bug 28386: fisheye is certainly Olwen

After a chat with Chris it seems that fisheye was Olwen.
Comment 31 Jonathan Druart 2021-05-24 13:37:39 UTC
Created attachment 121330 [details] [review]
Bug 28386: Fix Pawel history notes
Comment 32 Jonathan Druart 2021-05-24 13:54:23 UTC
Created attachment 121331 [details] [review]
Bug 28386: Update contributors using script

This is an example of what will be regenerated.
It will need to be regenerated once it will be pushed
Comment 33 Jonathan Druart 2021-05-24 13:54:28 UTC
Created attachment 121332 [details] [review]
Bug 28386: Update history using script

This is an example of what will be regenerated.
Comment 34 Jonathan Druart 2021-05-25 07:27:36 UTC
Created attachment 121354 [details] [review]
Bug 28386: Add the 3 unknown authors back into the contributors list with a note
Comment 35 Jonathan Druart 2021-05-25 07:30:55 UTC
Created attachment 121355 [details] [review]
Bug 28386: Add the 3 unknown authors back into the contributors list with a note
Comment 36 Jonathan Druart 2021-05-25 07:47:32 UTC
Pushed to master for 21.05, thanks to everybody involved!
Comment 37 Jonathan Druart 2021-05-25 14:24:33 UTC
Created attachment 121378 [details] [review]
Bug 28386: Add more disambiguations to .mailmap
Comment 38 Jonathan Druart 2021-05-25 14:38:56 UTC
Created attachment 121384 [details] [review]
Bug 28386: Add more disambiguations to .mailmap
Comment 39 Jonathan Druart 2021-05-26 07:53:29 UTC
Last patch pushed to master.
Comment 41 Jonathan Druart 2021-05-26 10:31:32 UTC
Created attachment 121420 [details] [review]
Bug 28386: Disambiguate Tomas and Blou
Comment 42 Jonathan Druart 2021-05-26 13:11:16 UTC
Last patch pushed to master.
Comment 43 Jonathan Druart 2021-05-27 12:41:47 UTC
Created attachment 121447 [details] [review]
Bug 28386: Remove _others_ from the contributor list

We arbitrarily use "_others_" for unknown contributors (biblibre,
bywater, ptfs-e teams, etc)
Comment 44 Jonathan Druart 2021-05-27 12:41:52 UTC
Created attachment 121448 [details] [review]
Bug 28386: Sort authors by lastname || firstname

If several authors have the same lastname, they are swapped in the list between the different runs.

This is reusing the code from the release_tools, see issue #24
Comment 45 Jonathan Druart 2021-05-27 13:11:24 UTC
Last 2 patches pushed to master.