Fixing workflows

Author: ciaranra

.github/workflows/python-release.yml

@@ -1,7 +1,7 @@
 name: Python Artifacts
 
 env:
-  TRIGGER_ON_PR_PUSH: false  # Set to true to enable triggers on PR pushes
+  TRIGGER_ON_PR_PUSH: true  # Set to true to enable triggers on PR pushes
   PYTHON_VERSION: '3.10'
 
 on:
@@ -66,20 +66,13 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v4
-        with:
-          enable-cache: true
-          ignore-nothing-to-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/requirements*.txt
-            **/uv.lock
-
       - name: Remove conflicting README.md
         run: |
           if [ -f crates/pecos-python/README.md ]; then
             mv crates/pecos-python/README.md crates/pecos-python/README.md.bak
+            echo "Moved conflicting README.md to README.md.bak"
+          else
+            echo "No conflicting README.md found"
           fi
 
       - name: Build pecos-rslib SDist
@@ -88,20 +81,21 @@ jobs:
           command: sdist
           args: --out dist
           working-directory: python/pecos-rslib
-          manylinux: auto
 
       - name: Restore README.md
         if: always()
         run: |
           if [ -f crates/pecos-python/README.md.bak ]; then
             mv crates/pecos-python/README.md.bak crates/pecos-python/README.md
+            echo "Restored README.md from backup"
+          else
+            echo "No README.md backup found"
           fi
 
-      - name: Install and test pecos-rslib SDist
+      - name: Test pecos-rslib SDist
         run: |
-          uv sync --project .
-          uv pip install --force-reinstall python/pecos-rslib/dist/*.tar.gz
-          uv run python -c 'import pecos_rslib; print(pecos_rslib.__version__)'
+          pip install --force-reinstall --verbose python/pecos-rslib/dist/*.tar.gz
+          python -c 'import pecos_rslib; print(pecos_rslib.__version__)'
 
       - name: Upload pecos-rslib SDist
         uses: actions/upload-artifact@v4
@@ -136,20 +130,13 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v4
-        with:
-          enable-cache: true
-          ignore-nothing-to-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/requirements*.txt
-            **/uv.lock
-
       - name: Remove conflicting README.md
         run: |
           if [ -f crates/pecos-python/README.md ]; then
             mv crates/pecos-python/README.md crates/pecos-python/README.md.bak
+            echo "Moved conflicting README.md to README.md.bak"
+          else
+            echo "No conflicting README.md found"
           fi
 
       - name: Build wheel
@@ -166,14 +153,16 @@ jobs:
         run: |
           if [ -f crates/pecos-python/README.md.bak ]; then
             mv crates/pecos-python/README.md.bak crates/pecos-python/README.md
+            echo "Restored README.md from backup"
+          else
+            echo "No README.md backup found"
           fi
 
       - name: Test wheel
         if: ${{ !(matrix.architecture == 'x86_64' && matrix.os == 'macos-latest') && matrix.architecture != 'aarch64' }}
         run: |
-          uv sync --project .
-          uv pip install --force-reinstall python/pecos-rslib/dist/*.whl
-          uv run python -c 'import pecos_rslib; print(pecos_rslib.__version__)'
+          pip install --force-reinstall --verbose python/pecos-rslib/dist/*.whl
+          python -c 'import pecos_rslib; print(pecos_rslib.__version__)'
 
       - name: Upload wheel
         uses: actions/upload-artifact@v4
@@ -198,38 +187,29 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v4
-        with:
-          enable-cache: true
-          ignore-nothing-to-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/requirements*.txt
-            **/uv.lock
-
       - name: Download pecos-rslib wheel
         uses: actions/download-artifact@v4
         with:
           name: wheel-pecos-rslib-ubuntu-latest-x86_64-py${{ env.PYTHON_VERSION }}
           path: ./pecos-rslib-wheel
 
-      - name: Setup environment and install dependencies
+      - name: Install pecos-rslib
+        run: pip install ./pecos-rslib-wheel/*.whl
+
+      - name: Install build dependencies
         run: |
-          uv sync --project .
-          uv pip install ./pecos-rslib-wheel/*.whl
-          uv pip install build
+          python -m pip install --upgrade pip
+          pip install build
 
       - name: Build quantum-pecos SDist
         run: |
           cd python/quantum-pecos
-          uv pip install --system build
           python -m build --sdist --outdir dist
 
       - name: Test quantum-pecos SDist
         run: |
-          uv pip install python/quantum-pecos/dist/*.tar.gz
-          uv run python -c 'import pecos; print(pecos.__version__)'
+          pip install python/quantum-pecos/dist/*.tar.gz
+          python -c 'import pecos; print(pecos.__version__)'
 
       - name: Upload quantum-pecos SDist
         uses: actions/upload-artifact@v4
@@ -253,30 +233,24 @@ jobs:
         with:
           ref: ${{ inputs.sha || github.sha }}
 
-      - name: Set up Python
+      - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v4
-        with:
-          enable-cache: true
-          ignore-nothing-to-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/requirements*.txt
-            **/uv.lock
-
       - name: Download pecos-rslib wheel
         uses: actions/download-artifact@v4
         with:
           name: wheel-pecos-rslib-ubuntu-latest-x86_64-py${{ matrix.python-version }}
           path: ./pecos-rslib-wheel
 
