Make pigweed pull python 3.11 on macs, to have a consistent build environment

Author: andy31415

scripts/setup/bootstrap.sh

@@ -133,10 +133,15 @@ _bootstrap_or_activate() {
     export PW_DOCTOR_SKIP_CIPD_CHECKS=1
     export PATH # https://bugs.chromium.org/p/pigweed/issues/detail?id=281
 
-    local _PIGWEED_CIPD_JSON="$_CHIP_ROOT/third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json"
+    local _PIGWEED_CIPD_JSON_ROOT="$_CHIP_ROOT/third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup"
+    local _PIGWEED_CIPD_JSON="$_PIGWEED_CIPD_JSON_ROOT/pigweed.json"
+    local _PYTHON_CIPD_JSON="$_PIGWEED_CIPD_JSON_ROOT/python311.json"
     mkdir -p "$_PW_ACTUAL_ENVIRONMENT_ROOT"
     local _GENERATED_PIGWEED_CIPD_JSON="$_PW_ACTUAL_ENVIRONMENT_ROOT/pigweed.json"
-    $_CHIP_ROOT/scripts/setup/gen_pigweed_cipd_json.py -i $_PIGWEED_CIPD_JSON -o $_GENERATED_PIGWEED_CIPD_JSON
+    $_CHIP_ROOT/scripts/setup/gen_pigweed_cipd_json.py \
+        -i $_PIGWEED_CIPD_JSON                         \
+        -o $_GENERATED_PIGWEED_CIPD_JSON               \
+        -e darwin:$_PYTHON_CIPD_JSON
 
     if test -n "$GITHUB_ACTION"; then
         tee <<EOF >"${_PW_ACTUAL_ENVIRONMENT_ROOT}/pip.conf"

scripts/setup/gen_pigweed_cipd_json.py

@@ -16,6 +16,8 @@
 
 import argparse
 import json
+import platform
+from collections import defaultdict
 
 _LIST_OF_PACKAGES_TO_EXCLUDE = ['fuchsia/third_party/rust/']
 
@@ -32,12 +34,27 @@ def include_package(package: dict) -> bool:
     return True
 
 
-def generate_new_cipd_package_json(input, output):
+def generate_new_cipd_package_json(input, output, extra):
     with open(input) as ins:
         packages = json.load(ins)
+
         file_packages = packages.get('packages')
         new_file_packages = [x for x in file_packages if include_package(x)]
 
+    # Extra is a list of platform:json. 
+    # Filter it for the given platform and append any resulting packages
+    my_platform = platform.system().lower()
+    for item in extra:
+        inject_platform, path = item.split(':', 1)
+
+        if inject_platform.lower() != my_platform:
+            continue
+
+        with open(path) as ins:
+            for package in json.load(ins).get('packages'):
+                new_file_packages.append(package)
+
+
     new_packages = {'packages': new_file_packages}
     with open(output, 'w') as f:
         json.dump(new_packages, f, indent=2)
@@ -54,6 +71,11 @@ def main():
     parser.add_argument(
         '--output', '-o', required=True
     )
+    parser.add_argument(
+        '--extra', '-e', nargs='*', default=[],
+        help="Inject extra packages for specific platforms. Format is <platform>:<path_to_json>"
+    )
+
     generate_new_cipd_package_json(**vars(parser.parse_args()))