Merge branch 'spack:develop' into develop

Author: cyrush

.ci/env

@@ -1,2 +1,2 @@
-SPACK_CHECKOUT_VERSION=7a17cfcb7affbff3dd84620ee57ead9a0510ff16
+SPACK_CHECKOUT_VERSION=84cb7ff86b42e7fa45476750b6729144c58f70dc
 SPACK_CHECKOUT_REPO=spack/spack

.ci/gitlab/.gitlab-ci.yml

@@ -46,6 +46,14 @@ default:
     PIPELINE_MIRROR_TEMPLATE: "multi-src-mirrors.yaml.in"
     OIDC_TOKEN_AUDIENCE: "pr_binary_mirror"
 
+.package_on_change: &package_on_change
+    paths:
+      - .ci/env
+      - .ci/gitlab/*
+      - repos/spack_repo/*
+      - stacks/$SPACK_CI_STACK_NAME/*
+    compare_to: HEAD~1
+
   ########################################
 # Job templates
 ########################################
@@ -83,6 +91,7 @@ default:
       variables:
         <<: *common_pr_vars
         SPACK_PRUNE_UNTOUCHED: "True"
+      changes: *package_on_change
 
     - if: $CI_COMMIT_REF_NAME =~ /^pr[\d]+_.*$/ && $CI_PROJECT_NAME == "spack"
       # Pipelines on PR branches rebuild only what's missing, and do extra pruning
@@ -116,6 +125,7 @@ default:
       --artifacts-root "${CI_PROJECT_DIR}/jobs_scratch_dir/${SPACK_CI_STACK_NAME}"
       --output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/${SPACK_CI_STACK_NAME}/cloud-ci-pipeline.yml"
   artifacts:
+    when: always
     paths:
       - "${CI_PROJECT_DIR}/jobs_scratch_dir"
       - "${CI_PROJECT_DIR}/jobs_scratch_dir/${SPACK_CI_STACK_NAME}"
@@ -248,6 +258,30 @@ dotenv:
   - python3 write_dotenv.py .ci/env
   - cat env
 
+force_pipeline_status:
+  rules:
+    - if: $CI_COMMIT_REF_NAME =~ /^pr[\d]+_.*$/ && $CI_PROJECT_NAME == "spack-packages"
+      changes: *package_on_change
+      when: never
+    - if: $CI_PROJECT_NAME == "spack"
+      when: never
+    - if: $CI_COMMIT_REF_NAME =~ /^pr[\d]+_.*$/
+      when: always
+    - when: never
+  stage: generate
+  tags: ["spack", "service_noop"]
+  retry: 0
+  allow_failure: true
+  image: busybox@sha256:37f7b378a29ceb4c551b1b5582e27747b855bbfaa73fa11914fe0df028dc581f
+  variables:
+    CI_OIDC_REQUIRED: 0
+    GIT_STRATEGY: "none"
+    CI_JOB_SIZE: "small"
+    KUBERNETES_CPU_REQUEST: "100m"
+    KUBERNETES_MEMORY_REQUEST: "5M"
+  script:
+  - echo "This job is a placeholder job to ensure a pipeline status is posted even if no jobs are run"
+
 ########################################
 # TEMPLATE FOR ADDING ANOTHER PIPELINE
 ########################################
@@ -337,7 +371,7 @@ e4s-neoverse-v2-build:
 
 e4s-rocm-external-generate:
   extends: [ ".e4s-rocm-external", ".generate-x86_64"]
-  image: ghcr.io/spack/e4s-rocm-base-x86_64:v7.2.0-1772831027
+  image: ghcr.io/spack/e4s-rocm-base-x86_64:v7.2.3-1778518886
 
 e4s-rocm-external-build:
   extends: [ ".e4s-rocm-external", ".build" ]
@@ -359,7 +393,7 @@ e4s-rocm-external-build:
 
 e4s-oneapi-generate:
   extends: [ ".e4s-oneapi", ".generate-x86_64"]
-  image: ghcr.io/spack/e4s-oneapi-base-x86_64:v2025.3-1772472165
+  image: ghcr.io/spack/e4s-oneapi-base-x86_64:v2025.3-1777667538
 
 e4s-oneapi-build:
   extends: [ ".e4s-oneapi", ".build" ]

.ci/style_check.sh

@@ -4,31 +4,36 @@ die() { printf "%b%s%b\n" "\033[31;1m==> " "$1" "\033[0m" >&2; exit 1; }
 python_files() { git diff --name-only --diff-filter=ACMR -z "$ref" | grep -zE '\.pyi?$'; }
 
 ref="develop"
-flags="--check --diff"
+format_flags="--diff"
+check_flags="--no-fix"
 
 while [ $# -gt 0 ]; do
   case "$1" in
     --help|-h)
       echo "$0 [--help] [--fix] [ref]"
       exit 0
       ;;
-    --fix) flags= ;;
+    --fix)
+      format_flags=""
+      check_flags="--fix"
+      ;;
     -*) die "unknown option: $1" ;;
     *) ref="$1" ;;
   esac
   shift
 done
+
+# Ref should always be the merge-base to avoid picking up extra files
+ref=$(git merge-base $ref HEAD)
+
 if ! python_files > /dev/null; then
   info "skipping style checks: no Python files changed"
   exit 0
 fi
-[ -d "spack-core" ] ||  die "no 'spack-core' dir found: should be a clone of 'spack/spack'"
 python_files | xargs -0 printf "%s\n"
-info "running flake8"
-python_files | xargs -0 -n 100 flake8 || error=1
-info "running isort"
-python_files | xargs -0 -n 100 isort $flags || error=1
-info "running black"
-python_files | xargs -0 -n 100 black --color $flags || error=1
+info "running ruff format"
+python_files | xargs -0 -n 100 ruff format $format_flags || error=1
+info "running ruff check"
+python_files | xargs -0 -n 100 ruff check $check_flags || error=1
 [ "$error" = "1" ] && die "style checks failed"
 info "style checks passed"

.flake8

@@ -25,8 +25,8 @@ jobs:
       run:
         shell: ${{ matrix.system.shell }}
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
-    - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
+    - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
       with:
         python-version: ${{inputs.python_version}}
     - name: Install Python packages

.github/workflows/audit.yaml

@@ -8,6 +8,10 @@ on:
       - develop
       - releases/**
     paths:
+      # CI
+      - '.ci/**'
+      - '.github/**'
+      # Build Systems
       - 'repos/spack_repo/builtin/build_systems/**'
       # Clingo
       - 'repos/spack_repo/builtin/packages/clingo/**'
@@ -22,13 +26,11 @@ on:
       # Dev dependencies
       - 'repos/spack_repo/builtin/packages/python/**'
       - 'repos/spack_repo/builtin/packages/python-venv/**'
-      - 'repos/spack_repo/builtin/packages/py-wheel/**'
-      - 'repos/spack_repo/builtin/packages/py-setuptools/**'
-      - 'repos/spack_repo/builtin/packages/py-black/**'
-      - 'repos/spack_repo/builtin/packages/py-pytest/**'
-      - 'repos/spack_repo/builtin/packages/py-flake8/**'
-      - 'repos/spack_repo/builtin/packages/py-isort/**'
       - 'repos/spack_repo/builtin/packages/py-mypy/**'
+      - 'repos/spack_repo/builtin/packages/py-pytest/**'
+      - 'repos/spack_repo/builtin/packages/py-ruff/**'
+      - 'repos/spack_repo/builtin/packages/py-setuptools/**'
+      - 'repos/spack_repo/builtin/packages/py-wheel/**'
 
   schedule:
     # nightly at 5:16 AM
@@ -64,7 +66,7 @@ jobs:
               make patch unzip which xz python3 python3-devel tree \
               cmake bison
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
         with:
           fetch-depth: 0
       - uses: ./.github/actions/checkout-spack
@@ -91,10 +93,10 @@ jobs:
         run: |
           brew install bison tree
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
+      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
         with:
           python-version: "3.12"
       - uses: ./.github/actions/checkout-spack
@@ -124,7 +126,7 @@ jobs:
             sudo rm $(command -v gpg gpg2 patchelf)
           done
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
         with:
           fetch-depth: 0
       - uses: ./.github/actions/checkout-spack
@@ -143,10 +145,10 @@ jobs:
     runs-on: "windows-latest"
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
+      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
         with:
           python-version: "3.12"
       # TODO: Check why this is needed here and not in spack/spack
@@ -182,7 +184,7 @@ jobs:
               bzip2 curl file gcc-c++ gcc gcc-gfortran git gnupg2 gzip \
               make patch tcl unzip which xz
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
         with:
           fetch-depth: 0
       - uses: ./.github/actions/checkout-spack
@@ -194,4 +196,4 @@ jobs:
           spack debug report
           spack -d bootstrap now --dev
           source .ci/env
-          spack -d style -b ${SPACK_CHECKOUT_VERSION} -t black
+          spack -d style -b ${SPACK_CHECKOUT_VERSION} -t ruff-format

.github/workflows/bootstrap.yml

@@ -24,12 +24,12 @@ jobs:
       core: ${{ steps.filter.outputs.core }}
       packages: ${{ steps.filter.outputs.packages }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
         if: ${{ github.event_name == 'push' || github.event_name == 'merge_group' }}
         with:
           fetch-depth: 0
             # For pull requests it's not necessary to checkout the code
-      - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d
+      - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d  # v4.0.1
         id: filter
         with:
           # For merge group events, compare against the target branch (main)

.github/workflows/ci.yaml

@@ -17,8 +17,8 @@ jobs:
   validate:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
-    - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
+    - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
       with:
         python-version: '3.13'
     - name: Install Python Packages
@@ -32,19 +32,15 @@ jobs:
   style:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
       with:
         fetch-depth: 2
-    - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
+    - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
       with:
         python-version: '3.13'
     - name: Install Python packages
       run: |
         pip install -r .github/workflows/requirements/style/requirements.txt
-    - uses: ./.github/actions/checkout-spack
-      with:
-        # This path must match the path in pyprojects.toml
-        path: spack-core
     - name: Run style tests
       run: .ci/style_check.sh HEAD^
     # todo: license check
@@ -62,7 +58,7 @@ jobs:
       ${{ inputs.with_packages == 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
       with:
         # Depth 2 is required for this check
         fetch-depth: 2
@@ -81,7 +77,7 @@ jobs:
       image: ghcr.io/spack/all-pythons:2025-10-10
 
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
         with:
           fetch-depth: 0
       - uses: ./.github/actions/checkout-spack

.github/workflows/prechecks.yml

@@ -1,8 +1,6 @@
-black==25.1.0
 clingo==5.8.0
-flake8==7.2.0
-isort==6.0.1
 mypy==1.15.0
+pylint==3.3.7
+ruff==0.15.11
 types-six==1.17.0.20250515
 vermin==1.8.0
-pylint==3.3.7

.github/workflows/requirements/style/requirements.txt

@@ -9,7 +9,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f
+      - uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899  # v10.3.0
         with:
           # Issues configuration
           stale-issue-message: >