Update contributors-txt requirement from ~=0.5.2 to >0.7.3

Updates the requirements on [contributors-txt](https://github.com/Pierre-Sassoulas/contributors-txt) to permit the latest version. - [Release notes](https://github.com/Pierre-Sassoulas/contributors-txt/releases) - [Commits](Pierre-Sassoulas/contributors-txt@v0.5.2...v0.7.2) --- updated-dependencies: - dependency-name: contributors-txt dependency-type: direct:production ... Upgrade contributors.txt generation
pylint-dev · Mar 22, 2022 · cde45f4 · cde45f4
1 parent 4918044
commit cde45f4
Show file tree

Hide file tree

Showing 4 changed files with 129 additions and 117 deletions.
diff --git 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) <[email protected]>
-- Google, Inc.
+- Google, Inc. <[email protected]>
 - Nick Drozd <[email protected]>
 - Andrew Haigh <[email protected]>
 - David Liu <[email protected]>
@@ -33,7 +35,6 @@ Contributors
 - Calen Pennington <[email protected]>
 - Phil Schaf <[email protected]>
 - Alex Hall <[email protected]>
-- jarradhope
 - Tushar Sadhwani <[email protected]>
 - Tim Martin <[email protected]>
 - Raphael Gaschignard <[email protected]>
@@ -69,7 +70,6 @@ Contributors
 - Joshua Cannon <[email protected]>
 - John Vandenberg <[email protected]>
 - Jacob Bogdanov <[email protected]>
-- François Mockers
 - David Euresti <[email protected]>
 - David Cain <[email protected]>
 - Anthony Sottile <[email protected]>
@@ -78,14 +78,11 @@ Contributors
 - tristanlatr <[email protected]>
 - rr- <[email protected]>
 - raylu <[email protected]>
-- platings
 - mathieui <[email protected]>
 - markmcclain <[email protected]>
 - kasium <[email protected]>
 - ioanatia <[email protected]>
 - grayjk <[email protected]>
-- carl
-- alain lefroy
 - Zbigniew Jędrzejewski-Szmek <[email protected]>
 - Zac Hatfield-Dodds <[email protected]>
 - Vilnis Termanis <[email protected]>
@@ -111,7 +108,6 @@ Contributors
 - Michał Masłowski <[email protected]>
 - Michael K <[email protected]>
 - Mateusz Bysiek <[email protected]>
-- Mark Gius
 - Mark Byrne <[email protected]>
 - Leandro T. C. Melo <[email protected]>
 - Konrad Weihmann <[email protected]>
@@ -163,3 +159,15 @@ Contributors
 - Alphadelta14 <[email protected]>
 - Alexander Presnyakov <[email protected]>
 - Ahmed Azzaoui <[email protected]>
+
+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
@@ -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
@@ -1,96 +1,51 @@
 {
-  "Areveny": {
-    "authoritative_mail": "[email protected]",
+  "[email protected]": {
+    "mails": ["[email protected]"],
+    "name": "Daniël van Noord",
+    "team": "Maintainers"
+  },
+  "[email protected]": {
+    "mails": ["[email protected]"],
+    "name": "Marc Mueller",
+    "team": "Maintainers"
+  },
+  "[email protected]": {
     "mails": ["[email protected]", "[email protected]"],
+    "name": "Areveny",
     "team": "Maintainers"
   },
-  "Ashley Whetter": {
-    "authoritative_mail": "[email protected]",
+  "[email protected]": {
     "mails": [
       "[email protected]",
       "[email protected]",
       "[email protected]",
       "[email protected]"
     ],
+    "name": "Ashley Whetter",
     "team": "Maintainers"
   },
-  "Bryce Guinta": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]", "[email protected]"],
-    "team": "Maintainers"
-  },
-  "Calen Pennington": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]", "[email protected]"]
-  },
-  "Ceridwen": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]"],
-    "team": "Maintainers"
-  },
-  "Claudiu Popa": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]", "[email protected]"],
-    "team": "Maintainers"
-  },
-  "Daniël van Noord": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]"],
-    "team": "Maintainers"
-  },
-  "David Euresti": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]", "[email protected]"]
-  },
-  "Dimitri Prybysh": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]"],
-    "team": "Maintainers"
-  },
-  "Florian Bruhin": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]"],
-    "team": "Maintainers"
-  },
-  "Google, Inc.": {
-    "authoritative_mail": null,
+  "[email protected]": {
     "mails": [
-      "[email protected]",
-      "[email protected]",
-      "[email protected]",
-      "[email protected]",
-      "[email protected]",
-      "[email protected]"
-    ]
+      "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": ["[email protected]"],
+  "[email protected]": {
+    "mails": ["bryce.paul.guinta@gmail.com", "[email protected]"],
+    "name": "Bryce Guinta",
     "team": "Maintainers"
   },
-  "Jacob Bogdanov": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]", "[email protected]"]
+  "[email protected]": {
+    "mails": ["[email protected]", "[email protected]"],
+    "name": "Calen Pennington"
   },
-  "Jacob Walls": {
-    "authoritative_mail": "jacobtylerwalls@gmail.com",
-    "mails": ["[email protected]"],
+  "[email protected]": {
+    "mails": ["ceridwenv@gmail.com"],
+    "name": "Ceridwen",
     "team": "Maintainers"
   },
-  "Joshua Cannon": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]", "[email protected]"]
-  },
-  "Kavins Singh": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]", "[email protected]"]
-  },
-  "Keichi Takahashi": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]", "[email protected]"]
-  },
-  "LOGILAB S.A. (Paris, FRANCE)": {
-    "authoritative_mail": "[email protected]",
+  "[email protected]": {
     "mails": [
       "[email protected]",
       "[email protected]",
@@ -106,53 +61,98 @@
       "[email protected]",
       "[email protected]",
       "[email protected]"
-    ]
+    ],
+    "name": "LOGILAB S.A. (Paris, FRANCE)"
   },
