Merge branch 'macos-python-update' into bump_CI_images

Author: jlatusek

config/python/python_config.gni

@@ -0,0 +1,17 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+python_config_script = get_path_info("python_config.py", "abspath")
+
+python_config = exec_script(python_config_script, [], "json")

config/python/python_config.py

@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+
+import os
+import json
+import subprocess
+import shutil
+
+
+class Config:
+    def __init__(self):
+        cipd_install_dir = os.getenv("PW_PYTHON_CIPD_INSTALL_DIR")
+        self.python_exe = os.path.join(cipd_install_dir, "bin", "python3")
+        if not os.path.exists(self.python_exe):
+            self.python_exe = shutil.which("python3")
+            if not self.python_exe:
+                raise FileNotFoundError("Python3 not found")
+
+    def get_version(self):
+        out = subprocess.check_output(
+            [self.python_exe, "-c", "import sys; print(sys.version_info.major, sys.version_info.minor)"], text=True
+        )
+        return out.strip().split(" ")
+
+
+if __name__ == "__main__":
+    config = Config()
+    version = config.get_version()
+    print(
+        json.dumps(
+            {
+                "version": {
+                    "major": version[0],
+                    "minor": version[1],
+                }
+            }
+        )
+    )

src/pybindings/pycontroller/BUILD.gn

@@ -17,6 +17,7 @@ import("//build_overrides/pigweed.gni")
 
 import("$dir_pw_build/python.gni")
 
+import("${chip_root}/config/python/python_config.gni")
 import("${chip_root}/build/chip/tools.gni")
 import("${chip_root}/src/platform/device.gni")
 import("${dir_pw_unit_test}/test.gni")
@@ -44,12 +45,14 @@ shared_library("CHIPController") {
 
   # TODO: Update to use GN tools to get actual paths
   include_dirs = [ "${chip_root}/third_party/pybind11/repo/include" ]
-  python_version = exec_script("python-version.py", [], "trim string")
+  version = python_config.version
   if (current_os == "mac") {
     include_dirs +=
-        [ "${chip_root}/.environment/cipd/packages/python/include/python" + python_version ]
+        [ "${chip_root}/.environment/cipd/packages/python/include/python" +
+          version.major + "." + version.minor ]
   } else if (current_os == "linux") {
-    include_dirs += [ "/usr/include/python" + python_version ]
+    include_dirs +=
+        [ "/usr/include/python" + version.major + "." + version.minor ]
   } else {
     assert(false, "OS not supported.")
   }
@@ -87,7 +90,7 @@ shared_library("CHIPController") {
     ]
   }
   if (current_os == "linux") {
-    libs = [ "python" + python_version ]
+    libs = [ "python" + version.major + "." + version.minor ]
   }
 }