relenv 0.20.4__tar.gz → 0.20.5__tar.gz

{relenv-0.20.4/relenv.egg-info → relenv-0.20.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: relenv
-Version: 0.20.4
+Version: 0.20.5
 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.5/relenv/_scripts/install_vc_build.ps1

@@ -0,0 +1,200 @@
+<#
+.SYNOPSIS
+Script that installs Visual Studio Build Tools
+
+.DESCRIPTION
+This script installs the Visual Studio Build Tools if they are not already
+present on the system. Visual Studio Build Tools are the binaries and libraries
+needed to build Python from source.
+
+.EXAMPLE
+install_vc_buildtools.ps1
+
+#>
+param(
+    [Parameter(Mandatory=$false)]
+    [Alias("c")]
+# Don't prettify the output of the Write-Result
+    [Switch] $CICD
+)
+
+#-------------------------------------------------------------------------------
+# Script Preferences
+#-------------------------------------------------------------------------------
+
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12
+$ProgressPreference = "SilentlyContinue"
+$ErrorActionPreference = "Stop"
+# https://stackoverflow.com/a/67201331/4581998
+$env:PSModulePath = [Environment]::GetEnvironmentVariable('PSModulePath', 'Machine')
+
+#-------------------------------------------------------------------------------
+# Script Functions
+#-------------------------------------------------------------------------------
+
+function Write-Result($result, $ForegroundColor="Green") {
+    if ( $CICD ) {
+        Write-Host $result -ForegroundColor $ForegroundColor
+    } else {
+        $position = 80 - $result.Length - [System.Console]::CursorLeft
+        Write-Host -ForegroundColor $ForegroundColor ("{0,$position}$result" -f "")
+    }
+}
+
+function Add-Certificate {
+    [CmdletBinding()]
+    param(
+
+        [Parameter(Mandatory=$true)]
+        # The path in the certstore (CERT:/LocalMachine/Root/<hash>)
+        [String] $Path,
+
+        [Parameter(Mandatory=$true)]
+        # The path to the cert file for importing
+        [String] $File,
+
+        [Parameter(Mandatory=$true)]
+        # The name of the cert file for importing
+        [String] $Name
+
+    )
+
+    # Validation
+    if ( ! (Test-Path -Path $File)) {
+        Write-Host "Invalid path to certificate file"
+        exit 1
+    }
+
+    if (! (Test-Path -Path $Path) ) {
+
+        Write-Host "Installing Certificate $Name`: " -NoNewLine
+        $output = Import-Certificate -FilePath $File -CertStoreLocation "Cert:\LocalMachine\Root"
+        if ( Test-Path -Path $Path ) {
+            Write-Result "Success"
+        } else {
+            Write-Result "Failed" -ForegroundColor Yellow
+            Write-Host $output
+        }
+    }
+}
+
+#-------------------------------------------------------------------------------
+# Start the Script
+#-------------------------------------------------------------------------------
+
+Write-Host $("=" * 80)
+Write-Host "Install Visual Studio Build Tools" -ForegroundColor Cyan
+Write-Host $("-" * 80)
+
+#-------------------------------------------------------------------------------
+# Script Variables
+#-------------------------------------------------------------------------------
+
+# Dependency Variables
+$VS_BLD_TOOLS   = "https://aka.ms/vs/15/release/vs_buildtools.exe"
+try {
+    # If VS is installed, you will be able to get the WMI Object MSFT_VSInstance
+    $VS_INST_LOC    = $(Get-CimInstance MSFT_VSInstance -Namespace root/cimv2/vs).InstallLocation
+    $MSBUILD_BIN = $(Get-ChildItem "$VS_INST_LOC\MSBuild\*\Bin\msbuild.exe").FullName
+} catch {
+    # If VS is not installed, this is the fallback for this installation
+    $MSBUILD_BIN    = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe"
+}
+
+#-------------------------------------------------------------------------------
+# Visual Studio
+#-------------------------------------------------------------------------------
+
+Write-Host "Confirming Presence of Visual Studio Build Tools: " -NoNewline
+# We're only gonna look for msbuild.exe
+if ( Test-Path -Path $MSBUILD_BIN ) {
+    Write-Result "Success" -ForegroundColor Green
+} else {
+    Write-Result "Missing" -ForegroundColor Yellow
+
+    try {
+        # If VS is installed, you will be able to get the WMI Object MSFT_VSInstance
+        Write-Host "Get VS Instance Information"
+        Get-CimInstance MSFT_VSInstance -Namespace root/cimv2/vs
+    } catch {}
+
+    Write-Host "Checking available disk space: " -NoNewLine
+    $available = (Get-PSDrive $env:SystemDrive.Trim(":")).Free
+    if ( $available -gt (1024 * 1024 * 1024 * 9.1) ) {
+        Write-Result "Success" -ForegroundColor Green
+    } else {
+        Write-Result "Failed" -ForegroundColor Red
+        Write-Host "Not enough disk space"
+        exit 1
+    }
+
+    Write-Host "Downloading Visual Studio 2017 build tools: " -NoNewline
+    Invoke-WebRequest -Uri "$VS_BLD_TOOLS" -OutFile "$env:TEMP\vs_buildtools.exe"
+    if ( Test-Path -Path "$env:TEMP\vs_buildtools.exe" ) {
+        Write-Result "Success" -ForegroundColor Green
+    } else {
+        Write-Result "Failed" -ForegroundColor Red
+        exit 1
+    }
+
+    Write-Host "Creating Layout for Visual Studio 2017 build tools: " -NoNewline
+    if ( ! (Test-Path -Path "$($env:TEMP)\build_tools") ) {
+        New-Item -Path "$($env:TEMP)\build_tools" -ItemType Directory | Out-Null
+    }
+
+    Start-Process -FilePath "$env:TEMP\vs_buildtools.exe" `
+                  -ArgumentList "--layout `"$env:TEMP\build_tools`"", `
+                                "--add Microsoft.VisualStudio.Workload.MSBuildTools", `
+                                "--add Microsoft.VisualStudio.Workload.VCTools", `
+                                "--add Microsoft.VisualStudio.Component.Windows81SDK", `
+                                "--add Microsoft.VisualStudio.Component.VC.140", `
+                                "--lang en-US", `
+                                "--includeRecommended", `
+                               # "--quiet", `
+                                "--wait" `
+                  -Wait -WindowStyle Hidden
+    if ( Test-Path -Path "$env:TEMP\build_tools\vs_buildtools.exe" ) {
+        Write-Result "Success" -ForegroundColor Green
+    } else {
+        Write-Result "Failed" -ForegroundColor Red
+        exit 1
+    }
+
+    # Serial: 28cc3a25bfba44ac449a9b586b4339aa
+    # Hash: 3b1efd3a66ea28b16697394703a72ca340a05bd5
+    $cert_name = "Sign Root Certificate"
+    $cert_path = "Cert:\LocalMachine\Root\3b1efd3a66ea28b16697394703a72ca340a05bd5"
+    $cert_file = "$env:TEMP\build_tools\certificates\manifestCounterSignRootCertificate.cer"
+    Add-Certificate -Name $cert_name -Path $cert_path -File $cert_file
+
+    # Serial: 3f8bc8b5fc9fb29643b569d66c42e144
+    # Hash: 8f43288ad272f3103b6fb1428485ea3014c0bcfe
+    $cert_name = "Root Certificate"
+    $cert_path = "Cert:\LocalMachine\Root\8f43288ad272f3103b6fb1428485ea3014c0bcfe"
+    $cert_file = "$env:TEMP\build_tools\certificates\manifestRootCertificate.cer"
+    Add-Certificate -Name $cert_name -Path $cert_path -File $cert_file
+
+    Write-Host "Installing Visual Studio 2017 build tools: " -NoNewline
+    $proc = Start-Process `
+        -FilePath "$env:TEMP\build_tools\vs_setup.exe" `
+        -ArgumentList "--wait", "--noweb", "--quiet" `
+        -PassThru -Wait `
+        -RedirectStandardOutput "$env:TEMP\stdout.txt"
+    if ( Test-Path -Path $MSBUILD_BIN ) {
+        Write-Result "Failed" -ForegroundColor Red
+        Write-Host "Missing: $_"
+        Write-Host "ExitCode: $($proc.ExitCode)"
+        Write-Host "STDOUT:"
+        Get-Content "$env:TEMP\stdout.txt"
+        exit 1
+    }
+    Write-Result "Success" -ForegroundColor Green
+}
+
+#-------------------------------------------------------------------------------
+# Finished
+#-------------------------------------------------------------------------------
+
+Write-Host $("-" * 80)
+Write-Host "Install Visual Studio Build Tools Completed" -ForegroundColor Cyan
+Write-Host $("=" * 80)

{relenv-0.20.4 → relenv-0.20.5}/relenv/build/__init__.py

@@ -13,7 +13,7 @@ from .common import builds, CHECK_VERSIONS_SUPPORT
 
 from ..pyversions import python_versions, Version
 
-from ..common import build_arch
+from ..common import build_arch, DEFAULT_PYTHON
 
 
 def platform_module():
@@ -58,7 +58,7 @@ def setup_parser(subparsers):
     )
     build_subparser.add_argument(
         "--python",
-        default="3.10.17",
+        default=DEFAULT_PYTHON,
         type=str,
         help="The python version [default: %(default)s]",
     )

{relenv-0.20.4 → relenv-0.20.5}/relenv/build/darwin.py

@@ -99,8 +99,8 @@ build.add(
     download={
         "url": "https://sqlite.org/2025/sqlite-autoconf-{version}.tar.gz",
         "fallback_url": "https://woz.io/relenv/dependencies/sqlite-autoconf-{version}.tar.gz",
-        "version": "3500200",
-        "checksum": "f57c0e54fcddf91f73916987d5c52e743c8bfa76",
+        "version": "3500400",
+        "checksum": "145048005c777796dd8494aa1cfed304e8c34283",
     },
 )
 

{relenv-0.20.4 → relenv-0.20.5}/relenv/build/linux.py

@@ -500,8 +500,8 @@ build.add(
     build_func=build_sqlite,
     download={
         "url": "https://sqlite.org/2025/sqlite-autoconf-{version}.tar.gz",
-        "version": "3500200",
-        "checksum": "f57c0e54fcddf91f73916987d5c52e743c8bfa76",
+        "version": "3500400",
+        "checksum": "145048005c777796dd8494aa1cfed304e8c34283",
         "checkfunc": sqlite_version,
         "checkurl": "https://sqlite.org/",
     },
@@ -523,8 +523,8 @@ build.add(
     build_func=build_gdbm,
     download={
         "url": "https://ftp.gnu.org/gnu/gdbm/gdbm-{version}.tar.gz",
-        "version": "1.25",
-        "checksum": "d55bdf2bb5f92f80006166dd8a8323cb2a428bd1",
+        "version": "1.26",
+        "checksum": "6cee3657de948e691e8df26509157be950cef4d4",
         "checkfunc": tarball_version,
     },
 )
@@ -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.5.1",
-        "checksum": "5375e956b0d662e118e47758bd656861e43ba3ef",
+        "version": "3.5.2",
+        "checksum": "2bd35b135b0eeb5c631e02422c9dbe786ddb626a",
         "checkfunc": github_version,
         "checkurl": "https://github.com/libffi/libffi/releases/",
     },
@@ -582,8 +582,8 @@ build.add(
     wait_on=["openssl"],
     download={
         "url": "https://kerberos.org/dist/krb5/{version}/krb5-{version}.tar.gz",
-        "version": "1.21",
-        "checksum": "e2ee531443122376ac8b62b3848d94376f646089",
+        "version": "1.22",
+        "checksum": "3ad930ab036a8dc3678356fbb9de9246567e7984",
         "checkfunc": krb_version,
         "checkurl": "https://kerberos.org/dist/krb5/",
     },
@@ -595,8 +595,8 @@ build.add(
     wait_on=["ncurses"],
     download={
         "url": "https://ftp.gnu.org/gnu/readline/readline-{version}.tar.gz",
-        "version": "8.2.13",
-        "checksum": "5ffb6a334c2422acbe8f4d2cb11e345265c8d930",
+        "version": "8.3",
+        "checksum": "2c05ae9350b695f69d70b47f17f092611de2081f",
         "checkfunc": tarball_version,
     },
 )

{relenv-0.20.4 → relenv-0.20.5}/relenv/build/windows.py

@@ -36,6 +36,44 @@ def populate_env(env, dirs):
     env["MSBUILDDISABLENODEREUSE"] = "1"
 
 
+def patch_file(path, old, new):
+    """
+    Search a file line by line for a string to replace.
+
+    :param path: Location of the file to search
+    :type path: str
+    :param old: The value that will be replaced
+    :type path: str
+    :param new: The value that will replace the 'old' value.
+    :type path: str
+    """
+    import re
+
+    with open(path, "r") as fp:
+        content = fp.read()
+    new_content = ""
+    for line in content.splitlines():
+        re.sub(old, new, line)
+        new_content += line + os.linesep
+    with open(path, "w") as fp:
+        fp.write(new_content)
+
+
+def override_dependency(source, old, new):
+    """
+    Overwrite a dependency string for Windoes PCBuild.
+
+    :param source: Python's source directory
+    :type path: str
+    :param old: Regular expression to search for
+    :type path: str
+    :param new: Replacement text
+    :type path: str
+    """
+    patch_file(source / "PCbuild" / "python.props", old, new)
+    patch_file(source / "PCbuild" / "get_externals.bat", old, new)
+
+
 def build_python(env, dirs, logfp):
     """
     Run the commands to build Python.
@@ -47,6 +85,13 @@ def build_python(env, dirs, logfp):
     :param logfp: A handle for the log file
     :type logfp: file
     """
+    # Override default versions
+    if env["RELENV_PY_MAJOR_VERSION"] in [
+        "3.10",
+        "3.11",
+    ]:
+        override_dependency(dirs.source, r"sqlite-\d+.\d+.\d+.\d+", "sqlite-3.50.4.0")
+
     arch_to_plat = {
         "amd64": "x64",
         "x86": "win32",

{relenv-0.20.4 → relenv-0.20.5}/relenv/common.py

@@ -18,10 +18,12 @@ import threading
 import time
 
 # relenv package version
-__version__ = "0.20.4"
+__version__ = "0.20.5"
 
 MODULE_DIR = pathlib.Path(__file__).resolve().parent
 
+DEFAULT_PYTHON = "3.10.18"
+
 LINUX = "linux"
 WIN32 = "win32"
 DARWIN = "darwin"

{relenv-0.20.4 → relenv-0.20.5}/relenv/fetch.py

@@ -11,6 +11,7 @@ from .build import platform_module
 from .common import (
     CHECK_HOSTS,
     DATA_DIR,
+    DEFAULT_PYTHON,
     __version__,
     build_arch,
     check_url,
@@ -39,7 +40,7 @@ def setup_parser(subparsers):
     )
     subparser.add_argument(
         "--python",
-        default="3.10.18",
+        default=DEFAULT_PYTHON,
         type=str,
         help="The python version [default: %(default)s]",
     )

{relenv-0.20.4 → relenv-0.20.5/relenv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: relenv
-Version: 0.20.4
+Version: 0.20.5
 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.4/relenv/_scripts/install_vc_build.ps1

@@ -1,150 +0,0 @@
-# Copyright 2022 VMware, Inc.
-# SPDX-License-Identifier: Apache-2
-
-<#
-Taken from: https://github.com/saltstack/salt-windows-nsis/blob/main/scripts/install_vs_buildtools.bat
-
-.SYNOPSIS
-Script that installs Visual Studio Build Tools
-.DESCRIPTION
-This script installs the Visual Studio Build Tools if they are not already
-present on the system. Visual Studio Build Tools are the binaries and libraries
-needed to build Python from source.
-.EXAMPLE
-install_vc_buildtools.ps1
-#>
-
-# Script Preferences
-$ProgressPreference = "SilentlyContinue"
-$ErrorActionPreference = "Stop"
-
-#-------------------------------------------------------------------------------
-# Start the Script
-#-------------------------------------------------------------------------------
-
-Write-Host $("=" * 80)
-Write-Host "Install Visual Studio Build Tools" -ForegroundColor Cyan
-Write-Host $("-" * 80)
-
-#-------------------------------------------------------------------------------
-# Script Variables
-#-------------------------------------------------------------------------------
-
-# Dependency Variables
-$VS_BLD_TOOLS   = "https://aka.ms/vs/15/release/vs_buildtools.exe"
-$VS_CL_BIN      = "${env:ProgramFiles(x86)}\Microsoft Visual Studio 14.0\VC\bin\cl.exe"
-$MSBUILD_BIN    = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe"
-$WIN10_SDK_RC   = "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.17763.0\x64\rc.exe"
-
-#-------------------------------------------------------------------------------
-# Visual Studio
-#-------------------------------------------------------------------------------
-
-$install_build_tools = $false
-Write-Host "Confirming Presence of Visual Studio Build Tools: " -NoNewline
-@($VS_CL_BIN, $MSBUILD_BIN, $WIN10_SDK_RC) | ForEach-Object {
-    if ( ! (Test-Path -Path $_) ) {
-        $install_build_tools = $true
-    }
-}
-
-if ( $install_build_tools ) {
-    Write-Host "Missing" -ForegroundColor Yellow
-
-    Write-Host "Checking available disk space: " -NoNewLine
-    $available = (Get-PSDrive $env:SystemDrive.Trim(":")).Free
-    if ( $available -gt (1024 * 1024 * 1024 * 9.1) ) {
-        Write-Host "Success" -ForegroundColor Green
-    } else {
-        Write-Host "Failed" -ForegroundColor Red
-        Write-Host "Not enough disk space"
-        exit 1
-    }
-
-    Write-Host "Downloading Visual Studio 2017 build tools: " -NoNewline
-    Invoke-WebRequest -Uri "$VS_BLD_TOOLS" -OutFile "$env:TEMP\vs_buildtools.exe"
-    if ( Test-Path -Path "$env:TEMP\vs_buildtools.exe" ) {
-        Write-Host "Success" -ForegroundColor Green
-    } else {
-        Write-Host "Failed" -ForegroundColor Red
-        exit 1
-    }
-
-    Write-Host "Creating Layout for Visual Studio 2017 build tools: " -NoNewline
-    if ( ! (Test-Path -Path "$($env:TEMP)\build_tools") ) {
-        New-Item -Path "$($env:TEMP)\build_tools" -ItemType Directory | Out-Null
-    }
-
-    Start-Process -FilePath "$env:TEMP\vs_buildtools.exe" `
-                  -ArgumentList "--layout `"$env:TEMP\build_tools`"", `
-                                "--add Microsoft.VisualStudio.Workload.MSBuildTools", `
-                                "--add Microsoft.VisualStudio.Workload.VCTools", `
-                                "--add Microsoft.VisualStudio.Component.Windows81SDK", `
-                                "--add Microsoft.VisualStudio.Component.Windows10SDK.17763", `
-                                "--add Microsoft.VisualStudio.Component.VC.140", `
-                                "--add Microsoft.Component.VC.Runtime.UCRTSDK", `
-                                "--lang en-US", `
-                                "--includeRecommended", `
-                                "--quiet", `
-                                "--wait" `
-                  -Wait -WindowStyle Hidden
-    if ( Test-Path -Path "$env:TEMP\build_tools\vs_buildtools.exe" ) {
-        Write-Host "Success" -ForegroundColor Green
-    } else {
-        Write-Host "Failed" -ForegroundColor Red
-        exit 1
-    }
-
-    # Serial: 28cc3a25bfba44ac449a9b586b4339a
-    # Hash: 3b1efd3a66ea28b16697394703a72ca340a05bd5
-    if (! (Test-Path -Path Cert:\LocalMachine\Root\3b1efd3a66ea28b16697394703a72ca340a05bd5) ) {
-        Write-Host "Installing Certificate Sign Root Certificate: " -NoNewLine
-        Start-Process -FilePath "certutil" `
-                      -ArgumentList "-addstore", `
-                                    "Root", `
-                                    "$($env:TEMP)\build_tools\certificates\manifestCounterSignRootCertificate.cer" `
-                      -Wait -WindowStyle Hidden
-        if ( Test-Path -Path Cert:\LocalMachine\Root\3b1efd3a66ea28b16697394703a72ca340a05bd5 ) {
-            Write-Host "Success" -ForegroundColor Green
-        } else {
-            Write-Host "Failed" -ForegroundColor Yellow
-        }
-    }
-
-    # Serial: 3f8bc8b5fc9fb29643b569d66c42e144
-    # Hash: 8f43288ad272f3103b6fb1428485ea3014c0bcfe
-    if (! (Test-Path -Path Cert:\LocalMachine\Root\8f43288ad272f3103b6fb1428485ea3014c0bcfe) ) {
-        Write-Host "Installing Certificate Root Certificate: " -NoNewLine
-        Start-Process -FilePath "certutil" `
-                  -ArgumentList "-addstore", `
-                                "Root", `
-                                "$($env:TEMP)\build_tools\certificates\manifestRootCertificate.cer" `
-                  -Wait -WindowStyle Hidden
-        if ( Test-Path -Path Cert:\LocalMachine\Root\8f43288ad272f3103b6fb1428485ea3014c0bcfe ) {
-            Write-Host "Success" -ForegroundColor Green
-        } else {
-            Write-Host "Failed" -ForegroundColor Yellow
-        }
-    }
-
-    Write-Host "Installing Visual Studio 2017 build tools: " -NoNewline
-    Start-Process -FilePath "$env:TEMP\build_tools\vs_setup.exe" `
-                  -ArgumentList "--wait", "--noweb", "--quiet" `
-                  -Wait
-    @($VS_CL_BIN, $MSBUILD_BIN, $WIN10_SDK_RC) | ForEach-Object {
-        if ( ! (Test-Path -Path $_) ) {
-            Write-Host "Failed" -ForegroundColor Red
-            exit 1
-        }
-    }
-    Write-Host "Success" -ForegroundColor Green
-} else {
-    Write-Host "Success" -ForegroundColor Green
-}
-
-#-------------------------------------------------------------------------------
-# Finished
-#-------------------------------------------------------------------------------
-Write-Host $("-" * 80)
-Write-Host "Install Visual Studio Build Tools Completed" -ForegroundColor Cyan
-Write-Host $("=" * 80)