-  "Marc Mueller": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]"],
+  "[email protected]": {
+    "mails": ["[email protected]"],
+    "name": "Dimitri Prybysh",
     "team": "Maintainers"
   },
-  "Mario Corchero": {
-    "authoritative_mail": "mariocj89@gmail.com",
-    "mails": ["[email protected]", "[email protected]"]
+  "[email protected]": {
+    "mails": ["david@dropbox.com", "[email protected]"],
+    "name": "David Euresti"
   },
-  "Moises Lopez": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]"]
+  "[email protected]": {
+    "mails": ["[email protected]"],
+    "name": "Hippo91",
+    "team": "Maintainers"
   },
-  "Pierre Sassoulas": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]", "[email protected]"],
+  "[email protected]": {
+    "mails": ["[email protected]", "[email protected]"],
+    "name": "Jacob Bogdanov"
+  },
+  "[email protected]": {
+    "mails": ["[email protected]"],
+    "name": "Jacob Walls",
     "team": "Maintainers"
   },
-  "Raphael Gaschignard": {
-    "authoritative_mail": "raphael@makeleaps.com",
-    "mails": ["[email protected]", "[email protected]"]
+  "[email protected]": {
+    "mails": ["joshdcannon@gmail.com", "[email protected]"],
+    "name": "Joshua Cannon"
   },
-  "Stefan Scherfke": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]", "[email protected]"]
+  "[email protected]": {
+    "mails": ["[email protected]", "[email protected]"],
+    "name": "Kavins Singh"
   },
-  "Sylvain Thénault": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]", "[email protected]"],
+  "[email protected]": {
+    "mails": ["[email protected]", "[email protected]"],
+    "name": "Keichi Takahashi"
+  },
+  "[email protected]": {
+    "mails": ["[email protected]", "[email protected]"],
+    "name": "Mario Corchero"
+  },
+  "[email protected]": {
+    "mails": ["[email protected]"],
+    "name": "Florian Bruhin",
     "team": "Maintainers"
   },
-  "Ville Skyttä": {
-    "authoritative_mail": "[email protected]",
-    "mails": ["[email protected]", "[email protected]"]
+  "[email protected]": {
+    "mails": ["[email protected]"],
+    "name": "Moises Lopez"
   },
-  "bot": {
-    "authoritative_mail": "[email protected]",
+  "[email protected]": {
     "mails": [
-      "66853113+pre-commit-ci[bot]@users.noreply.github.com",
-      "49699333+dependabot[bot]@users.noreply.github.com"
-    ]
+      "[email protected]",
+      "[email protected]",
+      "[email protected]",
+      "[email protected]",
+      "[email protected]",
+      "[email protected]"
+    ],
+    "name": "Google, Inc."
+  },
+  "[email protected]": {
+    "mails": ["[email protected]", "[email protected]"],
+    "name": "Claudiu Popa",
+    "team": "Maintainers"
   },
-  "Łukasz Rogalski": {
-    "authoritative_mail": "[email protected]",
+  "[email protected]": {
+    "mails": ["[email protected]", "[email protected]"],
+    "name": "Pierre Sassoulas",
+    "team": "Maintainers"
+  },
+  "[email protected]": {
+    "mails": ["[email protected]", "[email protected]"],
+    "name": "Raphael Gaschignard"
+  },
+  "[email protected]": {
     "mails": ["[email protected]"],
+    "name": "Łukasz Rogalski",
     "team": "Maintainers"
+  },
+  "[email protected]": {
+    "mails": ["[email protected]", "[email protected]"],
+    "name": "Stefan Scherfke"
+  },
+  "[email protected]": {
+    "mails": ["[email protected]", "[email protected]"],
+    "name": "Sylvain Thénault",
+    "team": "Maintainers"
+  },
+  "[email protected]": {
+    "mails": ["[email protected]", "[email protected]"],
+    "name": "Ville Skyttä"
   }
 }
diff --git a/tbump.toml b/tbump.toml
@@ -28,6 +28,11 @@ src = "astroid/__pkginfo__.py"
 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"