Extract toolchain to relenv data directory

Author: dwoz

CHANGELOG.md

@@ -1,3 +1,10 @@
+0.20.2
+======
+
+* Extract ppbt toolchain to relenv data directory so it can be re-used accross
+  environments.
+
+
 0.20.1
 ======
 

relenv/build/common.py

@@ -115,18 +115,7 @@ def get_triplet(machine=None, plat=None):
 
 buildroot = pydir.parent.parent
 
-if sys.platform == "linux":
-    toolchain = ""
-    ppbt = None
-    try:
-        import ppbt
-    except ImportError:
-        pass
-    if ppbt:
-        env = ppbt.environ(auto_extract=True)
-        toolchain = pathlib.Path(env["TOOLCHAIN_PATH"])
-else:
-    toolchain = DATA_DIR / "toolchain" / get_triplet()
+toolchain = DATA_DIR / "toolchain" / get_triplet()
 
 build_time_vars = {}
 for key in _build_time_vars:

relenv/common.py

@@ -18,7 +18,7 @@
 import time
 
 # relenv package version
-__version__ = "0.20.1"
+__version__ = "0.20.2"
 
 MODULE_DIR = pathlib.Path(__file__).resolve().parent
 
@@ -229,16 +229,24 @@ def get_toolchain(arch=None, root=None):
     """
     if sys.platform != "linux":
         return DATA_DIR
+
+    TOOLCHAIN_ROOT = DATA_DIR / "toolchain"
+    TOOLCHAIN_PATH = TOOLCHAIN_ROOT / get_triplet()
+    if TOOLCHAIN_PATH.exists():
+        return TOOLCHAIN_PATH
+
     ppbt = None
 
     try:
-        import ppbt
+        import ppbt.common
     except ImportError:
         pass
 
     if ppbt:
-        env = ppbt.environ(auto_extract=True)
-        return pathlib.Path(env["TOOLCHAIN_PATH"])
+        DATA_DIR.mkdir(exist_ok=True)
+        TOOLCHAIN_ROOT.mkdir(exist_ok=True)
+        ppbt.common.extract_archive(str(TOOLCHAIN_ROOT), str(ppbt.common.ARCHIVE))
+        return TOOLCHAIN_PATH
 
 
 def get_triplet(machine=None, plat=None):

relenv/runtime.py

@@ -611,17 +611,9 @@ def wrap(func):
         def wrapper(*args, **kwargs):
             if sys.platform != "linux":
                 return func(*args, **kwargs)
-            if not hasattr(install_cargo_config, "tmpdir") and os.environ.get(
-                "RELENV_BUILDENV", 0
-            ):
-                raise RuntimeError("No toolchain installed")
+            base_dir = common().DATA_DIR / "toolchain"
+            toolchain = base_dir / common().get_triplet()
             cargo_home = install_cargo_config.tmpdir.name
-            toolchain = common().get_toolchain()
-            if not toolchain:
-                if os.environ.get("RELENV_BUILDENV", 0):
-                    raise RuntimeError("No toolchain installed")
-                return func(*args, **kwargs)
-
             if not toolchain.exists():
                 debug("Unable to set CARGO_HOME no toolchain exists")
             else:
@@ -1083,11 +1075,3 @@ def bootstrap():
     setup_crossroot()
     install_cargo_config()
     sys.meta_path = [importer] + sys.meta_path
-    # XXX This causes our m2crypto test to break
-    # if "RELENV_BUILDENV" in os.environ:
-    #    env = buildenv().buildenv()
-    #    for key in env:
-    #        if key in os.environ:
-    #            os.environ[key] = f"{env[key]} {os.environ[key]}"
-    #        else:
-    #            os.environ[key] = env[key]

tests/conftest.py

@@ -26,7 +26,9 @@ def get_build_version():
             versions.append(version)
     if versions:
         version = versions[0]
-        log.warn("Environment RELENV_PY_VERSION not set, detected version %s", version)
+        log.warning(
+            "Environment RELENV_PY_VERSION not set, detected version %s", version
+        )
         return version
 
 

tests/test_build.py

@@ -29,8 +29,7 @@ def test_builder_defaults_linux():
     assert builder.prefix == DATA_DIR / "build" / "3.10.10-x86_64-linux-gnu"
     assert builder.sources == DATA_DIR / "src"
     assert builder.downloads == DATA_DIR / "download"
-    assert "ppbt" in str(builder.toolchain)
-    assert "_toolchain" in str(builder.toolchain)
+    assert "relenv/toolchain" in str(builder.toolchain)
     assert callable(builder.build_default)
     assert callable(builder.populate_env)
     assert builder.recipies == {}

tests/test_common.py

@@ -127,7 +127,7 @@ def test_get_toolchain(tmp_path):
         if sys.platform in ["darwin", "win32"]:
             assert "data" in str(ret)
         else:
-            assert "ppbt" in str(ret)
+            assert f"{data_dir}/toolchain" in str(ret)
 
 
 def test_get_toolchain_no_arch(tmp_path):
@@ -137,7 +137,7 @@ def test_get_toolchain_no_arch(tmp_path):
         if sys.platform in ["darwin", "win32"]:
             assert "data" in str(ret)
         else:
-            assert "ppbt" in str(ret)
+            assert f"{data_dir}/toolchain" in str(ret)
 
 
 @pytest.mark.parametrize("open_arg", (":gz", ":xz", ":bz2", ""))