relenv 0.19.2__py3-none-any.whl → 0.19.4__py3-none-any.whl

relenv/build/common.py

@@ -336,13 +336,13 @@ def build_sqlite(env, dirs, logfp):
     # ]
     cmd = [
         "./configure",
-        "--with-shared",
-        "--without-static",
+        #     "--with-shared",
+        #    "--without-static",
         "--enable-threadsafe",
         "--disable-readline",
         "--disable-dependency-tracking",
         "--prefix={}".format(dirs.prefix),
-        "--enable-add-ons=nptl,ports",
+        #    "--enable-add-ons=nptl,ports",
     ]
     if env["RELENV_HOST"].find("linux") > -1:
         cmd += [

relenv/build/darwin.py

@@ -97,10 +97,10 @@ build.add(
     name="SQLite",
     build_func=build_sqlite,
     download={
-        "url": "https://sqlite.org/2024/sqlite-autoconf-{version}.tar.gz",
+        "url": "https://sqlite.org/2025/sqlite-autoconf-{version}.tar.gz",
         "fallback_url": "https://woz.io/relenv/dependencies/sqlite-autoconf-{version}.tar.gz",
-        "version": "3460100",
-        "checksum": "1fdbada080f3285ac864c314bfbfc581b13e804b",
+        "version": "3500200",
+        "checksum": "f57c0e54fcddf91f73916987d5c52e743c8bfa76",
     },
 )
 
@@ -140,6 +140,6 @@ build = build.copy(
 builds.add("darwin", builder=build)
 
 build = build.copy(
-    version="3.13.3", checksum="f26085cf12daef7b60b8a6fe93ef988b9a094aea"
+    version="3.13.5", checksum="dbf3aed444cbb2221eabfb52688aa371423aa0ba"
 )
 builds.add("darwin", builder=build)

relenv/build/linux.py

@@ -499,9 +499,9 @@ build.add(
     name="SQLite",
     build_func=build_sqlite,
     download={
-        "url": "https://sqlite.org/2024/sqlite-autoconf-{version}.tar.gz",
-        "version": "3460100",
-        "checksum": "1fdbada080f3285ac864c314bfbfc581b13e804b",
+        "url": "https://sqlite.org/2025/sqlite-autoconf-{version}.tar.gz",
+        "version": "3500200",
+        "checksum": "f57c0e54fcddf91f73916987d5c52e743c8bfa76",
         "checkfunc": sqlite_version,
         "checkurl": "https://sqlite.org/",
     },
@@ -548,8 +548,8 @@ build.add(
     build_libffi,
     download={
         "url": "https://github.com/libffi/libffi/releases/download/v{version}/libffi-{version}.tar.gz",
-        "version": "3.4.8",
-        "checksum": "6930b77aebe2465a8e1a8617c4c9a8fa3199b256",
+        "version": "3.5.1",
+        "checksum": "5375e956b0d662e118e47758bd656861e43ba3ef",
         "checkfunc": github_version,
         "checkurl": "https://github.com/libffi/libffi/releases/",
     },
@@ -663,6 +663,6 @@ build = build.copy(
 builds.add("linux", builder=build)
 
 build = build.copy(
-    version="3.13.3", checksum="f26085cf12daef7b60b8a6fe93ef988b9a094aea"
+    version="3.13.5", checksum="dbf3aed444cbb2221eabfb52688aa371423aa0ba"
 )
 builds.add("linux", builder=build)

relenv/build/windows.py

@@ -222,6 +222,6 @@ build = build.copy(
 builds.add("win32", builder=build)
 
 build = build.copy(
-    version="3.13.3", checksum="f26085cf12daef7b60b8a6fe93ef988b9a094aea"
+    version="3.13.5", checksum="dbf3aed444cbb2221eabfb52688aa371423aa0ba"
 )
 builds.add("win32", builder=build)

relenv/common.py

@@ -18,7 +18,7 @@ import threading
 import time
 
 # relenv package version
-__version__ = "0.19.2"
+__version__ = "0.19.4"
 
 MODULE_DIR = pathlib.Path(__file__).resolve().parent
 
@@ -543,6 +543,72 @@ def relative_interpreter(root_dir, scripts_dir, interpreter):
     return relscripts / relinterp
 
 
+def makepath(*paths):
+    """
+    Make a normalized path name from paths.
+    """
+    dir = os.path.join(*paths)
+    try:
+        dir = os.path.abspath(dir)
+    except OSError:
+        pass
+    return dir, os.path.normcase(dir)
+
+
+def addpackage(sitedir, name):
+    """
+    Add editable package to path.
+    """
+    import io
+    import stat
+
+    fullname = os.path.join(sitedir, name)
+    paths = []
+    try:
+        st = os.lstat(fullname)
+    except OSError:
+        return
+    if (getattr(st, "st_flags", 0) & stat.UF_HIDDEN) or (
+        getattr(st, "st_file_attributes", 0) & stat.FILE_ATTRIBUTE_HIDDEN
+    ):
+        # print(f"Skipping hidden .pth file: {fullname!r}")
+        return
+    # print(f"Processing .pth file: {fullname!r}")
+    try:
+        # locale encoding is not ideal especially on Windows. But we have used
+        # it for a long time. setuptools uses the locale encoding too.
+        f = io.TextIOWrapper(io.open_code(fullname), encoding="locale")
+    except OSError:
+        return
+    with f:
+        for n, line in enumerate(f):
+            if line.startswith("#"):
+                continue
+            if line.strip() == "":
+                continue
+            try:
+                if line.startswith(("import ", "import\t")):
+                    exec(line)
+                    continue
+                line = line.rstrip()
+                dir, dircase = makepath(sitedir, line)
+                if dircase not in paths and os.path.exists(dir):
+                    paths.append(dir)
+            except Exception:
+                print(
+                    "Error processing line {:d} of {}:\n".format(n + 1, fullname),
+                    file=sys.stderr,
+                )
+                import traceback
+
+                for record in traceback.format_exception(*sys.exc_info()):
+                    for line in record.splitlines():
+                        print("  " + line, file=sys.stderr)
+                print("\nRemainder of file ignored", file=sys.stderr)
+                break
+    return paths
+
+
 def sanitize_sys_path(sys_path_entries):
     """
     Sanitize `sys.path` to only include paths relative to the onedir environment.
@@ -565,4 +631,10 @@ def sanitize_sys_path(sys_path_entries):
     if "PYTHONPATH" in os.environ:
         for __path in os.environ["PYTHONPATH"].split(os.pathsep):
             __sys_path.append(__path)
+    for known_path in __sys_path[:]:
+        for _ in pathlib.Path(known_path).glob("__editable__.*.pth"):
+            paths = addpackage(known_path, _)
+            for p in paths:
+                if p not in __sys_path:
+                    __sys_path.append(p)
     return __sys_path

relenv/runtime.py

@@ -859,6 +859,13 @@ def setup_openssl():
     openssl_bin = shutil.which("openssl")
     if not openssl_bin:
         debug("Could not find the 'openssl' binary in the path")
+        set_openssl_modules_dir(str(sys.RELENV / "lib" / "ossl-modules"))
+
+        if load_openssl_provider("default") == 0:
+            debug("Unable to load the default openssl provider")
+        if load_openssl_provider("legacy") == 0:
+            debug("Unable to load the legacy openssl provider")
+
         return
 
     if "OPENSSL_MODULES" not in os.environ and sys.platform != "win32":

{relenv-0.19.2.dist-info → relenv-0.19.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: relenv
-Version: 0.19.2
+Version: 0.19.4
 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.19.2.dist-info → relenv-0.19.4.dist-info}/RECORD

@@ -2,11 +2,11 @@ relenv/__init__.py,sha256=NyZyghiBF5up_Uq6iJhmBr5HUKzfDtP-yZlU1OS6lQM,101
 relenv/__main__.py,sha256=otLGprkP5mrzRn-KI7hx3p61enpKdIxJq37iPjHgURY,1330
 relenv/buildenv.py,sha256=GcctZxbH1lfShN8bsbqG-xtrnI4rjWv2PUktHLSYlRo,2946
 relenv/check.py,sha256=AIGxq_2ZBVVIBO8QiJZHknGILyjmxLgN00TTHlFjNsY,951
-relenv/common.py,sha256=pC9uImG0Temd-sSx5XwqxbuEkZBVKb9s_nmiSLJD5xo,15216
+relenv/common.py,sha256=Lq_g6gD3CnMEWccB3oe9t31nkgHx5InPM0E2l0T8a7g,17513
 relenv/create.py,sha256=DFKXtANcM4_axUCHF6Fg1Bhr3xWreLt9jxNYLXVZEsM,3930
 relenv/fetch.py,sha256=1qQLQuPBpDqvRO7dkjnmeLfo-I0NSA8vFkcMd-Nqbrk,2388
 relenv/relocate.py,sha256=P5l4s5H4bR8cYm1PEtwp9yJyVfZ5km44jLe0LvL8CL0,11797
-relenv/runtime.py,sha256=65WYEAGnpH5hZgujaJSaJExhn-VRTdRO9-Y6Qo8X-Do,31163
+relenv/runtime.py,sha256=rqU66Kzo05EIG_akMV18t1b27SRNRCWk1pQWbX7Em0k,31467
 relenv/toolchain.py,sha256=H--mpJnlLR0mWP5djgYss7qDOTdSub7e7rQxa4cPBBE,5858
 relenv/_scripts/install_vc_build.ps1,sha256=LwzqinKppwht2tacu2jl_gY6gcGWaSq-5Lr1aKduzhs,6423
 relenv/_toolchain/aarch64/aarch64-linux-gnu-ct-ng.config,sha256=2s_7fX6A3p4380qLiOS78kgijN7GdRHfiW0FArnhjEE,20665
@@ -14,12 +14,12 @@ relenv/_toolchain/aarch64/x86_64-linux-gnu-ct-ng.config,sha256=-CFXq0SLFCRkKhhME
 relenv/_toolchain/x86_64/aarch64-linux-gnu-ct-ng.config,sha256=NnkGKF2oIfwOFFFIAQzVgpa-J1gfVM4eOm5VlkLnXqA,20672
 relenv/_toolchain/x86_64/x86_64-linux-gnu-ct-ng.config,sha256=pCdwXWcd0wEV-dfAIccN_tkpJshRjSyx_RByfcdakF4,20791
 relenv/build/__init__.py,sha256=Mk5Cn1W7C7ZGGbNxCCcQNMk4AHNvMByPSZ8akpnq9YI,5373
-relenv/build/common.py,sha256=Unbt2upTWGH3b0uYzDVaGiyD7233tPlR6-vmchcvQpg,49012
-relenv/build/darwin.py,sha256=57riuVU12oydmVp5Mi3Tys4cqai55uHF0vHtdKxHXWc,3920
-relenv/build/linux.py,sha256=TCI3NH_Yjzxizb8529qlO7pCxVleptRYcGtMzKUx7-0,19193
-relenv/build/windows.py,sha256=yYm-8jziiUMJb6SVKGQZpHtP6wQmDK06BYC7HWgwzwA,6169
-relenv-0.19.2.dist-info/licenses/LICENSE.md,sha256=T0SRk3vJM1YcAJjDz9vsX9gsCRatAVSBS7LeU0tklRM,9919
-relenv-0.19.2.dist-info/licenses/NOTICE,sha256=Ns0AybPHBsgJKJJfjE6YnGgWEQQ9F7lQ6QNlYLlQT3E,548
+relenv/build/common.py,sha256=HEqlTJ7aureT1y1cXk_1ofw1GufO_4lDhWrNR2uWs9c,49028
+relenv/build/darwin.py,sha256=7uhkYwcWBfFfgc3Bz9U2n-SsiDZjpCXgVlJh2bNj-5E,3920
+relenv/build/linux.py,sha256=EVuhryUxnSkrkik2jAaTEVgK6uCUiaJANdA1KJ1xCqM,19193
+relenv/build/windows.py,sha256=K_bzOSWQLkfm_O1MMoSq8iyJeloi6smRx2pdVl99_ug,6169
+relenv-0.19.4.dist-info/licenses/LICENSE.md,sha256=T0SRk3vJM1YcAJjDz9vsX9gsCRatAVSBS7LeU0tklRM,9919
+relenv-0.19.4.dist-info/licenses/NOTICE,sha256=Ns0AybPHBsgJKJJfjE6YnGgWEQQ9F7lQ6QNlYLlQT3E,548
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/conftest.py,sha256=VfuB1T7Tjoy2mhKpwKUJNIoq9RX69sRvRXIxw_R09qU,2040
 tests/test_build.py,sha256=vuUxCTGQa1FcoeS3ls-7e9v2ry9sgWJHzKWMYKKrwNo,1407
@@ -30,9 +30,9 @@ tests/test_fips_photon.py,sha256=pR6MxzdT1vyaC-nN609fy7Nl68eyqOo46BUdluOXKjI,124
 tests/test_relocate.py,sha256=_3Eb22qhzWvMnLIgPCqO-t_WZ-hklSMfy8GBTrdjCf0,8854
 tests/test_runtime.py,sha256=n_gTiQqAgO_Vqk6Xf_2Hi3gIkBn_lhDqoovOiQ5fxG8,626
 tests/test_toolchain.py,sha256=02ZxSj72fMTINVl-PHhBkS6eLGWKvwO3nweHYEt4SMQ,4379
-tests/test_verify_build.py,sha256=b6aGdPUK-wHMRL1A5NDnJ2v5GjiletfFCe1oFPll-LU,41182
-relenv-0.19.2.dist-info/METADATA,sha256=Iu8nlarlFKYWu5P5HRZsGy-XPvVTGmgTNgxw-YXmgug,1360
-relenv-0.19.2.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-relenv-0.19.2.dist-info/entry_points.txt,sha256=dO66nWPPWl8ALWWnZFlHKAo6mfPFuQid7purYWL2ddc,48
-relenv-0.19.2.dist-info/top_level.txt,sha256=P4Ro6JLZE53ZdsQ76o2OzBcpb0MaVJmbfr0HAn9WF8M,13
-relenv-0.19.2.dist-info/RECORD,,
+tests/test_verify_build.py,sha256=FL2YsAY1p-o7yi1URvO44EQADdwlAwvCvXniHRlMGyU,45327
+relenv-0.19.4.dist-info/METADATA,sha256=MkunIe3RHbbFnVydoywpP0I6B1t6-rhzi24ZNbHcVXQ,1360
+relenv-0.19.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+relenv-0.19.4.dist-info/entry_points.txt,sha256=dO66nWPPWl8ALWWnZFlHKAo6mfPFuQid7purYWL2ddc,48
+relenv-0.19.4.dist-info/top_level.txt,sha256=P4Ro6JLZE53ZdsQ76o2OzBcpb0MaVJmbfr0HAn9WF8M,13
+relenv-0.19.4.dist-info/RECORD,,

{relenv-0.19.2.dist-info → relenv-0.19.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/test_verify_build.py

@@ -25,6 +25,28 @@ pytestmark = [
 ]
 
 
+EXTRAS_PY = """
+import pathlib
+import sys
+
+
+def setup(pth_file_path):
+    # Discover the extras-<py-major>.<py-minor> directory
+    extras_parent_path = pathlib.Path(pth_file_path).resolve().parent.parent
+    if not sys.platform.startswith("win"):
+        extras_parent_path = extras_parent_path.parent
+
+    extras_path = str(extras_parent_path / "extras-{}.{}".format(*sys.version_info))
+
+    if extras_path in sys.path and sys.path[0] != extras_path:
+        # The extras directory must come first
+        sys.path.remove(extras_path)
+
+    if extras_path not in sys.path:
+        sys.path.insert(0, extras_path)
+"""
+
+
 @pytest.fixture(scope="module")
 def arch():
     return build_arch()
@@ -1454,3 +1476,142 @@ def test_install_pyinotify_w_latest_pip(pipexec, build, minor_version):
     )
     assert p.returncode == 0, "Failed install pyinotify"
     assert (extras / "pyinotify.py").exists()
+
+
+@pytest.mark.skip_unless_on_linux
+def test_install_editable_package(pipexec, pyexec, build, minor_version, tmp_path):
+    os.chdir(tmp_path)
+    env = os.environ.copy()
+    env["RELENV_BUILDENV"] = "yes"
+    p = subprocess.run(
+        [
+            "git",
+            "clone",
+            "https://github.com/salt-extensions/saltext-zabbix.git",
+            "--depth",
+            "1",
+        ],
+        env=env,
+    )
+    assert p.returncode == 0
+    p = subprocess.run([str(pipexec), "install", "-e", "saltext-zabbix"], env=env)
+    assert p.returncode == 0
+    p = subprocess.run([str(pyexec), "-c", "import saltext.zabbix"], env=env)
+    assert p.returncode == 0
+
+
+@pytest.mark.skip_unless_on_linux
+def test_install_editable_package_in_extras(
+    pipexec, pyexec, build, minor_version, tmp_path
+):
+    sitepkgs = pathlib.Path(build) / "lib" / f"python{minor_version}" / "site-packages"
+
+    (sitepkgs / "_extras.pth").write_text("import _extras; _extras.setup(__file__)")
+    (sitepkgs / "_extras.py").write_text(EXTRAS_PY)
+    extras = pathlib.Path(build) / f"extras-{minor_version}"
+    extras.mkdir()
+    os.chdir(tmp_path)
+    env = os.environ.copy()
+    env["RELENV_BUILDENV"] = "yes"
+    p = subprocess.run(
+        [
+            "git",
+            "clone",
+            "https://github.com/salt-extensions/saltext-zabbix.git",
+            "--depth",
+            "1",
+        ],
+        env=env,
+    )
+    assert p.returncode == 0
+    p = subprocess.run(
+        [str(pipexec), "install", f"--target={extras}", "-e", "saltext-zabbix"], env=env
+    )
+    assert p.returncode == 0
+    p = subprocess.run([str(pyexec), "-c", "import saltext.zabbix"], env=env)
+    assert p.returncode == 0
+
+
+@pytest.fixture
+def rockycontainer(build):
+    if not shutil.which("docker"):
+        pytest.skip(reason="No docker binary found")
+    name = "rocky10"
+    subprocess.run(
+        [
+            "docker",
+            "create",
+            "--name",
+            name,
+            "-v",
+            f"{build}:/test",
+            "--entrypoint",
+            "tail",
+            "rockylinux/rockylinux:10",
+            "-f",
+            "/dev/null",
+        ],
+        capture_output=True,
+        check=True,
+    )
+    subprocess.run(
+        [
+            "docker",
+            "start",
+            name,
+        ],
+        capture_output=True,
+        check=True,
+    )
+    try:
+        yield name
+    finally:
+        subprocess.run(
+            [
+                "docker",
+                "stop",
+                name,
+            ],
+            capture_output=True,
+            check=True,
+        )
+        subprocess.run(
+            [
+                "docker",
+                "rm",
+                name,
+            ],
+            capture_output=True,
+            check=True,
+        )
+
+
+@pytest.mark.skip_on_windows
+def test_no_openssl_binary(rockycontainer, pipexec):
+    env = os.environ.copy()
+    env["RELENV_BUILDENV"] = "yes"
+    proc = subprocess.run(
+        [
+            str(pipexec),
+            "install",
+            "cryptography",
+            "--no-binary=:all:",
+            "--no-cache-dir",
+        ],
+        env=env,
+    )
+    assert proc.returncode == 0
+    proc = subprocess.run(
+        [
+            "docker",
+            "exec",
+            rockycontainer,
+            "test/bin/python3",
+            "-c",
+            "import cryptography.exceptions",
+        ],
+        capture_output=True,
+    )
+
+    errors = proc.stderr.decode()
+    assert "legacy provider failed to load" not in errors