saltstack · dwoz · Feb 27, 2025 · Feb 22, 2025 · Feb 22, 2025 · Feb 22, 2025
diff --git a/.github/workflows/build-native-action.yml b/.github/workflows/build-native-action.yml
@@ -40,6 +40,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
       - name: Install Dependencies
         run: |
           sudo apt-get update
@@ -67,10 +72,10 @@ jobs:
         run: |
           venv/bin/python3 -m relenv build --arch=${{ matrix.target }} --python=${{ matrix.version }}
 
-     # - name: Verify Build
-     #   if: ${{ matrix.host == matrix.target }}
-     #   run: |
-     #     venv/bin/python3 -m nox -e tests -- -s tests/test_verify_build.py
+      - name: Verify Build
+        if: ${{ matrix.host == matrix.target }}
+        run: |
+          venv/bin/python3 -m nox -e tests -- -s tests/test_verify_build.py
 
       - name: Linux Logs
         uses: actions/upload-artifact@v4
@@ -91,7 +96,7 @@ jobs:
   build_macos_12_x86_64:
     name: "Python macOS"
 
-    runs-on: macos-12
+    runs-on: macos-13
 
     strategy:
       fail-fast: false
@@ -110,22 +115,23 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Install nox
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Show environment
         run: |
-          pip3 install nox
+          env
 
-      - name: Uninstall gettext
+      - name: Install nox
         run: |
-          brew uninstall --ignore-dependencies gettext
+          pip3 install nox
 
       - name: Build
         run: |
           python3 -m relenv build --python=${{ matrix.version }}
 
-      - name: Re-install gettext
-        run: |
-          brew install gettext
-
       - name: Verify Build
         run: |
           python3 -m nox -e tests -- tests/test_verify_build.py
@@ -148,7 +154,7 @@ jobs:
   build_macos_13_arm64:
     name: "Python macOS"
 
-    runs-on: macos-13-xlarge
+    runs-on: macos-15
 
     strategy:
       fail-fast: false
@@ -167,22 +173,23 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Install nox
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Show environment
         run: |
-          brew install nox
+          env
 
-      - name: Uninstall gettext
+      - name: Install nox
         run: |
-          brew uninstall --ignore-dependencies gettext
+          brew install nox
 
       - name: Build
         run: |
           python3 -m relenv build --python=${{ matrix.version }}
 
-      - name: Re-install gettext
-        run: |
-          brew install gettext
-
       - name: Verify Build
         run: |
           nox -e tests -- tests/test_verify_build.py
@@ -224,6 +231,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
       - name: Install VS Build Tools
         run: |
           relenv/_scripts/install_vc_build.ps1
@@ -235,13 +247,13 @@ jobs:
       - name: Fetch Native Build
         if: ${{ matrix.arch != 'amd64' }}
         env:
-          RELENV_FETCH_VERSION: 0.13.4
+          RELENV_FETCH_VERSION: 0.18.0
         run: |
-          python3 -m relenv fetch --python=3.10.12
+          python3 -m relenv fetch --python=3.10.15
 
       - name: Build Python with Relenv
         env:
-          RELENV_NATIVE_PY_VERSION: 3.10.12
+          RELENV_NATIVE_PY_VERSION: 3.10.15
         run: |
           python -m relenv build --no-pretty --arch=${{ matrix.arch }} --python=${{ matrix.version }}
 

diff --git a/.github/workflows/pre-commit-action.yml b/.github/workflows/pre-commit-action.yml
@@ -16,6 +16,11 @@ jobs:
 
     steps:
 
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
       - name: Install System Deps
         run: |
           sudo apt-get update

diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
@@ -15,8 +15,8 @@ jobs:
       matrix:
         runs-on:
           - ubuntu-latest
-          - macos-12
-          - macos-13-xlarge
+          - macos-13
+          - macos-15
           - windows-latest
 
     name: Unit Test ${{ matrix.runs-on }}

diff --git a/.pre-commit-hooks/copyright_headers.py b/.pre-commit-hooks/copyright_headers.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2021-2024 VMware, Inc.
+# Copyright 2025 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 # pylint: disable=invalid-name,missing-module-docstring,missing-function-docstring
@@ -11,9 +11,9 @@
 
 CODE_ROOT = pathlib.Path(__file__).resolve().parent.parent
 SPDX_HEADER = "# SPDX-License-Identifier: Apache-2.0"
