scikit-learn · jeremiedbb · Mar 31, 2022 · Mar 28, 2022 · Mar 28, 2022 · Mar 28, 2022
diff --git a/build_tools/generate_authors_table.py b/build_tools/generate_authors_table.py
@@ -40,32 +40,33 @@ def get(url):
 
 def get_contributors():
     """Get the list of contributor profiles. Require admin rights."""
-    # get core devs and triage team
+    # get core devs and contributor experience team
     core_devs = []
-    triage_team = []
+    contributor_experience_team = []
     comm_team = []
-    core_devs_id = 11523
-    triage_team_id = 3593183
-    comm_team_id = 5368696
-    for team_id, lst in zip(
-        (core_devs_id, triage_team_id, comm_team_id),
-        (core_devs, triage_team, comm_team),
+    core_devs_slug = "core-devs"
+    contributor_experience_team_slug = "contributor-experience-team"
+    comm_team_slug = "communication-team"
+
+    entry_point = "https://api.github.com/orgs/scikit-learn/"
+
+    for team_slug, lst in zip(
+        (core_devs_slug, contributor_experience_team_slug, comm_team_slug),
+        (core_devs, contributor_experience_team, comm_team),
     ):
         for page in [1, 2]:  # 30 per page
-            reply = get(f"https://api.github.com/teams/{team_id}/members?page={page}")
+            reply = get(f"{entry_point}teams/{team_slug}/members?page={page}")
             lst.extend(reply.json())
 
     # get members of scikit-learn on GitHub
     members = []
-    for page in [1, 2]:  # 30 per page
-        reply = get(
-            "https://api.github.com/orgs/scikit-learn/members?page=%d" % (page,)
-        )
+    for page in [1, 2, 3]:  # 30 per page
+        reply = get(f"{entry_point}members?page={page}")
         members.extend(reply.json())
 
     # keep only the logins
     core_devs = set(c["login"] for c in core_devs)
-    triage_team = set(c["login"] for c in triage_team)
+    contributor_experience_team = set(c["login"] for c in contributor_experience_team)
     comm_team = set(c["login"] for c in comm_team)
     members = set(c["login"] for c in members)
 
@@ -75,23 +76,40 @@ def get_contributors():
     members |= {"Angel Soler Gollonet"}
     # remove CI bots
     members -= {"sklearn-ci", "sklearn-lgtm", "sklearn-wheels"}
-    triage_team -= core_devs  # remove ogrisel from triage_team
+    contributor_experience_team -= (
+        core_devs  # remove ogrisel from contributor_experience_team
+    )
+
+    emeritus = members - core_devs - contributor_experience_team - comm_team
 
-    emeritus = members - core_devs - triage_team
+    # hard coded
+    emeritus_comm_team = {"reshamas"}
+
+    comm_team -= {"reshamas"}  # in the comm team but not on the web page
 
     # get profiles from GitHub
     core_devs = [get_profile(login) for login in core_devs]
     emeritus = [get_profile(login) for login in emeritus]
-    triage_team = [get_profile(login) for login in triage_team]
+    contributor_experience_team = [
+        get_profile(login) for login in contributor_experience_team
+    ]
     comm_team = [get_profile(login) for login in comm_team]
+    emeritus_comm_team = [get_profile(login) for login in emeritus_comm_team]
 
     # sort by last name
     core_devs = sorted(core_devs, key=key)
     emeritus = sorted(emeritus, key=key)
-    triage_team = sorted(triage_team, key=key)
+    contributor_experience_team = sorted(contributor_experience_team, key=key)
     comm_team = sorted(comm_team, key=key)
+    emeritus_comm_team = sorted(emeritus_comm_team, key=key)
 
-    return core_devs, emeritus, triage_team, comm_team
+    return (
+        core_devs,
+        emeritus,
+        contributor_experience_team,
+        comm_team,
+        emeritus_comm_team,
+    )
 
 
 def get_profile(login):
@@ -155,16 +173,33 @@ def generate_list(contributors):
 
 if __name__ == "__main__":
 
-    core_devs, emeritus, triage_team, comm_team = get_contributors()
+    (
+        core_devs,
+        emeritus,
+        contributor_experience_team,
+        comm_team,
+        emeritus_comm_team,
+    ) = get_contributors()
 
-    with open(REPO_FOLDER / "doc" / "authors.rst", "w+") as rst_file:
+    with open(REPO_FOLDER / "doc" / "authors.rst", "w+", encoding="utf-8") as rst_file:
         rst_file.write(generate_table(core_devs))
 
-    with open(REPO_FOLDER / "doc" / "authors_emeritus.rst", "w+") as rst_file:
+    with open(
+        REPO_FOLDER / "doc" / "authors_emeritus.rst", "w+", encoding="utf-8"
+    ) as rst_file:
         rst_file.write(generate_list(emeritus))
 
-    with open(REPO_FOLDER / "doc" / "triage_team.rst", "w+") as rst_file:
-        rst_file.write(generate_table(triage_team))
+    with open(
+        REPO_FOLDER / "doc" / "contributor_experience_team.rst", "w+", encoding="utf-8"
+    ) as rst_file:
+        rst_file.write(generate_table(contributor_experience_team))
 
-    with open(REPO_FOLDER / "doc" / "communication_team.rst", "w+") as rst_file:
+    with open(
+        REPO_FOLDER / "doc" / "communication_team.rst", "w+", encoding="utf-8"
+    ) as rst_file:
         rst_file.write(generate_table(comm_team))
+
+    with open(
+        REPO_FOLDER / "doc" / "communication_team_emeritus.rst", "w+", encoding="utf-8"
+    ) as rst_file:
+        rst_file.write(generate_list(emeritus_comm_team))
diff --git a/doc/about.rst b/doc/about.rst
@@ -39,14 +39,14 @@ in the FAQ.
 
    :ref:`How you can contribute to the project <contributing>`
 
-Triage Team
------------
+Contributor Experience Team
+---------------------------
 
 The following people are active contributors who also help with
 :ref:`triaging issues <bug_triaging>`, PRs, and general
 maintenance:
 
-.. include:: triage_team.rst
+.. include:: contributor_experience_team.rst
 
 Communication Team
 ------------------

diff --git a/doc/authors.rst b/doc/authors.rst
@@ -93,4 +93,4 @@
     <a href='https://github.com/rth'><img src='https://avatars.githubusercontent.com/u/630936?v=4' class='avatar' /></a> <br />
     <p>Roman Yurchak</p>
     </div>
-    </div>
+    </div>
diff --git a/doc/authors_emeritus.rst b/doc/authors_emeritus.rst
@@ -30,4 +30,4 @@
 - Du Shiqiao
 - Jake Vanderplas
 - David Warde-Farley
-- Ron Weiss
+- Ron Weiss
diff --git a/doc/communication_team.rst b/doc/communication_team.rst
@@ -11,6 +11,6 @@
     </div>
     <div>
     <a href='https://github.com/francoisgoupil'><img src='https://avatars.githubusercontent.com/u/98105626?v=4' class='avatar' /></a> <br />
-    <p>Francois Goupil</p>
-    </div>
+    <p>francoisgoupil</p>
     </div>
+    </div>
diff --git a/doc/communication_team_emeritus.rst b/doc/communication_team_emeritus.rst
@@ -1 +1 @@
-- Reshama Shaikh
+- Reshama Shaikh
diff --git a/doc/triage_team.rst → doc/contributor_experience_team.rst b/doc/triage_team.rst → doc/contributor_experience_team.rst
@@ -15,7 +15,7 @@
     </div>
     <div>
     <a href='https://github.com/jmloyola'><img src='https://avatars.githubusercontent.com/u/2133361?v=4' class='avatar' /></a> <br />
-    <p>Juan Martín Loyola</p>
+    <p>Juan Martin Loyola</p>
     </div>
     <div>
     <a href='https://github.com/smarie'><img src='https://avatars.githubusercontent.com/u/3236794?v=4' class='avatar' /></a> <br />
@@ -37,4 +37,4 @@
     <a href='https://github.com/albertcthomas'><img src='https://avatars.githubusercontent.com/u/15966638?v=4' class='avatar' /></a> <br />
     <p>Albert Thomas</p>
     </div>
-    </div>
+    </div>
diff --git a/doc/developers/bug_triaging.rst b/doc/developers/bug_triaging.rst
@@ -50,10 +50,10 @@ Reviewing code is also encouraged. Contributors and users are welcome to
 participate to the review process following our :ref:`review guidelines
 <code_review>`.
 
-Triaging operations for members of the core and triage teams
-------------------------------------------------------------
+Triaging operations for members of the core and contributor experience teams
+----------------------------------------------------------------------------
 
-In addition to the above, members of the core team and the triage team
+In addition to the above, members of the core team and the contributor experience team
 can do the following important tasks:
 
 - Update :ref:`labels for issues and PRs <issue_tracker_tags>`: see the list of

diff --git a/doc/governance.rst b/doc/governance.rst
@@ -27,25 +27,25 @@ Contributors are community members who contribute in concrete ways to the
 project. Anyone can become a contributor, and contributions can take many forms
 – not only code – as detailed in the :ref:`contributors guide <contributing>`.
 
-Triage team
-------------
+Contributor Experience Team
+---------------------------
 
-The triage team is composed of community members who have permission on
+The contributor experience team is composed of community members who have permission on
 github to label and close issues. :ref:`Their work <bug_triaging>` is
 crucial to improve the communication in the project and limit the crowding
 of the issue tracker.
 
 Similarly to what has been decided in the `python project
 <https://devguide.python.org/triaging/#becoming-a-member-of-the-python-triage-team>`_,
-any contributor may become a member of the scikit-learn triage team, after
-showing some continuity in participating to scikit-learn
+any contributor may become a member of the scikit-learn contributor experience team,
+after showing some continuity in participating to scikit-learn
 development (with pull requests and reviews).
-Any core developer or member of the triage team is welcome to propose a
-scikit-learn contributor to join the triage team. Other core developers
+Any core developer or member of the contributor experience team is welcome to propose a
+scikit-learn contributor to join the contributor experience team. Other core developers
 are then consulted: while it is expected that most acceptances will be
 unanimous, a two-thirds majority is enough.
-Every new triager will be announced in the mailing list.
-Triagers are welcome to participate in `monthly core developer meetings
+Every new member of the contributor experience team will be announced in the mailing
+list. Members of the team are welcome to participate in `monthly core developer meetings
 <https://github.com/scikit-learn/administrative/tree/master/meeting_notes>`_.
 
 .. _communication_team:
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,4 +93,4 @@ @@
         <a href='https://github.com/rth'><img src='https://avatars.githubusercontent.com/u/630936?v=4' class='avatar' /></a> <br />
         <p>Roman Yurchak</p>
         </div>
-        </div>
+        </div>