From e2fab6b11c974e4b8c44c560a5d0c641a356bc9f Mon Sep 17 00:00:00 2001 From: Ricardo Signes Date: Sat, 26 Jun 2021 11:58:57 -0400 Subject: [PATCH 1/8] mailmap: update rjbs canonical address --- .mailmap | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index e09fdabf04e6..96a3431f9086 100644 --- a/.mailmap +++ b/.mailmap @@ -24,9 +24,8 @@ Craig A. Berry Craig A. Berry Nick Ing-Simmons Nick Ing-Simmons -Ricardo Signes -Ricardo Signes -Ricardo Signes +Ricardo Signes +Ricardo Signes Yves Orton Yves Orton yves orton Yves Orton Orton, Yves From 2c8ec174c92b57fd0ac818463dd8077b4129cf6f Mon Sep 17 00:00:00 2001 From: Ricardo Signes Date: Sat, 26 Jun 2021 11:59:33 -0400 Subject: [PATCH 2/8] mailmap: sort the file for easy scanning --- .mailmap | 110 +++++++++++++++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/.mailmap b/.mailmap index 96a3431f9086..77cd9911c11b 100644 --- a/.mailmap +++ b/.mailmap @@ -1,70 +1,70 @@ # https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html#_mapping_authors -Jarkko Hietaniemi +Aaron Crane +Andy Dougherty Andy Dougherty +Andy Dougherty Andy Dougherty +Andy Dougherty Andy Dougherty +Andy Dougherty Andy Dougherty +Audrey Tang Autrijus Tang +Audrey Tang autrijus@ossf.iis.sinica.edu.tw +Ævar Arnfjörð Bjarmason Ævar Arnfjörð Bjarmason +Chip Salzenberg Chip +Chip Salzenberg Chip Salzenberg +Chip Salzenberg Chip Salzenberg +Chip Salzenberg Chip Salzenberg +Chip Salzenberg Chip Salzenberg +Chip Salzenberg Chip Salzenberg +Chris 'BinGOs' Williams Chris BinGOs Williams +Chris 'BinGOs' Williams Chris Williams +Craig A. Berry +Craig A. Berry +David Mitchell +David Mitchell +David Nicol david nicol +Dominic Dunlop +Dominic Dunlop +Dominic Hargreaves +Father Chrysostomos Father Chrysostomos +Gisle Aas Gisle Aas +Gisle Aas Gisle Aas +Gurusamy Sarathy +Hugo van der Sanden +Hugo van der Sanden +Hugo van der Sanden +James E Keenan +James E Keenan James E. Keenan +James E Keenan James Keenan +James E Keenan jkeenan Jarkko Hietaniemi -Jarkko Hietaniemi Jarkko Hietaniemi +Jarkko Hietaniemi +Jarkko Hietaniemi Jarkko Hietaniemi -Karl Williamson -Karl Williamson +Jesse Vincent Jesse Vincent Karl Williamson +Karl Williamson +Karl Williamson Karl Williamson karl williamson (via RT) -Father Chrysostomos Father Chrysostomos +Kurt D. Starsinic +Kurt D. Starsinic Kurt Starsinic +Kurt D. Starsinic Starsinic, Kurt Nicholas Clark Nicholas Clark -David Mitchell -David Mitchell +Nick Ing-Simmons +Nick Ing-Simmons +Nicolas R +Nicolas R +Nicolas R ☢ ℕicolas ℝ Rafael Garcia-Suarez Rafael Garcia-Suarez -Gurusamy Sarathy +Ricardo Signes +Ricardo Signes Steve Hay -Chris 'BinGOs' Williams Chris BinGOs Williams -Chris 'BinGOs' Williams Chris Williams Tony Cook Tony Cook -Craig A. Berry -Craig A. Berry -Nick Ing-Simmons -Nick Ing-Simmons -Ricardo Signes -Ricardo Signes +Yves Orton +Yves Orton +Yves Orton +Yves Orton Yves Orton -Yves Orton yves orton Yves Orton Orton, Yves Yves Orton yves orton -Yves Orton -Yves Orton -Yves Orton -Yves Orton -James E Keenan James E. Keenan -James E Keenan jkeenan -James E Keenan -James E Keenan James Keenan -Jesse Vincent Jesse Vincent -Chip Salzenberg Chip Salzenberg -Chip Salzenberg Chip Salzenberg -Chip Salzenberg Chip Salzenberg -Chip Salzenberg Chip Salzenberg -Chip Salzenberg Chip Salzenberg -Chip Salzenberg Chip -Hugo van der Sanden -Hugo van der Sanden -Hugo van der Sanden -Andy Dougherty Andy Dougherty -Andy Dougherty Andy Dougherty -Andy Dougherty Andy Dougherty -Andy Dougherty Andy Dougherty -Gisle Aas Gisle Aas -Gisle Aas Gisle Aas -Nicolas R ☢ ℕicolas ℝ -Nicolas R -Nicolas R -Ævar Arnfjörð Bjarmason Ævar Arnfjörð Bjarmason -Dominic Hargreaves -Dominic Dunlop -Dominic Dunlop -David Nicol david nicol -Kurt D. Starsinic -Kurt D. Starsinic Kurt Starsinic -Kurt D. Starsinic Starsinic, Kurt -Audrey Tang Autrijus Tang -Audrey Tang autrijus@ossf.iis.sinica.edu.tw -Aaron Crane +Yves Orton yves orton From 812afadf7ce531c423c7da5363b2ceed678387b0 Mon Sep 17 00:00:00 2001 From: Ricardo Signes Date: Sat, 26 Jun 2021 12:06:39 -0400 Subject: [PATCH 3/8] mailmap: add points-to-self entries for core team This provides a single-point-of-update for perlgov automation. We can use email address as a key and pull out the human name. I could have used AUTHORS for this, but I think it would have required a little more code. --- .mailmap | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.mailmap b/.mailmap index 77cd9911c11b..3a28199ee526 100644 --- a/.mailmap +++ b/.mailmap @@ -1,5 +1,7 @@ # https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html#_mapping_authors Aaron Crane +Abhijit Menon-Sen +Andy Dougherty Andy Dougherty Andy Dougherty Andy Dougherty Andy Dougherty Andy Dougherty Andy Dougherty @@ -7,16 +9,21 @@ Andy Dougherty Andy Dougherty Autrijus Tang Audrey Tang autrijus@ossf.iis.sinica.edu.tw Ævar Arnfjörð Bjarmason Ævar Arnfjörð Bjarmason +Chad Granum Chip Salzenberg Chip Chip Salzenberg Chip Salzenberg Chip Salzenberg Chip Salzenberg Chip Salzenberg Chip Salzenberg Chip Salzenberg Chip Salzenberg Chip Salzenberg Chip Salzenberg +Chris 'BinGOs' Williams Chris 'BinGOs' Williams Chris BinGOs Williams Chris 'BinGOs' Williams Chris Williams Craig A. Berry Craig A. Berry +Craig Berry +Dagfinn Ilmari Mannsåker +David Golden David Mitchell David Mitchell David Nicol david nicol @@ -27,6 +34,7 @@ Father Chrysostomos Father Chrysostomos Gisle Aas Gisle Aas Gisle Aas Gurusamy Sarathy +H. Merijn Brand Hugo van der Sanden Hugo van der Sanden Hugo van der Sanden @@ -34,12 +42,17 @@ James E Keenan James E Keenan James E. Keenan James E Keenan James Keenan James E Keenan jkeenan +Jan Dubois Jarkko Hietaniemi Jarkko Hietaniemi Jarkko Hietaniemi Jarkko Hietaniemi Jarkko Hietaniemi +Jason McIntosh Jesse Vincent Jesse Vincent +Jesse Vincent +Karen Etheridge +Karl Williamson Karl Williamson Karl Williamson Karl Williamson @@ -47,17 +60,29 @@ Karl Williamson karl williamson (via RT) Kurt D. Starsinic Kurt Starsinic Kurt D. Starsinic Starsinic, Kurt +Leon Timmermans +Matthew Horsfall +Max Maischein +Neil Bowers Nicholas Clark Nicholas Clark +Nicholas Clark Nick Ing-Simmons Nick Ing-Simmons Nicolas R Nicolas R Nicolas R ☢ ℕicolas ℝ +Paul "LeoNerd" Evans +Philippe "BooK" Bruhat Rafael Garcia-Suarez Rafael Garcia-Suarez +Ricardo Signes Ricardo Signes Ricardo Signes Steve Hay +Steve Hay +Stuart Mackintosh +Todd Rinaldo +Tony Cook Tony Cook Tony Cook Yves Orton From 6826f4988d0c3ad8503af437c1c2d9e5374ac382 Mon Sep 17 00:00:00 2001 From: Ricardo Signes Date: Sat, 26 Jun 2021 12:22:59 -0400 Subject: [PATCH 4/8] core-team: canonical machine-readable list for use in generating perlgov, sending ballots, and so on --- Porting/core-team.json | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Porting/core-team.json diff --git a/Porting/core-team.json b/Porting/core-team.json new file mode 100644 index 000000000000..56f443b37c23 --- /dev/null +++ b/Porting/core-team.json @@ -0,0 +1,35 @@ +{ + "inactive": [ + "ams@toroid.org", + "doughera@lafayette.edu", + "jan@jandubois.com", + "jesse@fsck.com" + ], + "active": [ + "book@cpan.org", + "chris@bingosnet.co.uk", + "cpan@corion.net", + "craigberry@mac.com", + "davem@iabyn.com", + "ether@cpan.org", + "exodist7@gmail.com", + "fawaka@gmail.com", + "hv@crypt.org", + "ilmari@ilmari.org", + "jkeenan@cpan.org", + "jmac@jmac.org", + "khw@cpan.org", + "leonerd@leonerd.org.uk", + "neilb@neilb.org", + "nick@ccl4.org", + "nicolas@atoomic.org", + "perl5@tux.freedom.nl", + "rjbs@semiotic.systems", + "steve.m.hay@googlemail.com", + "stuart@perlfoundation.org", + "toddr@cpanel.net", + "tony@develop-help.com", + "wolfsage@gmail.com", + "xdg@xdg.me" + ] +} From dfb2607048157547b93bdbf9577ee9a12eb7de80 Mon Sep 17 00:00:00 2001 From: Ricardo Signes Date: Sat, 26 Jun 2021 12:23:28 -0400 Subject: [PATCH 5/8] perlgov-team-update: to generate new perlgov member listing I hate this program. I had a hard time clearing my mind to write it, so it is bad, but it works. --- Porting/perlgov-team-update | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Porting/perlgov-team-update diff --git a/Porting/perlgov-team-update b/Porting/perlgov-team-update new file mode 100644 index 000000000000..f5727184c36d --- /dev/null +++ b/Porting/perlgov-team-update @@ -0,0 +1,26 @@ +#!/usr/bin/env perl +use v5.30.0; +use warnings; +use JSON::PP; + +my $file = 'Porting/core-team.json'; +my $data = JSON::PP->new->decode(scalar `cat $file`); + +my $pod = q{}; + +for my $key (qw( active inactive )) { + $pod .= qq{=head2 \u$key Members\n\n=over 4\n\n}; + + my @items = map {; "<$_>" } $data->{$key}->@*; + + open(my $fh, '-|', 'git', 'check-mailmap', @items) + or die "error running check-mailmap: $!"; + + my @lines = <$fh>; + + $pod .= "=item $_\n" for sort @lines; + + $pod .= "=back\n\n"; +} + +say $pod; From f365c9c1e6ec1623bebbf2aef67bf2c6cee04fea Mon Sep 17 00:00:00 2001 From: Ricardo Signes Date: Sat, 26 Jun 2021 12:24:08 -0400 Subject: [PATCH 6/8] perlgov: regenerate member list from tooling --- pod/perlgov.pod | 69 ++++++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/pod/perlgov.pod b/pod/perlgov.pod index 2aaea0209ad1..dbae4bae86ed 100644 --- a/pod/perlgov.pod +++ b/pod/perlgov.pod @@ -482,64 +482,73 @@ Foundation will select a Vote Administrator. The current members of the Perl Core Team are: -=over +=head2 Active Members -=item * Abhijit Menon-Sen (inactive) +=over 4 -=item * Andy Dougherty (inactive) +=item Chad Granum -=item * Chad Granum +=item Chris 'BinGOs' Williams -=item * Chris 'BinGOs' Williams +=item Craig Berry -=item * Craig Berry +=item Dagfinn Ilmari Mannsåker -=item * Dagfinn Ilmari Mannsåker +=item David Golden -=item * Dave Mitchell +=item David Mitchell -=item * David Golden +=item H. Merijn Brand -=item * H. Merijn Brand +=item Hugo van der Sanden -=item * Hugo van der Sanden +=item James E Keenan -=item * James E Keenan +=item Jason McIntosh -=item * Jan Dubois (inactive) +=item Karen Etheridge -=item * Jason McIntosh +=item Karl Williamson -=item * Jesse Vincent (inactive) +=item Leon Timmermans -=item * Karen Etheridge +=item Matthew Horsfall -=item * Karl Williamson +=item Max Maischein -=item * Leon Timmermans +=item Neil Bowers -=item * Matthew Horsfall +=item Nicholas Clark -=item * Max Maischein +=item Nicolas R -=item * Neil Bowers +=item Paul "LeoNerd" Evans -=item * Nicholas Clark +=item Philippe "BooK" Bruhat -=item * Nicolas R. +=item Ricardo Signes -=item * Paul "LeoNerd" Evans +=item Steve Hay -=item * Philippe "BooK" Bruhat +=item Stuart Mackintosh -=item * Ricardo Signes +=item Todd Rinaldo -=item * Steve Hay +=item Tony Cook + +=back -=item * Stuart Mackintosh +=head2 Inactive Members -=item * Todd Rinaldo +=over 4 -=item * Tony Cook +=item Abhijit Menon-Sen + +=item Andy Dougherty + +=item Jan Dubois + +=item Jesse Vincent =back + From 44ff479f9e7385cddf3e48bf5dcf8966a3756e89 Mon Sep 17 00:00:00 2001 From: Ricardo Signes Date: Sat, 26 Jun 2021 12:31:42 -0400 Subject: [PATCH 7/8] MANIFEST: add new files to the manifest --- MANIFEST | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MANIFEST b/MANIFEST index 5583c0b0794e..fb68ee941eca 100644 --- a/MANIFEST +++ b/MANIFEST @@ -5369,6 +5369,7 @@ Porting/config.sh Sample config.sh Porting/config_H Sample config.h Porting/config_h.pl Reorder config_h.SH after metaconfig Porting/core-cpan-diff Compare core distros with their CPAN equivalents +Porting/core-team.json Membership of the Perl Core Team Porting/corecpan.pl Reports outdated dual-lived modules Porting/corelist.pl Generates data for Module::CoreList Porting/corelist-diff Tool to produce corelist diffs @@ -5403,6 +5404,7 @@ Porting/mksample Generate Porting/config_H and Porting/config.sh Porting/new-perldelta.pl Generate a new perldelta Porting/newtests-perldelta.pl Generate Perldelta stub for newly added tests Porting/perldelta_template.pod Template for creating new perldelta.pod files +Porting/perlgov-team-update Tool to update perlgov from perl-core-teaml Porting/perlhist_calculate.pl Perform calculations to update perlhist Porting/pod_lib.pl Code for handling generated pods Porting/pod_rules.pl generate lists of pod files for Makefiles From a756bdefdfc1238626c046e6bdadccfc92341e42 Mon Sep 17 00:00:00 2001 From: Ricardo Signes Date: Sat, 26 Jun 2021 12:57:06 -0400 Subject: [PATCH 8/8] Porting/README.pod: add the new Porting files --- Porting/README.pod | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Porting/README.pod b/Porting/README.pod index 5b8038aac1f4..e60516923af0 100644 --- a/Porting/README.pod +++ b/Porting/README.pod @@ -132,6 +132,11 @@ F files. Generates info for Module::CoreList from this perl tree. +=head2 F + +The canonical list of Perl Core Team members, used to build perlgov.pod, +produce election mailings, and all that sort of thing. + =head2 F List of test files to ignore/skip for deparse tests. @@ -273,6 +278,11 @@ This script outputs the added tests between the two versions of Perl. Template for F. +=head2 F + +This produces a new team list for F, but does not, at present, +insert that content into the file. + =head2 F Generates info for F from this perl tree.