Add abstract python paths and all sysconfig variables to JSON

These seem like useful things to convey to downstream consumers.

Author: indygreg

cpython-unix/build-cpython.sh

@@ -455,9 +455,11 @@ metadata = {
     },
     "python_bytecode_magic_number": codecs.encode(importlib.util.MAGIC_NUMBER, "hex").decode("ascii"),
     "python_paths": {},
+    "python_paths_abstract": sysconfig.get_paths(expand=False),
     "python_exe": "install/bin/python%s%s" % (sysconfig.get_python_version(), sys.abiflags),
     "python_major_minor_version": sysconfig.get_python_version(),
     "python_stdlib_platform_config": sysconfig.get_config_var("LIBPL").lstrip("/"),
+    "python_config_vars": {k: str(v) for k, v in sysconfig.get_config_vars().items()},
 }
 
 root = os.environ["ROOT"]

cpython-unix/build.py

@@ -775,7 +775,7 @@ def build_cpython(
 
         # Create PYTHON.json file describing this distribution.
         python_info = {
-            "version": "5",
+            "version": "6",
             "target_triple": target_triple,
             "optimizations": optimizations,
             "python_tag": entry["python_tag"],

cpython-windows/build.py

@@ -2237,7 +2237,7 @@ def build_cpython(
 
         # Create PYTHON.json file describing this distribution.
         python_info = {
-            "version": "5",
+            "version": "6",
             "target_triple": target_triple,
             "optimizations": optimizations,
             "python_tag": entry["python_tag"],

cpython-windows/generate_metadata.py

@@ -25,8 +25,10 @@
         importlib.util.MAGIC_NUMBER, "hex"
     ).decode("ascii"),
     "python_paths": {},
+    "python_paths_abstract": sysconfig.get_paths(expand=False),
     "python_exe": "install/python.exe",
     "python_major_minor_version": sysconfig.get_python_version(),
+    "python_config_vars": {k: str(v) for k, v in sysconfig.get_config_vars().items()},
 }
 
 root = os.environ["ROOT"]

docs/distributions.rst

@@ -32,7 +32,7 @@ without having to resort to heuristics.
 The file contains a JSON map. This map has the following keys:
 
 version
-   Version number of the file format. Currently ``5``.
+   Version number of the file format. Currently ``6``.
 
 target_triple
    A target triple defining the platform and architecture of the machine
@@ -139,6 +139,28 @@ python_paths
 
    (Version 5 or above only.)
 
+python_paths_abstract
+   Mapping of ``sysconfig`` path names with placeholder values.
+
+   See https://docs.python.org/3/library/sysconfig.html#installation-paths
+   for the meaning of keys.
+
+   This is equivalent to calling ``sysconfig.get_paths(expand=False)``.
+
+   (Version 6 or above only.)
+
+python_config_vars
+   Mapping of string configuration names to string values.
+
+   This is equivalent to ``sysconfig.get_config_vars()`` with all values
+   normalized to strings.
+
+   Many configuration values may represent state as it existed in the
+   build environment and aren't appropriate for the run-time environment
+   on a different system.
+
+   (Version 6 or above only.)
+
 python_exe
    Relative path to main Python interpreter executable.