Update .github/CODEOWNERS file (#8055)

This PR replaces closed PR#7514. It fixes issue #7031 by updating
`.github/CODEOWNERS`. Summary of main changes:

- Prefer the use of teams instead of individual user names for most
cases. This will allow us to adjust permissions via GitHub team
controls; in addition, it will let us use GitHub team features such as
code review assignments.

- Use newly-created subteams of "Cirq Contributors" for the vendor
modules.

- Adjust default ownership assignments to reflect activity in recent
years and best-guesses about appropriateness for different roles.

- Add changes discussed in the [comments on a previous
PR](#7514 (review)).

- Reorganize the file in an effort to make it more readable and
maintainable. For example, the hardware interface modules were
previously split based on code versus docs; they are now grouped by the
interface modules, so that it's obvious there are two parts to each one.

(Note to reviewers: the new teams were created today, and not all
members have accepted invitations yet. Beware that the team listings
will look incomplete due to this.)

Fixes #7031

Author: mhucka

.github/CODEOWNERS

@@ -1,49 +1,33 @@
-####################
-# cirq maintainers
-####################
+# GitHub CODEOWNERS file for Cirq.
+# To view the members of a team, construct a URL of this form:
+# https://github.com/orgs/quantumlib/teams/[TEAM_NAME]/members
 
-* @quantumlib/cirq-maintainers @vtomole
+#### Overall Cirq maintainers ####
 
-####################
-# vendor maintainers
-####################
+* @quantumlib/cirq-maintainers
 
-cirq-google/**/*.* @wcourtney @quantumlib/cirq-maintainers @vtomole @verult @hoisinberg
+#### Cirq docs maintainers ####
 
-cirq-ionq/**/*.* @dabacon @ColemanCollins @nakardo @gmauricio @Cynocracy @quantumlib/cirq-maintainers @vtomole @splch
+docs/**/*.* @quantumlib/cirq-maintainers @quantumlib/cirq-contributors
+docs/tutorials/google/**/*.* @quantumlib/cirq-maintainers @quantumlib/cirq-contributors @wcourtney @verult @hoisinberg
+docs/noise/qcvv/**/*.* @quantumlib/cirq-maintainers @quantumlib/cirq-contributors @mrwojtek
 
-cirq-aqt/**/*.* @ma5x @pschindler @alfrisch @quantumlib/cirq-maintainers @vtomole
+#### Hardware module maintainers ####
 
-cirq-pasqal/**/*.* @HGSilveri @quantumlib/cirq-maintainers @vtomole
+cirq-google/**/*.* @quantumlib/cirq-maintainers @wcourtney @verult @hoisinberg
+docs/google/**/*.* @quantumlib/cirq-maintainers @wcourtney @verult @hoisinberg
 
-################################################
-# qcvv maintainers @mrwojtek + cirq maintainers
-################################################
+cirq-aqt/**/*.*          @quantumlib/cirq-maintainers @quantumlib/cirq-aqt-contributors
+docs/hardware/aqt/**/*.* @quantumlib/cirq-maintainers @quantumlib/cirq-aqt-contributors
 
-cirq-core/cirq/experiments/**/*.* @mrwojtek @quantumlib/cirq-maintainers @vtomole
+cirq-ionq/**/*.*          @quantumlib/cirq-maintainers @quantumlib/cirq-ionq-contributors
+docs/hardware/ionq/**/*.* @quantumlib/cirq-maintainers @quantumlib/cirq-ionq-contributors
 
-#####################################################
-# docs maintainers: maintainers + @aasfaw + @rmlarose
-#####################################################
+cirq-pasqal/**/*.*          @quantumlib/cirq-maintainers @quantumlib/cirq-pasqal-contributors
+docs/hardware/pasqal/**/*.* @quantumlib/cirq-maintainers @quantumlib/cirq-pasqal-contributors
 
-docs/**/*.* @aasfaw @rmlarose @quantumlib/cirq-maintainers @vtomole
+docs/hardware/azure-quantum/**/*.* @quantumlib/cirq-maintainers @quantumlib/cirq-azure-contributors
 
-###################################################################
-# vendor docs maintainers: vendor maintainers + @aasfaw + @rmlarose
-###################################################################
+#### Experiments maintainers ####
 
-docs/google/**/*.* @wcourtney @aasfaw @rmlarose @quantumlib/cirq-maintainers @vtomole @verult @hoisinberg
-docs/tutorials/google/**/*.* @wcourtney @aasfaw @rmlarose @quantumlib/cirq-maintainers @vtomole @verult @hoisinberg
-
-docs/hardware/ionq/**/*.* @dabacon @ColemanCollins @nakardo @gmauricio @aasfaw @rmlarose @Cynocracy @quantumlib/cirq-maintainers @vtomole @splch
-
-docs/hardware/aqt/**/*.* @ma5x @pschindler @alfrisch @aasfaw @rmlarose @quantumlib/cirq-maintainers @vtomole
-
-docs/hardware/pasqal/**/*.* @HGSilveri @aasfaw @rmlarose @quantumlib/cirq-maintainers @vtomole
-
-docs/hardware/azure-quantum/**/*.* @guenp @anpaz @aasfaw @quantumlib/cirq-maintainers @vtomole
-
-#############################################################
-# qcvv docs maintainers: docs maintainers + mrwojtek + aasfaw
-#############################################################
-docs/noise/qcvv/**/*.* @mrwojtek @aasfaw @rmlarose @quantumlib/cirq-maintainers @vtomole
+cirq-core/cirq/experiments/**/*.* @quantumlib/cirq-maintainers @mrwojtek

dev_tools/codeowners_test.py

@@ -21,28 +21,30 @@
 
 CIRQ_MAINTAINERS = ('TEAM', "@quantumlib/cirq-maintainers")
 
-BASE_MAINTAINERS = {CIRQ_MAINTAINERS, ('USERNAME', "@vtomole")}
+BASE_MAINTAINERS = {CIRQ_MAINTAINERS}
 
-DOCS_MAINTAINERS = BASE_MAINTAINERS.union({('USERNAME', '@aasfaw'), ('USERNAME', '@rmlarose')})
+DOCS_MAINTAINERS = BASE_MAINTAINERS.union({('TEAM', "@quantumlib/cirq-contributors")})
 
 GOOGLE_TEAM = {('USERNAME', "@wcourtney"), ('USERNAME', "@verult"), ("USERNAME", "@hoisinberg")}
 
 GOOGLE_MAINTAINERS = BASE_MAINTAINERS.union(GOOGLE_TEAM)
 
-IONQ_TEAM = {
-    ('USERNAME', u)
-    for u in ["@dabacon", "@ColemanCollins", "@nakardo", "@gmauricio", "@Cynocracy", "@splch"]
-}
+IONQ_TEAM = {('TEAM', "@quantumlib/cirq-ionq-contributors")}
+
 IONQ_MAINTAINERS = BASE_MAINTAINERS.union(IONQ_TEAM)
 
-PASQAL_TEAM = {('USERNAME', u) for u in ["@HGSilveri"]}
+PASQAL_TEAM = {('TEAM', "@quantumlib/cirq-pasqal-contributors")}
 
 PASQAL_MAINTAINERS = BASE_MAINTAINERS.union(PASQAL_TEAM)
 
-AQT_TEAM = {('USERNAME', u) for u in ["@ma5x", "@pschindler", "@alfrisch"]}
+AQT_TEAM = {('TEAM', "@quantumlib/cirq-aqt-contributors")}
 
 AQT_MAINTAINERS = BASE_MAINTAINERS.union(AQT_TEAM)
 
+AZURE_TEAM = {('TEAM', "@quantumlib/cirq-azure-contributors")}
+
+AZURE_MAINTAINERS = BASE_MAINTAINERS.union(AZURE_TEAM)
+
 QCVV_TEAM = {('USERNAME', "@mrwojtek")}
 
 QCVV_MAINTAINERS = BASE_MAINTAINERS.union(QCVV_TEAM)
@@ -62,23 +64,25 @@
         # aqt
         ("cirq-aqt/cirq_aqt/__init__.py", AQT_MAINTAINERS),
         ("cirq-aqt/setup.py", AQT_MAINTAINERS),
-        ("docs/hardware/aqt/access.md", AQT_MAINTAINERS.union(DOCS_MAINTAINERS)),
-        ("docs/hardware/aqt/getting_started.ipynb", AQT_MAINTAINERS.union(DOCS_MAINTAINERS)),
+        ("docs/hardware/aqt/access.md", AQT_MAINTAINERS),
+        ("docs/hardware/aqt/getting_started.ipynb", AQT_MAINTAINERS),
         # pasqal
         ("cirq-pasqal/cirq_pasqal/__init__.py", PASQAL_MAINTAINERS),
         ("cirq-pasqal/setup.py", PASQAL_MAINTAINERS),
-        ("docs/hardware/pasqal/access.md", PASQAL_MAINTAINERS.union(DOCS_MAINTAINERS)),
-        ("docs/hardware/pasqal/getting_started.ipynb", PASQAL_MAINTAINERS.union(DOCS_MAINTAINERS)),
+        ("docs/hardware/pasqal/access.md", PASQAL_MAINTAINERS),
+        ("docs/hardware/pasqal/getting_started.ipynb", PASQAL_MAINTAINERS),
         # ionq
         ("cirq-ionq/cirq_ionq/__init__.py", IONQ_MAINTAINERS),
         ("cirq-ionq/setup.py", IONQ_MAINTAINERS),
-        ("docs/hardware/ionq/access.md", IONQ_MAINTAINERS.union(DOCS_MAINTAINERS)),
-        ("docs/hardware/ionq/getting_started.ipynb", IONQ_MAINTAINERS.union(DOCS_MAINTAINERS)),
+        ("docs/hardware/ionq/access.md", IONQ_MAINTAINERS),
+        ("docs/hardware/ionq/getting_started.ipynb", IONQ_MAINTAINERS),
         # google
         ("cirq-google/cirq_google/__init__.py", GOOGLE_MAINTAINERS),
         ("cirq-google/setup.py", GOOGLE_MAINTAINERS),
-        ("docs/google/access.md", GOOGLE_MAINTAINERS.union(DOCS_MAINTAINERS)),
+        ("docs/google/access.md", GOOGLE_MAINTAINERS),
         ("docs/tutorials/google/start.ipynb", GOOGLE_MAINTAINERS.union(DOCS_MAINTAINERS)),
+        # azure-quantum
+        ("docs/hardware/azure-quantum/access.md", AZURE_MAINTAINERS),
     ],
 )
 def test_codeowners(filepath, expected) -> None: