relenv 0.19.3__py3-none-any.whl → 0.20.0__py3-none-any.whl

relenv/toolchain.py

@@ -3,35 +3,8 @@
 """
 The ``relenv toolchain`` command.
 """
-
-import os
-import pathlib
-import platform
-import shutil
 import sys
 
-from .common import (
-    CHECK_HOSTS,
-    DATA_DIR,
-    __version__,
-    arches,
-    build_arch,
-    check_url,
-    download_url,
-    extract_archive,
-    get_toolchain,
-    get_triplet,
-    runcmd,
-    work_dirs,
-)
-
-CT_NG_VER = "1.25.0"
-CT_URL = "http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-{version}.tar.bz2"
-TC_URL = "https://{hostname}/relenv/{version}/toolchain/{host}/{triplet}.tar.xz"
-CICD = "CI" in os.environ
-
-LAST_RELENV_W_TOOLCHAIN = "0.17.4"
-
 
 def setup_parser(subparsers):
     """
@@ -43,165 +16,17 @@ def setup_parser(subparsers):
     subparser = subparsers.add_parser("toolchain", description="Build Linux Toolchains")
     subparser.set_defaults(func=main)
 
-    subparser.add_argument(
-        "command",
-        default="fetch",
-        choices=["build", "fetch"],
-        help="What type of toolchain operation to perform: build or fetch",
-    )
-    subparser.add_argument(
-        "--arch",
-        default=build_arch(),
-        choices=arches[sys.platform],
-        help="Architecture to build or fetch",
-    )
-    subparser.add_argument(
-        "--clean",
-        default=False,
-        action="store_true",
-        help="Whether or not to clean the toolchain directories",
-    )
-    subparser.add_argument(
-        "--crosstool-only",
-        default=False,
-        action="store_true",
-        help="When building only build Crosstool NG. Do not build toolchains",
-    )
 
-
-def fetch(arch, toolchain, clean=False, version=__version__):
-    """
-    Fetch a toolchain and extract it to the filesystem.
-
-    :param arch: The architecture of the toolchain
-    :type arch: str
-    :param toolchain: Where to extract the toolchain
-    :type toolchain: str
-    :param clean: If true, clean the toolchain directories first
-    :type clean: bool
+def main(*args, **kwargs):
     """
-    triplet = get_triplet(arch)
-    archdir = get_toolchain(root=pathlib.Path(DATA_DIR) / "toolchain", arch=arch)
-    if clean:
-        shutil.rmtree(archdir)
-    if archdir.exists():
-        print(f"Toolchain directory exists, skipping {arch}")
-        return
-
-    check_hosts = CHECK_HOSTS
-    if os.environ.get("RELENV_FETCH_HOST", ""):
-        check_hosts = [os.environ["RELENV_FETCH_HOST"]]
-    for host in check_hosts:
-        url = TC_URL.format(
-            hostname=host,
-            version=LAST_RELENV_W_TOOLCHAIN,
-            host=platform.machine(),
-            triplet=triplet,
-        )
-        if check_url(url, timeout=5):
-            break
-    else:
-        print(f"Unable to find file on an hosts {' '.join(check_hosts)}")
-        sys.exit(1)
-
-    archive = download_url(url, toolchain)
-    extract_archive(toolchain, archive)
-
-
-def _configure_ctng(ctngdir, dirs):
+    Notify users of toolchain command deprecation.
     """
-    Configure crosstool-ng.
-
-    :param ctngdir: The directory holding crosstool-ng
-    :type ctngdir: str
-    :param dirs: The working directories
-    :type dirs: ``relenv.common.WorkDirs``
-    """
-    if not ctngdir.exists():
-        url = CT_URL.format(version=CT_NG_VER)
-        archive = download_url(url, dirs.toolchain)
-        extract_archive(dirs.toolchain, archive)
-    os.chdir(ctngdir)
-    ctng = ctngdir / "ct-ng"
-    if not ctng.exists():
-        runcmd(["./configure", "--enable-local"])
-        runcmd(["make"])
-
-
-def build(arch, dirs, machine, ctngdir):
-    """
-    Build a toolchaing for the given arch.
-
-    :param arch: The architecture to build for
-    :type arch: str
-    :param dirs: The working directories
-    :type dirs: ``relenv.common.WorkDirs``
-    :param machine: The machine to build for
-    :type machine: str
-    :param ctngdir: The directory holding crosstool-ng
-    :type ctngdir: ``pathlib.Path``
-    """
-    os.chdir(dirs.toolchain)
-    ctng = ctngdir / "ct-ng"
-    triplet = get_triplet(arch)
-    archdir = dirs.toolchain / triplet
-    if archdir.exists():
-        print("Toolchain directory exists: {}".format(archdir))
-    else:
-        config = dirs.toolchain_config / machine / "{}-ct-ng.config".format(triplet)
-        if not config.exists():
-            print("Toolchain config missing: {}".format(config))
-            sys.exit(1)
-        with open(config, "r") as rfp:
-            with open(".config", "w") as wfp:
-                wfp.write(rfp.read())
-        env = os.environ.copy()
-        env["CT_PREFIX"] = dirs.toolchain
-        env["CT_ALLOW_BUILD_AS_ROOT"] = "y"
-        env["CT_ALLOW_BUILD_AS_ROOT_SURE"] = "y"
-        if CICD:
-            env["CT_LOG_PROGRESS"] = "n"
-        runcmd(
-            [
-                str(ctng),
-                "source",
-            ],
-            env=env,
-        )
-        runcmd(
-            [
-                str(ctng),
-                "build",
-            ],
-            env=env,
-        )
-
-
-def main(args):
-    """
-    The entrypoint into the ``relenv toolchain`` command.
-
-    :param args: The arguments for the command
-    :type args: ``argparse.Namespace``
-    """
-    version = os.environ.get("RELENV_FETCH_VERSION", __version__)
-    machine = platform.machine()
-    dirs = work_dirs()
-    print(f"Toolchain directory: {dirs.toolchain}")
-    if not dirs.toolchain.exists():
-        os.makedirs(dirs.toolchain)
-    if args.command == "fetch":
-        fetch(args.arch, dirs.toolchain, args.clean, version)
-        sys.exit(0)
-    elif args.command == "build":
-        ctngdir = dirs.toolchain / "crosstool-ng-{}".format(CT_NG_VER)
-        _configure_ctng(ctngdir, dirs)
-        if args.crosstool_only:
-            sys.exit(0)
-        build(args.arch, dirs, machine, ctngdir)
+    sys.stderr.write(
+        "The relenv toolchain command has been deprecated. Please pip install relenv[toolchain].\n"
+    )
+    sys.stderr.flush()
+    sys.exit(1)
 
 
 if __name__ == "__main__":
-    from argparse import ArgumentParser
-
-    main(ArgumentParser())
+    main()

{relenv-0.19.3.dist-info → relenv-0.20.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: relenv
-Version: 0.19.3
+Version: 0.20.0
 Project-URL: Source Code, https://github.com/saltstack/relative-environment-for-python
 Project-URL: Documentation, https://relenv.readthedocs.io/en/latest/
 Project-URL: Changelog, https://relenv.readthedocs.io/en/latest/changelog.html

relenv-0.20.0.dist-info/RECORD

@@ -0,0 +1,35 @@
+relenv/__init__.py,sha256=NyZyghiBF5up_Uq6iJhmBr5HUKzfDtP-yZlU1OS6lQM,101
+relenv/__main__.py,sha256=73VLBFMCXA8ccJiHYJ2KmctJRira-I_MnDKFIdv9JVI,1344
+relenv/buildenv.py,sha256=TVpvA6qZ5zNca1YvEJwxpUps7gHtuETPxGIiA2zFAqI,3197
+relenv/check.py,sha256=AIGxq_2ZBVVIBO8QiJZHknGILyjmxLgN00TTHlFjNsY,951
+relenv/common.py,sha256=dQR-0iraFTVwQYpp-NzBi2GJVuMTzQt2YJvrTWihAdI,19637
+relenv/create.py,sha256=Uwoz7c07V0gZBRUM_gPPyENBdKlQqy32ABYiAM5A6XQ,3830
+relenv/fetch.py,sha256=CJSMJsrAinfReEdwPJGORbLV2DHauIIVcUxozxqr1ug,2274
+relenv/manifest.py,sha256=jm3hySI4tWnvfGspf9Q416mugZJc-rlwvLIoaxxlFQc,840
+relenv/pyversions.py,sha256=BIJeTb_iwvmuCOd7_MGZ5GgCcoF2AdwbeWsmbVRPdVo,11967
+relenv/relocate.py,sha256=P5l4s5H4bR8cYm1PEtwp9yJyVfZ5km44jLe0LvL8CL0,11797
+relenv/runtime.py,sha256=F9fplL6U8oOuPL7uy5CAZpXFg0ikp4zcADg-lmsXKHE,32905
+relenv/toolchain.py,sha256=EpwfR8Xno2hpGFZ1r0dkCdIp6vARfcGD8X6cntjy3Bs,782
+relenv/_scripts/install_vc_build.ps1,sha256=LwzqinKppwht2tacu2jl_gY6gcGWaSq-5Lr1aKduzhs,6423
+relenv/build/__init__.py,sha256=qrbrNjT3t1SYmUIOIcQJP6raKUkgTYXxlLzDtgGuvhg,6091
+relenv/build/common.py,sha256=nH7HRKZU4b2533eghzkD_6Etb8jU1XMYS89786RgRIs,49173
+relenv/build/darwin.py,sha256=705vbaTzv3RGPs7sD2WkNZfO8FYWyXOmUv77JXsP4ag,3501
+relenv/build/linux.py,sha256=zYJ8G8aTzYRqGXuAnaIfErlCZ_-J8-OPcZDGH6i4gTg,18777
+relenv/build/windows.py,sha256=BPeLh1JDbyDaSMKwNFPww8BvvKSuMXIEQTR19_VqWUs,5753
+relenv-0.20.0.dist-info/licenses/LICENSE.md,sha256=T0SRk3vJM1YcAJjDz9vsX9gsCRatAVSBS7LeU0tklRM,9919
+relenv-0.20.0.dist-info/licenses/NOTICE,sha256=Ns0AybPHBsgJKJJfjE6YnGgWEQQ9F7lQ6QNlYLlQT3E,548
+tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/conftest.py,sha256=mNDDGxe-EG8KLNVhRVt0M_Em0T1xo1ibgrx-Q5N4pT8,2154
+tests/test_build.py,sha256=_D54xl4rrp9pnh5VGw46LO5K7MYsFAbDBCV4H9P5v3M,1369
+tests/test_common.py,sha256=u-nMVgurUc_Ub7U15JRsI-yzy9Oyq34kQUhoWknpaa8,6754
+tests/test_create.py,sha256=gnwNukmYJR02CunQBH6JJ3ClUYgjzBWlOm0SJ_rtJkI,1584
+tests/test_downloads.py,sha256=zdULspcHcepOVkEQKOMr0pw02t9GRiBCcIP72So0EYc,3302
+tests/test_fips_photon.py,sha256=fx5EKzRgJ5HbVLZ49M1YN_x2FYSxHahzPwwMaTcVQsA,1325
+tests/test_relocate.py,sha256=_3Eb22qhzWvMnLIgPCqO-t_WZ-hklSMfy8GBTrdjCf0,8854
+tests/test_runtime.py,sha256=n_gTiQqAgO_Vqk6Xf_2Hi3gIkBn_lhDqoovOiQ5fxG8,626
+tests/test_verify_build.py,sha256=ZZ8a_PsSon1aPHzXC2BBx4A1l6MJllol91Tm7Bms9lk,48289
+relenv-0.20.0.dist-info/METADATA,sha256=Jd0Z2KQxBmlZhgzUHTn5smarHGyUwMkWhtqjdZXDEPA,1360
+relenv-0.20.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+relenv-0.20.0.dist-info/entry_points.txt,sha256=dO66nWPPWl8ALWWnZFlHKAo6mfPFuQid7purYWL2ddc,48
+relenv-0.20.0.dist-info/top_level.txt,sha256=P4Ro6JLZE53ZdsQ76o2OzBcpb0MaVJmbfr0HAn9WF8M,13
+relenv-0.20.0.dist-info/RECORD,,

tests/conftest.py

@@ -25,7 +25,9 @@ def get_build_version():
         if sysplat == sys.platform and arch == platform.machine().lower():
             versions.append(version)
     if versions:
-        return versions[0]
+        version = versions[0]
+        log.warn("Environment RELENV_PY_VERSION not set, detected version %s", version)
+        return version
 
 
 def pytest_report_header(config):

tests/test_build.py

@@ -29,8 +29,8 @@ 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 builder.toolchains == DATA_DIR / "toolchain"
-    assert builder.toolchain == DATA_DIR / "toolchain" / "x86_64-linux-gnu"
+    assert "ppbt" in str(builder.toolchain)
+    assert "_toolchain" in str(builder.toolchain)
     assert callable(builder.build_default)
     assert callable(builder.populate_env)
     assert builder.recipies == {}

tests/test_common.py

@@ -124,14 +124,20 @@ def test_get_toolchain(tmp_path):
     data_dir = tmp_path / "data"
     with patch("relenv.common.DATA_DIR", data_dir):
         ret = get_toolchain(arch="aarch64")
-        assert ret == data_dir / "toolchain" / "aarch64-linux-gnu"
+        if sys.platform in ["darwin", "win32"]:
+            assert "data" in str(ret)
+        else:
+            assert "ppbt" in str(ret)
 
 
 def test_get_toolchain_no_arch(tmp_path):
     data_dir = tmp_path / "data"
     with patch("relenv.common.DATA_DIR", data_dir):
         ret = get_toolchain()
-        assert ret == data_dir / "toolchain"
+        if sys.platform in ["darwin", "win32"]:
+            assert "data" in str(ret)
+        else:
+            assert "ppbt" in str(ret)
 
 
 @pytest.mark.parametrize("open_arg", (":gz", ":xz", ":bz2", ""))

tests/test_fips_photon.py

@@ -7,6 +7,8 @@ import subprocess
 
 import pytest
 
+from tests.test_verify_build import _install_ppbt
+
 from .conftest import get_build_version
 
 
@@ -27,6 +29,7 @@ pytestmark = [
 
 
 def test_fips_mode(pyexec, build):
+    _install_ppbt(pyexec)
     env = os.environ.copy()
     proc = subprocess.run(
         [