Cleanup after finding emails and duplicates

1 files changed, 13 insertions, 35 deletions

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 67a7e5d9b..9a86723b3 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -99,7 +99,7 @@ contributors:
 - Cosmin Poieană <cmin@ropython.org>: unichr-builtin and improvements to bad-open-mode.
 - Steven Myint <hg@stevenmyint.com>: duplicate-except.
 - Peter Kolbus <peter.kolbus@gmail.com> (Garmin)
-- Luigi Bertaco Cristofolini <luigi.cristofolini@q-ctrl.com> <lucristofolini@gmail.com> (luigibertaco)
+- Luigi Bertaco Cristofolini <lucristofolini@gmail.com> (luigibertaco)
 - Glenn Matthews <glenn@e-dad.net>:
   * autogenerated documentation for optional extensions,
   * bug fixes and enhancements for docparams (née check_docs) extension
@@ -145,9 +145,11 @@ contributors:
 - Mark Bell <mark00bell@googlemail.com>
 - Konstantina Saketou <56515303+ksaketou@users.noreply.github.com>
 - Hugo van Kemenade <hugovk@users.noreply.github.com>
+- Hornwitser <github@hornwitser.no>: fix import graph
+- Fureigh <rhys.fureigh@gsa.gov>
 - David Douard <david.douard@sdfa3.org>
 - Daniel Balparda <balparda@google.com> (Google): GPyLint maintainer (Google's pylint variant)
-- Bastien Vallet <bastien.vallet@gmail.com>
+- Bastien Vallet <bastien.vallet@gmail.com> (Djailla)
 - Aru Sahni <arusahni@gmail.com>: Git ignoring, regex-based ignores
 - Andreas Freimuth <andreas.freimuth@united-bits.de>: fix indentation checking with tabs
 - Alexandru Coman <fcoman@bitdefender.com>
@@ -239,7 +241,7 @@ contributors:
 - Mikhail Fesenko <m.fesenko@corp.vk.com>
 - Matthew Suozzo <msuozzo@google.com>
 - Matthew Beckers <17108752+mattlbeck@users.noreply.github.com> (mattlbeck)
-- Mike Miller <mtmiller@users.noreply.github.com>
+- Mark Roman Miller <mtmiller@users.noreply.github.com>: fix inline defs in too-many-statements
 - Mads Kiilerich <mads@kiilerich.com>
 - Maarten ter Huurne <maarten@treewalker.org>
 - Lefteris Karapetsas <lefteris@refu.co>
@@ -282,7 +284,6 @@ contributors:
 - thinwybk <florian.k@mailbox.org>
 - syutbai <syutbai@gmail.com>
 - sdet_liang <liangway@users.noreply.github.com>
-- sbagan <pnlbagan@gmail.com>
 - pyves@crater.logilab.fr <pyves@crater.logilab.fr>
 - paschich <millen@gridium.com>
 - oittaa <8972248+oittaa@users.noreply.github.com>
@@ -290,6 +291,7 @@ contributors:
 - mar-chi-pan <mar.polatoglou@gmail.com>
 - ludal@logilab.fr <ludal@logilab.fr>
 - lrjball <50599110+lrjball@users.noreply.github.com>
+- laike9m <laike9m@users.noreply.github.com>
 - jpkotta@shannon <jpkotta@shannon>
 - jaydesl <35102795+jaydesl@users.noreply.github.com>
 - jab <jab@users.noreply.github.com>
@@ -313,6 +315,7 @@ contributors:
 - Yury Gribov <tetra2005@gmail.com>
 - Yuri Bochkarev <baltazar.bz@gmail.com>: Added epytext support to docparams extension.
 - Youngsoo Sung <ysung@bepro11.com>
+- Yory <39745367+yory8@users.noreply.github.com> (yory8)
 - Yoichi Nakayama <yoichi.nakayama@gmail.com>
 - Yeting Li <liyt@ios.ac.cn> (yetingli)
 - Yannack <yannack@users.noreply.github.com>
@@ -335,9 +338,11 @@ contributors:
 - Stephen Longofono <8992396+SLongofono@users.noreply.github.com>
 - Stanislav Levin <slev@altlinux.org>
 - Sorin Sbarnea <ssbarnea@redhat.com>
+- Slavfox <slavfoxman@gmail.com>
 - Skip Montanaro <skip@pobox.com>
 - Shiv Venkatasubrahmanyam <shvenkat@users.noreply.github.com>
 - Sebastian Müller <mueller.seb@posteo.de>
+- Sasha Bagan <pnlbagan@gmail.com>
 - Sardorbek Imomaliev <sardorbek.imomaliev@gmail.com>
 - Santiago Castro <bryant@montevideo.com.uy>
 - Sandro Tosi <sandro.tosi@gmail.com>: Debian packaging
@@ -358,7 +363,6 @@ contributors:
 - Qwiddle13 <32040075+Qwiddle13@users.noreply.github.com>
 - Quentin Young <qlyoung@users.noreply.github.com>
 - Petr Pulc <petrpulc@gmail.com>: require whitespace around annotations
-- Peter Hammond
 - Peter Dawyndt <Peter.Dawyndt@UGent.be>
 - Peter Bittner <django@bittner.it>
 - Peter Aronoff <peter@aronoff.org>
@@ -391,11 +395,11 @@ contributors:
 - Matthijs Blom <19817960+MatthijsBlom@users.noreply.github.com>
 - Matej Marušák <marusak.matej@gmail.com>
 - Markus Siebenhaar <41283549+siehar@users.noreply.github.com>
-- Marco Edward Gorelli <marcogorelli@protonmail.com>
+- Marco Edward Gorelli <marcogorelli@protonmail.com>: Documented Jupyter integration
 - Marcin Kurczewski <rr-@sakuya.pl> (rr-)
 - Maik Röder <maikroeder@gmail.com>
 - Louis Sautier <sautier.louis@gmail.com>
-- Lorena Buciu  <46202743+lorena-b@users.noreply.github.com> (lorena-b)
+- Lorena Buciu <46202743+lorena-b@users.noreply.github.com> (lorena-b)
 - Logan Miller <14319179+komodo472@users.noreply.github.com> (komodo472)
 - Kári Tristan Helgason <kthelgason@gmail.com>
 - Kurian Benoy <70306694+kurianbenoy-aot@users.noreply.github.com>
@@ -437,6 +441,7 @@ contributors:
 - Hayden Richards <62866982+SupImDos@users.noreply.github.com> (SupImDos)
   * Fixed "no-self-use" for async methods
   * Fixed "docparams" extension for async functions and methods
+- Harshil <37377066+harshil21@users.noreply.github.com> (harshil21)
 - Grant Welch <gwelch925+github@gmail.com>
 - Giuseppe Valente <gvalente@arista.com>
 - Gary Tyler McLeod <mail@garytyler.com>
@@ -485,6 +490,7 @@ contributors:
 - Arthur Lutz <arthur.lutz@logilab.fr>
 - Antonio Ossa <aaossa@uc.cl>
 - Anthony VEREZ <anthony.verez.external@cassidian.com>
+- Anthony Tan <tanant@users.noreply.github.com>
 - Anthony Foglia <afoglia@users.noreply.github.com> (Google): Added simple string slots check.
 - Anentropic <ego@anentropic.com>
 - Andy Palmer <25123779+ninezerozeronine@users.noreply.github.com>
@@ -515,55 +521,27 @@ under this name, or we did not manage to find their commits in the history.
 - Amaury Forgeot d'Arc: check names imported from a module exists in the module
 - Anthony Tan
 - Axel Muller
-- Ben Graham
-- Benjamin Freeman
 - Benjamin Niemann: allow block level enabling/disabling of messages
-- Benny Müller
 - Bernard Nauwelaerts
-- Bernie Gray
 - Bill Wendling
-- Bluesheeptoken
 - Brian van den Broek: windows installation documentation
 - Craig Henriques
 - D. Alphus (Alphadelta14)
 - Daniil Kharkov
-- das-intensity
 - Eero Vuojolahti
 - Fabio Zadrozny
-- Fureigh
 - Gauthier Sebaux
-- Goudcode
-- Harshil (harshil21)
-- Hornwitser: fix import graph
 - James DesLauriers
-- Jiajunsu (victor)
-- Kian-Meng, Ang
-- laike9m
 - manderj
-- Marco Gorelli: Documented Jupyter integration
-- Mark Roman Miller: fix inline defs in too-many-statements
-- Matej Marusak
 - Mirko Friedenhagen
 - Nicholas Smith
 - Nuzula H. Yudaka (Nuzhuka)
-- Oisin Moran
-- Paul Renvoise
 - Pek Chhan
 - Peter Hammond
 - Pierre Rouleau
-- qwiddle
 - Richard Goodman: simplifiable-if-expression (with Tomer Chachamu)
-- ruro
-- Samuel Forestier
-- Sasha Bagan
 - Sebastian Ulrich
-- Slavfox
-- Taewon Kim
 - Takashi Hirashima
 - Thomas Snowden: fix missing-docstring for inner functions
-- Tyler N. Thieding
 - Wolfgang Grafen
 - Yannick Brehon
-- Yilei Yang
-- Yory (yory8)
-- Yuri Gribov