[contributors.json] Relocation (Part 1)

JonWBedard · JonWBedard · commit a6344b3ebdb3 · 2021-09-01T15:10:14.000Z
https://bugs.webkit.org/show_bug.cgi?id=229690 <rdar://problem/82552403> Reviewed by Aakash Jain. .: * metadata/contributors.json: Copied from Tools/Scripts/webkitpy/common/config/contributors.json. Tools: * Scripts/webkitpy/common/config/committers.py: (CommitterList.load_json): Read from metadata/contributors.json. (CommitterList.reformat_in_place): Ditto. Canonical link: https://commits.webkit.org/241182@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281850 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2021-09-01  Jonathan Bedard  <jbedard@apple.com>
+
+        [contributors.json] Relocation (Part 1)
+        https://bugs.webkit.org/show_bug.cgi?id=229690
+        <rdar://problem/82552403>
+
+        Reviewed by Aakash Jain.
+
+        * metadata/contributors.json: Copied from Tools/Scripts/webkitpy/common/config/contributors.json.
+
 2021-08-30  Zan Dobersek  <zdobersek@igalia.com>
 
         RISCV64 support in LLInt
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2021-09-01  Jonathan Bedard  <jbedard@apple.com>
+
+        [contributors.json] Relocation (Part 1)
+        https://bugs.webkit.org/show_bug.cgi?id=229690
+        <rdar://problem/82552403>
+
+        Reviewed by Aakash Jain.
+
+        * Scripts/webkitpy/common/config/committers.py:
+        (CommitterList.load_json): Read from metadata/contributors.json.
+        (CommitterList.reformat_in_place): Ditto.
+
 2021-09-01  Alicia Boya García  <aboya@igalia.com>
 
         [GTK] Fix missing UTF-8 decoding in test crash logs
diff --git a/Tools/Scripts/webkitpy/common/config/committers.py b/Tools/Scripts/webkitpy/common/config/committers.py
@@ -31,6 +31,7 @@
 
 import fnmatch
 import json
+import os
 import sys
 
 from webkitcorepy import string_utils, unicode
@@ -229,10 +230,12 @@ def __init__(self,
         self._accounts_by_login = {}
 
     def load_json(self):
-        filesystem = FileSystem()
-        json_path = filesystem.join(filesystem.dirname(filesystem.path_to_module('webkitpy.common.config')), 'contributors.json')
+        json_path = os.path.join(
+            os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))))),
+            'metadata', 'contributors.json',
+        )
         try:
-            contributors = json.loads(filesystem.read_text_file(json_path))
+            contributors = json.loads(FileSystem().read_text_file(json_path))
         except ValueError as e:
             sys.exit('contributors.json is malformed: ' + str(e))
 
@@ -273,9 +276,11 @@ def as_json(self):
         return json.dumps(result, sort_keys=True, indent=3, separators=(',', ' : '))
 
     def reformat_in_place(self):
-        filesystem = FileSystem()
-        json_path = filesystem.join(filesystem.dirname(filesystem.path_to_module('webkitpy.common.config')), 'contributors.json')
-        filesystem.write_text_file(json_path, self.as_json())
+        json_path = os.path.join(
+            os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))))),
+            'metadata', 'contributors.json',
+        )
+        FileSystem().write_text_file(json_path, self.as_json())
 
     # Contributors who are not in any other category.
     def _exclusive_contributors(self):
diff --git a/metadata/contributors.json b/metadata/contributors.json