-COPYRIGHT_HEADER = "# Copyright {year} VMware, Inc."
+COPYRIGHT_HEADER = "# Copyright {year} Broadcom."
 COPYRIGHT_REGEX = re.compile(
-    r"# Copyright (?:(?P<start_year>[0-9]{4})(?:-(?P<cur_year>[0-9]{4}))?) VMware, Inc\."
+    r"# Copyright (?:(?P<start_year>[0-9]{4})(?:-(?P<cur_year>[0-9]{4}))?) Broadcom\."
 )
 SPDX_REGEX = re.compile(r"# SPDX-License-Identifier:.*")
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+0.18.1
+======
+
+* Update openssl to 3.2.4
+* Update libffi to 3.4.7
+
 0.18.0
 ======
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2022-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 
 # Configuration file for the Sphinx documentation builder.
@@ -21,7 +21,7 @@
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
 project = "Relenv"
-copyright = "2022 VMWare, Inc."
+copyright = "2022-2025 Broadcom."
 author = "Daniel A. Wozniak"
 
 # -- General configuration ---------------------------------------------------

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,4 +1,4 @@
-# Copyright 2022 VMware, Inc.
+# Copyright 2022-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 
 [build-system]

diff --git a/relenv/__init__.py b/relenv/__init__.py
@@ -1,3 +1,3 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 from relenv.common import __version__
diff --git a/relenv/__main__.py b/relenv/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2023-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 The entrypoint into relenv.

diff --git a/relenv/build/__init__.py b/relenv/build/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2022-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 The ``relenv build`` command.

diff --git a/relenv/build/common.py b/relenv/build/common.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2022-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 Build process common methods.

diff --git a/relenv/build/darwin.py b/relenv/build/darwin.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 The darwin build process.
@@ -79,8 +79,8 @@ def build_python(env, dirs, logfp):
     build_func=build_openssl,
     download={
         "url": "https://github.com/openssl/openssl/releases/download/openssl-{version}/openssl-{version}.tar.gz",
-        "version": "3.2.3",
-        "checksum": "1c04294b2493a868ac5f65d166c29625181a31ed",
+        "version": "3.2.4",
+        "checksum": "2247802a1193c0f8eb41c870e8de45a2241422d5",
     },
 )
 

diff --git a/relenv/build/linux.py b/relenv/build/linux.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 The linux build process.
@@ -452,8 +452,8 @@ def build_python(env, dirs, logfp):
     download={
         "url": "https://github.com/openssl/openssl/releases/download/openssl-{version}/openssl-{version}.tar.gz",
         "fallback_url": "https://woz.io/relenv/dependencies/openssl-{version}.tar.gz",
-        "version": "3.2.3",
-        "checksum": "1c04294b2493a868ac5f65d166c29625181a31ed",
+        "version": "3.2.4",
+        "checksum": "2247802a1193c0f8eb41c870e8de45a2241422d5",
         "checkfunc": tarball_version,
         "checkurl": "https://www.openssl.org/source/",
     },
@@ -555,8 +555,8 @@ def build_python(env, dirs, logfp):
     download={
         "url": "https://github.com/libffi/libffi/releases/download/v{version}/libffi-{version}.tar.gz",
         "fallback_url": "https://woz.io/relenv/dependencies/libffi-{version}.tar.gz",
-        "version": "3.4.6",
-        "checksum": "19251dfee520dff42acefe36bfe76d7168071e01",
+        "version": "3.4.7",
+        "checksum": "b07136211f47fa30c0512ebd7484fde724978d99",
         "checkfunc": github_version,
         "checkurl": "https://github.com/libffi/libffi/releases/",
     },

diff --git a/relenv/build/windows.py b/relenv/build/windows.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2022-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 The windows build process.

diff --git a/relenv/buildenv.py b/relenv/buildenv.py
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 VMware, Inc.
+# Copyright 2023-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Helper for building libraries to install into a relenv environment.

diff --git a/relenv/check.py b/relenv/check.py
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 VMware, Inc.
+# Copyright 2025 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Check the integrety of a relenv environment.

diff --git a/relenv/common.py b/relenv/common.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2023-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 Common classes and values used around relenv.
@@ -18,7 +18,7 @@
 import time
 
 # relenv package version
-__version__ = "0.18.0"
+__version__ = "0.18.1"
 
 MODULE_DIR = pathlib.Path(__file__).resolve().parent
 

diff --git a/relenv/create.py b/relenv/create.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2022-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 The ``relenv create`` command.

diff --git a/relenv/fetch.py b/relenv/fetch.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2022-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 The ``relenv fetch`` command.

diff --git a/relenv/pyproject.toml b/relenv/pyproject.toml
diff --git a/relenv/relocate.py b/relenv/relocate.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2022-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 A script to ensure the proper rpaths are in place for the relenv environment.

diff --git a/relenv/runtime.py b/relenv/runtime.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2022-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 This code is run when initializing the python interperter in a Relenv environment.

diff --git a/relenv/toolchain.py b/relenv/toolchain.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VMware, Inc.
+# Copyright 2022-2025 Broadcom.
 # SPDX-License-Identifier: Apache-2
 """
 The ``relenv toolchain`` command.