-      - name: Setup environment and install dependencies
+      - name: Install pecos-rslib
+        run: pip install ./pecos-rslib-wheel/*.whl
+
+      - name: Install build dependencies
         run: |
-          uv pip install --system ./pecos-rslib-wheel/*.whl build
+          python -m pip install --upgrade pip
+          pip install build
 
       - name: Build quantum-pecos wheel
         run: |
@@ -285,9 +259,8 @@ jobs:
 
       - name: Test quantum-pecos wheel
         run: |
-          uv sync  # This will use the workspace config correctly
-          uv pip install python/quantum-pecos/dist/*.whl
-          uv run python -c 'import pecos; print(pecos.__version__)'
+          pip install python/quantum-pecos/dist/*.whl
+          python -c 'import pecos; print(pecos.__version__)'
 
       - name: Upload quantum-pecos wheel
         uses: actions/upload-artifact@v4

.github/workflows/rust-test.yml

@@ -1,5 +1,11 @@
 name: Rust test / linting
 
+env:
+  TRIGGER_ON_PR_PUSH: true  # Set to true to enable triggers on PR pushes
+
+  RUSTFLAGS: -C debuginfo=0
+  RUST_BACKTRACE: 1
+
 on:
   push:
     branches: [ "master", "development" ]
@@ -22,10 +28,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-env:
-  RUSTFLAGS: -C debuginfo=0
-  RUST_BACKTRACE: 1
-
 jobs:
   rust-lint:
     runs-on: ubuntu-latest
@@ -123,80 +125,95 @@ jobs:
           which llc
 
       - name: Install LLVM Tools (Windows)
+        if: matrix.os == 'windows-latest'
+        uses: KyleMayes/install-llvm-action@v2
+        with:
+          version: "14.0"
+          directory: ${{ runner.temp }}/llvm
+          env: true
+
+      - name: Setup LLVM Path (Windows)
         if: matrix.os == 'windows-latest'
         run: |
-          Write-Host "==== Installing LLVM with Chocolatey to specific location ===="
-          # Create a dedicated LLVM installation directory
-          mkdir -Force C:\llvm_install
+          Write-Host "Setting up LLVM in PATH..."
 
-          # Install LLVM to the specific directory
-          choco install llvm --params "/InstallDir:C:\llvm_install" --yes
+          # Display LLVM_PATH environment variable set by the action
+          Write-Host "LLVM_PATH environment variable: $env:LLVM_PATH"
 
-          Write-Host "==== Checking LLVM Installation ===="
-          # Check if LLVM was installed to the expected location
-          $expectedLlcPath = "C:\llvm_install\bin\llc.exe"
+          # Add LLVM bin directory to PATH for this and subsequent steps
+          $llvmBinDir = Join-Path -Path $env:LLVM_PATH -ChildPath "bin"
 
-          if (Test-Path $expectedLlcPath) {
-            Write-Host "Found llc.exe at expected location: $expectedLlcPath"
-            $llvmPath = $expectedLlcPath
-          } else {
-            # Fall back to checking common locations if the specified installation didn't work
-            Write-Host "llc.exe not found at expected location, checking common locations..."
-
-            # Try to find llc in PATH first
-            $llcCmd = Get-Command llc -ErrorAction SilentlyContinue
-            if ($llcCmd) {
-              $llvmPath = $llcCmd.Source
-              Write-Host "Found llc.exe in PATH at: $llvmPath"
-            } else {
-              # Check other common locations
-              $possiblePaths = @(
-                "C:\Program Files\LLVM\bin\llc.exe",
-                "C:\Program Files (x86)\LLVM\bin\llc.exe",
-                "C:\ProgramData\chocolatey\bin\llc.exe",
-                "C:\ProgramData\chocolatey\lib\llvm\tools\LLVM\bin\llc.exe"
-              )
-
-              foreach ($path in $possiblePaths) {
-                Write-Host "Checking $path..."
-                if (Test-Path $path) {
-                  $llvmPath = $path
-                  Write-Host "Found llc.exe at: $path"
-                  break
-                }
-              }
+          # Verify the directory exists
+          if (Test-Path -Path $llvmBinDir) {
+            Write-Host "LLVM bin directory exists at $llvmBinDir"
+            # List contents to verify what's available
+            Write-Host "LLVM bin directory contents:"
+            Get-ChildItem -Path $llvmBinDir | Select-Object -First 10 | ForEach-Object {
+              Write-Host "  $($_.Name)"
             }
 
-            # If still not found, search Chocolatey directories as last resort
-            if (-not $llvmPath) {
-              Write-Host "Searching in Chocolatey directories..."
-              $chocoResults = Get-ChildItem -Path "C:\ProgramData\chocolatey" -Filter "llc.exe" -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1
+            # Add to PATH
+            echo "$llvmBinDir" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+            $env:PATH = "$llvmBinDir;$env:PATH"
 
-              if ($chocoResults) {
-                $llvmPath = $chocoResults.FullName
-                Write-Host "Found llc.exe at: $llvmPath"
-              } else {
-                throw "Could not locate llc.exe. LLVM installation may have failed."
+            # Verify llc is available
+            $llcPath = Join-Path -Path $llvmBinDir -ChildPath "llc.exe"
+            if (Test-Path -Path $llcPath) {
+              Write-Host "Found llc.exe at $llcPath"
+              Write-Host "Testing llc.exe:"
+              & "$llcPath" --version
+            } else {
+              Write-Host "WARNING: llc.exe not found at $llcPath"
+              # Display all exe files to help diagnose what might be available
+              Write-Host "Available executables in bin directory:"
+              Get-ChildItem -Path $llvmBinDir -Filter "*.exe" | ForEach-Object {
+                Write-Host "  $($_.Name)"
               }
             }
+          } else {
+            Write-Host "ERROR: LLVM bin directory does not exist at $llvmBinDir"
+            Write-Host "LLVM_PATH contents:"
+            Get-ChildItem -Path $env:LLVM_PATH | ForEach-Object {
+              Write-Host "  $($_.Name)"
+            }
+            exit 1
           }
 
-          Write-Host "==== LLVM Configuration ===="
-          $llvmBinDir = Split-Path -Parent $llvmPath
-          Write-Host "LLVM bin directory: $llvmBinDir"
-          Write-Host "Files in LLVM bin directory: $(Get-ChildItem -Path $llvmBinDir -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Name)"
-
-          # Add LLVM bin to PATH
-          Write-Host "Adding LLVM bin directory to PATH: $llvmBinDir"
-          echo $llvmBinDir | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          $env:Path += ";$llvmBinDir"
-
-          # Verify by running llc
-          Write-Host "Running llc version check:"
-          & $llvmPath --version
+      - name: Verify LLVM PATH (Windows)
+        if: matrix.os == 'windows-latest'
+        run: |
+          Write-Host "PATH environment variable:"
+          $env:PATH -split ';' | ForEach-Object { Write-Host "  $_" }
+
+          Write-Host "Checking for llc command:"
+          try {
+            $llcCommand = Get-Command llc -ErrorAction Stop
+            Write-Host "Found llc at location $($llcCommand.Source)"
+            & $llcCommand.Source --version
+          } catch {
+            Write-Host "llc command not found in PATH. This may cause tests to fail."
+
+            # Look for llc.exe in LLVM_PATH
+            if ($env:LLVM_PATH) {
+              $llcPath = Join-Path -Path $env:LLVM_PATH -ChildPath "bin\llc.exe"
+              if (Test-Path -Path $llcPath) {
+                Write-Host "Found llc.exe at $llcPath, but it's not in PATH. Adding it now."
+                $llvmBinDir = Join-Path -Path $env:LLVM_PATH -ChildPath "bin"
+                $env:PATH = "$llvmBinDir;$env:PATH"
+                echo "PATH=$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+              }
+            }
+          }
 
       - name: Compile tests
         run: cargo test --no-run
 
-      - name: Run tests
+      - name: Run tests (Linux/macOS)
+        if: matrix.os != 'windows-latest'
         run: cargo test
+
+      - name: Run tests (Windows)
+        if: matrix.os == 'windows-latest'
+        run: |
+          # Run all tests with our trait re-export fix
+          cargo test --workspace --exclude pecos-rslib

.github/workflows/rust-version-consistency.yml

@@ -1,5 +1,7 @@
 name: Rust Version Consistency Check
 
+# bump
+
 on:
   push:
     paths: