Use ppbt toolchain when building.

.github/workflows/build-cross-action.yml

@@ -55,7 +55,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential bison python3-all patchelf swig python3-virtualenv
           virtualenv venv
-          venv/bin/pip3 install nox
+          env/bin/python3 -m pip install nox ppbt
 
       - name: Python Version
         run: |

.github/workflows/build-native-action.yml

@@ -50,27 +50,16 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential bison python3-all patchelf swig cmake libldap2-dev libsasl2-dev ldap-utils libssl-dev pkg-config libvirt-dev default-libmysqlclient-dev python3-virtualenv
           virtualenv venv
-          venv/bin/pip3 install nox
+          venv/bin/python3 -m pip install nox ppbt
 
       - name: Python Version
         run: |
           venv/bin/python3 --version
           venv/bin/python3 -c 'import os; print(os.name)'
 
-      - name: Download Toolchain Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: toolchain-${{ matrix.host }}-${{ matrix.target }}-linux-gnu.tar.xz
-          path: .
-
-      - name: Extract Toolchain Artifact
-        run: |
-          mkdir -p toolchain
-          tar -C toolchain -xvf toolchain-${{ matrix.host }}-${{ matrix.target }}-linux-gnu.tar.xz
-
       - name: Build
         run: |
-          venv/bin/python3 -m relenv build --arch=${{ matrix.target }} --python=${{ matrix.version }}
+          venv/bin/python3 -m relenv build --no-pretty --arch=${{ matrix.target }} --python=${{ matrix.version }}
 
       - name: Verify Build
         if: ${{ matrix.host == matrix.target }}
@@ -87,7 +76,7 @@ jobs:
 
       - name: "Upload artifact: build/${{ matrix.version }}-${{ matrix.target }}-linux-gnu.tar.xz"
         uses: actions/upload-artifact@v4
-        if: ${{ matrix.host == matrix.target  && always()}}
+        if: ${{ matrix.host == matrix.target  && always() }}
         with:
           name: ${{ matrix.version }}-${{ matrix.target }}-linux-gnu.tar.xz
           path: build/${{ matrix.version }}-${{ matrix.target }}-linux-gnu.tar.xz
@@ -130,7 +119,7 @@ jobs:
 
       - name: Build
         run: |
-          python3 -m relenv build --python=${{ matrix.version }}
+          python3 -m relenv build --no-pretty --python=${{ matrix.version }}
 
       - name: Verify Build
         run: |
@@ -188,7 +177,7 @@ jobs:
 
       - name: Build
         run: |
-          python3 -m relenv build --python=${{ matrix.version }}
+          python3 -m relenv build --no-pretty --python=${{ matrix.version }}
 
       - name: Verify Build
         run: |

.github/workflows/ci.yml

@@ -55,12 +55,6 @@ jobs:
             deleted:
               - deleted:
                 - '**'
-            toolchain:
-              - added|modified:
-                - '.github/workflows/*toolchain*.yml'
-                - 'relenv/toolchain.py'
-                - 'relenv/_toolchain/**'
-
   pre-commit:
     name: Pre-Commit
     uses: ./.github/workflows/pre-commit-action.yml
@@ -79,20 +73,11 @@ jobs:
       kind: "${{ inputs.kind }}"
       cmd: "${{ inputs.package_command }}"
 
-  toolchain:
-    name: Toolchain Builds
-    uses: ./.github/workflows/toolchain-action.yml
-    needs:
-      - get-changed-files
-    with:
-      changed-files: ${{ needs.get-changed-files.outputs.changed-files }}
-
   build-native:
     name: Python Native Builds
     uses: ./.github/workflows/build-native-action.yml
     needs:
       - get-changed-files
-      - toolchain
     with:
       changed-files: ${{ needs.get-changed-files.outputs.changed-files }}
 
@@ -103,17 +88,6 @@ jobs:
       - get-changed-files
     uses: ./.github/workflows/test-fips-action.yml
 
-  #build-cross:
-  #  name: Python Cross Builds
-  #  uses: ./.github/workflows/build-action.yml
-  #  needs:
-  #    - get-changed-files
-  #    - toolchain
-  #    - build-native
-  #  with:
-  #    changed-files: ${{ needs.get-changed-files.outputs.changed-files }}
-  #    kind: "cross"
-
   test:
     name: Test
     needs:
@@ -142,6 +116,18 @@ jobs:
   #    - test-fips
   #  secrets:
   #    PYPI_API_TOKEN: "${{ secrets.PYPI_API_TOKEN }}"
+  #
+  upload-build-artifacts:
+    name: Deploy Prebuilt Python Builds
+    if: ${{ inputs.kind == 'release' && success() }}
+    uses: ./.github/workflows/deploy-build-action.yml
+    needs:
+      - build-python-package
+      - build-native
+      - test-fips
+      #- build-cross
+    with:
+      version: "${{ needs.build-python-package.outputs.version }}"
 
   deploy-python-package:
     name: "Deploy python package"
@@ -153,6 +139,7 @@ jobs:
       - docs
       - build-python-package
       - test-fips
+      - upload-build-artifacts
     steps:
       - uses: actions/create-github-app-token@v1
         id: app-token
@@ -185,14 +172,15 @@ jobs:
     if: always()
     needs:
       - pre-commit
-      - toolchain
       - build-native
       #- build-cross
       - test
       - docs
+      - upload-build-artifacts
       - deploy-python-package
       - create-release
     steps:
+
       - name: Get workflow information
         id: get-workflow-info
         uses: technote-space/workflow-conclusion-action@v3

.github/workflows/test-fips-action.yml

@@ -27,7 +27,7 @@ jobs:
 
       - name: Install System Dependencies
         run: |
-          yum install -y openssl-fips-provider python3 python3-virtualenv git gcc
+          yum install -y openssl-fips-provider python3 python3-devel python3-virtualenv git gcc binutils glibc-devel linux-api-headers libffi-devel
 
       - uses: actions/checkout@v3
 
@@ -41,6 +41,12 @@ jobs:
         run: |
           virtualenv venv
 
+      - name: Pip debug
+        run: |
+          ./venv/bin/python3 -m pip install --upgrade pip
+          ./venv/bin/python3 -c 'import platform; print(platform.libc_ver())'
+          ./venv/bin/pip3 debug --verbose
+
       - name: Install Virtual Environment Dependencies
         run: |
           ./venv/bin/pip3 install -r requirements/tests.txt

noxfile.py

@@ -47,12 +47,6 @@ def build(session, arch):
     invoke_relenv(session, "build", f"--arch={arch}")
 
 
-@nox.session
-@nox.parametrize("arch", ("x86_64", "aarch64"))
-def toolchain(session, arch):
-    invoke_relenv(session, "toolchain", "build", f"--arch={arch}")
-
-
 # Convenience sessions
 @nox.session
 def build_x86_64(session):

relenv/__main__.py

@@ -6,7 +6,7 @@
 
 from argparse import ArgumentParser
 
-from . import build, buildenv, check, create, fetch, toolchain
+from . import build, buildenv, check, create, fetch, pyversions, toolchain
 from .common import __version__
 
 
@@ -34,6 +34,7 @@ def setup_cli():
         fetch,
         check,
         buildenv,
+        pyversions,
     ]
     for mod in modules_to_setup:
         mod.setup_parser(subparsers)
@@ -47,10 +48,9 @@ def main():
     """
     parser = setup_cli()
     args = parser.parse_args()
-    # args.func(args)
-    try:
+    if hasattr(args, "func"):
         args.func(args)
-    except AttributeError:
+    else:
         parser.print_help()
         parser.exit(1, "\nNo subcommand given...\n\n")