diff options
| -rw-r--r-- | CONTRIBUTORS.txt | 28 | ||||
| -rw-r--r-- | requirements_test.txt | 1 | ||||
| -rw-r--r-- | script/.contributors_aliases.json | 212 | ||||
| -rw-r--r-- | tbump.toml | 5 |
4 files changed, 129 insertions, 117 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 23098537..7e83c18e 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -1,6 +1,8 @@ -# This file is autogenerated by 'contributors-txt', -# using the configuration in 'script/.contributors_aliases.json' -# please do not modify manually +# This file is autocompleted by 'contributors-txt', +# using the configuration in 'script/.contributors_aliases.json'. +# Do not add new persons manually and only add information without +# using '-' as the line first character. +# Please verify that your change are stable if you modify manually. Maintainers ----------- @@ -23,7 +25,7 @@ Maintainers Contributors ------------ - LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr> -- Google, Inc. +- Google, Inc. <no-reply@google.com> - Nick Drozd <nicholasdrozd@gmail.com> - Andrew Haigh <hello@nelf.in> - David Liu <david@cs.toronto.edu> @@ -33,7 +35,6 @@ Contributors - Calen Pennington <calen.pennington@gmail.com> - Phil Schaf <flying-sheep@web.de> - Alex Hall <alex.mojaki@gmail.com> -- jarradhope - Tushar Sadhwani <86737547+tushar-deepsource@users.noreply.github.com> - Tim Martin <tim@asymptotic.co.uk> - Raphael Gaschignard <raphael@makeleaps.com> @@ -69,7 +70,6 @@ Contributors - Joshua Cannon <joshdcannon@gmail.com> - John Vandenberg <jayvdb@gmail.com> - Jacob Bogdanov <jacob@bogdanov.dev> -- François Mockers - David Euresti <github@euresti.com> - David Cain <davidjosephcain@gmail.com> - Anthony Sottile <asottile@umich.edu> @@ -78,14 +78,11 @@ Contributors - tristanlatr <19967168+tristanlatr@users.noreply.github.com> - rr- <rr-@sakuya.pl> - raylu <lurayl@gmail.com> -- platings - mathieui <mathieui@users.noreply.github.com> - markmcclain <markmcclain@users.noreply.github.com> - kasium <15907922+kasium@users.noreply.github.com> - ioanatia <ioanatia@users.noreply.github.com> - grayjk <grayjk@gmail.com> -- carl -- alain lefroy - Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - Zac Hatfield-Dodds <Zac-HD@users.noreply.github.com> - Vilnis Termanis <vilnis.termanis@iotics.com> @@ -111,7 +108,6 @@ Contributors - Michał Masłowski <m.maslowski@clearcode.cc> - Michael K <michael-k@users.noreply.github.com> - Mateusz Bysiek <mb@mbdev.pl> -- Mark Gius - Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com> - Leandro T. C. Melo <ltcmelo@gmail.com> - Konrad Weihmann <kweihmann@outlook.com> @@ -163,3 +159,15 @@ Contributors - Alphadelta14 <alpha@alphaservcomputing.solutions> - Alexander Presnyakov <flagist0@gmail.com> - Ahmed Azzaoui <ahmed.azzaoui@engie.com> + +Co-Author +--------- +The following persons were credited manually but did not commit themselves +under this name, or we did not manage to find their commits in the history. + +- François Mockers +- platings +- carl +- alain lefroy +- Mark Gius +- jarradhope diff --git a/requirements_test.txt b/requirements_test.txt index 3fdf820f..13567538 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -5,6 +5,5 @@ coverage~=5.5 pre-commit~=2.17 pytest-cov~=3.0 tbump~=6.3.2 -contributors-txt~=0.5.2 types-typed-ast; implementation_name=="cpython" and python_version<"3.8" types-pkg_resources==0.1.3 diff --git a/script/.contributors_aliases.json b/script/.contributors_aliases.json index 4eee5779..5dc7241d 100644 --- a/script/.contributors_aliases.json +++ b/script/.contributors_aliases.json @@ -1,96 +1,51 @@ { - "Areveny": { - "authoritative_mail": "areveny@protonmail.com", + "13665637+DanielNoord@users.noreply.github.com": { + "mails": ["13665637+DanielNoord@users.noreply.github.com"], + "name": "Daniël van Noord", + "team": "Maintainers" + }, + "30130371+cdce8p@users.noreply.github.com": { + "mails": ["30130371+cdce8p@users.noreply.github.com"], + "name": "Marc Mueller", + "team": "Maintainers" + }, + "areveny@protonmail.com": { "mails": ["areveny@protonmail.com", "self@areveny.com"], + "name": "Areveny", "team": "Maintainers" }, - "Ashley Whetter": { - "authoritative_mail": "ashley@awhetter.co.uk", + "ashley@awhetter.co.uk": { "mails": [ "ashley@awhetter.co.uk", "awhetter.2011@my.bristol.ac.uk", "asw@dneg.com", "AWhetter@users.noreply.github.com" ], + "name": "Ashley Whetter", "team": "Maintainers" }, - "Bryce Guinta": { - "authoritative_mail": "bryce.paul.guinta@gmail.com", - "mails": ["bryce.paul.guinta@gmail.com", "bryce.guinta@protonmail.com"], - "team": "Maintainers" - }, - "Calen Pennington": { - "authoritative_mail": "calen.pennington@gmail.com", - "mails": ["cale@edx.org", "calen.pennington@gmail.com"] - }, - "Ceridwen": { - "authoritative_mail": "ceridwenv@gmail.com", - "mails": ["ceridwenv@gmail.com"], - "team": "Maintainers" - }, - "Claudiu Popa": { - "authoritative_mail": "pcmanticore@gmail.com", - "mails": ["cpopa@cloudbasesolutions.com", "pcmanticore@gmail.com"], - "team": "Maintainers" - }, - "Daniël van Noord": { - "authoritative_mail": "13665637+DanielNoord@users.noreply.github.com", - "mails": ["13665637+DanielNoord@users.noreply.github.com"], - "team": "Maintainers" - }, - "David Euresti": { - "authoritative_mail": "github@euresti.com", - "mails": ["david@dropbox.com", "github@euresti.com"] - }, - "Dimitri Prybysh": { - "authoritative_mail": "dmand@yandex.ru", - "mails": ["dmand@yandex.ru"], - "team": "Maintainers" - }, - "Florian Bruhin": { - "authoritative_mail": "me@the-compiler.org", - "mails": ["me@the-compiler.org"], - "team": "Maintainers" - }, - "Google, Inc.": { - "authoritative_mail": null, + "bot@noreply.github.com": { "mails": [ - "nathaniel@google.com", - "mbp@google.com", - "tmarek@google.com", - "shlomme@gmail.com", - "balparda@google.com", - "dlindquist@google.com" - ] + "66853113+pre-commit-ci[bot]@users.noreply.github.com", + "49699333+dependabot[bot]@users.noreply.github.com" + ], + "name": "bot" }, - "Hippo91": { - "authoritative_mail": "guillaume.peillex@gmail.com", - "mails": ["guillaume.peillex@gmail.com"], + "bryce.paul.guinta@gmail.com": { + "mails": ["bryce.paul.guinta@gmail.com", "bryce.guinta@protonmail.com"], + "name": "Bryce Guinta", "team": "Maintainers" }, - "Jacob Bogdanov": { - "authoritative_mail": "jacob@bogdanov.dev", - "mails": ["jacob@bogdanov.dev", "jbogdanov@128technology.com"] + "calen.pennington@gmail.com": { + "mails": ["cale@edx.org", "calen.pennington@gmail.com"], + "name": "Calen Pennington" }, - "Jacob Walls": { - "authoritative_mail": "jacobtylerwalls@gmail.com", - "mails": ["jacobtylerwalls@gmail.com"], + "ceridwenv@gmail.com": { + "mails": ["ceridwenv@gmail.com"], + "name": "Ceridwen", "team": "Maintainers" }, - "Joshua Cannon": { - "authoritative_mail": "joshdcannon@gmail.com", - "mails": ["joshdcannon@gmail.com", "joshua.cannon@ni.com"] - }, - "Kavins Singh": { - "authoritative_mail": "kavinsingh@hotmail.com", - "mails": ["kavin.singh@mail.utoronto.ca", "kavinsingh@hotmail.com"] - }, - "Keichi Takahashi": { - "authoritative_mail": "keichi.t@me.com", - "mails": ["hello@keichi.dev", "keichi.t@me.com"] - }, - "LOGILAB S.A. (Paris, FRANCE)": { - "authoritative_mail": "contact@logilab.fr", + "contact@logilab.fr": { "mails": [ "alexandre.fayolle@logilab.fr", "emile.anclin@logilab.fr", @@ -106,53 +61,98 @@ "afayolle.ml@free.fr", "aurelien.campeas@logilab.fr", "lmedioni@logilab.fr" - ] + ], + "name": "LOGILAB S.A. (Paris, FRANCE)" }, - "Marc Mueller": { - "authoritative_mail": "30130371+cdce8p@users.noreply.github.com", - "mails": ["30130371+cdce8p@users.noreply.github.com"], + "dmand@yandex.ru": { + "mails": ["dmand@yandex.ru"], + "name": "Dimitri Prybysh", "team": "Maintainers" }, - "Mario Corchero": { - "authoritative_mail": "mariocj89@gmail.com", - "mails": ["mcorcherojim@bloomberg.net", "mariocj89@gmail.com"] + "github@euresti.com": { + "mails": ["david@dropbox.com", "github@euresti.com"], + "name": "David Euresti" }, - "Moises Lopez": { - "authoritative_mail": "moylop260@vauxoo.com", - "mails": ["moylop260@vauxoo.com"] + "guillaume.peillex@gmail.com": { + "mails": ["guillaume.peillex@gmail.com"], + "name": "Hippo91", + "team": "Maintainers" }, - "Pierre Sassoulas": { - "authoritative_mail": "pierre.sassoulas@gmail.com", - "mails": ["pierre.sassoulas@gmail.com", "pierre.sassoulas@cea.fr"], + "jacob@bogdanov.dev": { + "mails": ["jacob@bogdanov.dev", "jbogdanov@128technology.com"], + "name": "Jacob Bogdanov" + }, + "jacobtylerwalls@gmail.com": { + "mails": ["jacobtylerwalls@gmail.com"], + "name": "Jacob Walls", "team": "Maintainers" }, - "Raphael Gaschignard": { - "authoritative_mail": "raphael@makeleaps.com", - "mails": ["raphael@rtpg.co", "raphael@makeleaps.com"] + "joshdcannon@gmail.com": { + "mails": ["joshdcannon@gmail.com", "joshua.cannon@ni.com"], + "name": "Joshua Cannon" }, - "Stefan Scherfke": { - "authoritative_mail": "stefan@sofa-rockers.org", - "mails": ["stefan.scherfke@energymeteo.de", "stefan@sofa-rockers.org"] + "kavinsingh@hotmail.com": { + "mails": ["kavin.singh@mail.utoronto.ca", "kavinsingh@hotmail.com"], + "name": "Kavins Singh" }, - "Sylvain Thénault": { - "authoritative_mail": "thenault@gmail.com", - "mails": ["thenault@gmail.com", "sylvain.thenault@logilab.fr"], + "keichi.t@me.com": { + "mails": ["hello@keichi.dev", "keichi.t@me.com"], + "name": "Keichi Takahashi" + }, + "mariocj89@gmail.com": { + "mails": ["mcorcherojim@bloomberg.net", "mariocj89@gmail.com"], + "name": "Mario Corchero" + }, + "me@the-compiler.org": { + "mails": ["me@the-compiler.org"], + "name": "Florian Bruhin", "team": "Maintainers" }, - "Ville Skyttä": { - "authoritative_mail": "ville.skytta@iki.fi", - "mails": ["ville.skytta@iki.fi", "ville.skytta@upcloud.com"] + "moylop260@vauxoo.com": { + "mails": ["moylop260@vauxoo.com"], + "name": "Moises Lopez" }, - "bot": { - "authoritative_mail": "bot@noreply.github.com", + "no-reply@google.com": { "mails": [ - "66853113+pre-commit-ci[bot]@users.noreply.github.com", - "49699333+dependabot[bot]@users.noreply.github.com" - ] + "nathaniel@google.com", + "mbp@google.com", + "tmarek@google.com", + "shlomme@gmail.com", + "balparda@google.com", + "dlindquist@google.com" + ], + "name": "Google, Inc." + }, + "pcmanticore@gmail.com": { + "mails": ["cpopa@cloudbasesolutions.com", "pcmanticore@gmail.com"], + "name": "Claudiu Popa", + "team": "Maintainers" }, - "Łukasz Rogalski": { - "authoritative_mail": "rogalski.91@gmail.com", + "pierre.sassoulas@gmail.com": { + "mails": ["pierre.sassoulas@gmail.com", "pierre.sassoulas@cea.fr"], + "name": "Pierre Sassoulas", + "team": "Maintainers" + }, + "raphael@makeleaps.com": { + "mails": ["raphael@rtpg.co", "raphael@makeleaps.com"], + "name": "Raphael Gaschignard" + }, + "rogalski.91@gmail.com": { "mails": ["rogalski.91@gmail.com"], + "name": "Łukasz Rogalski", "team": "Maintainers" + }, + "stefan@sofa-rockers.org": { + "mails": ["stefan.scherfke@energymeteo.de", "stefan@sofa-rockers.org"], + "name": "Stefan Scherfke" + }, + "thenault@gmail.com": { + "mails": ["thenault@gmail.com", "sylvain.thenault@logilab.fr"], + "name": "Sylvain Thénault", + "team": "Maintainers" + }, + "ville.skytta@iki.fi": { + "mails": ["ville.skytta@iki.fi", "ville.skytta@upcloud.com"], + "name": "Ville Skyttä" } } @@ -29,6 +29,11 @@ name = "Upgrade changelog changelog" cmd = "python3 script/bump_changelog.py {new_version}" [[before_commit]] +# We only need this during tbump, it's not compatible with python < 3.7 +name = "Install dependencie for contributors.txt's update." +cmd = "pip install 'contributors-txt>=0.7.3'" + +[[before_commit]] name = "Normalize the contributors-txt configuration" cmd = "contributors-txt-normalize-configuration -a script/.contributors_aliases.json -o script/.contributors_aliases.json" |