Merge Pull Request trilinos#13541 from trilinos/Trilinos/master_merge…

…_20241018_175856

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20241018_175856 branch to master'
PR Author: trilinos-autotester

.github/workflows/AT2.yml

@@ -5,20 +5,23 @@ on:
     types:
       - opened
       - synchronize
-  pull_request_review:
-    types: 
-      - submitted
     branches:
     - master
     - develop
   workflow_dispatch:
 
+# Cancels any in progress 'workflows' associated with this PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 # actions: write needed by skip-duplicate-actions (handled below as per OpenSSF scorecard)
 permissions: 
   contents: read
 
 jobs:
-  # Jobs depend on the output of pre-checks to run
+  # Jobs depend on the output of pre-checks to run.
+  # Cancels new workflows if prior runs were successful (same tree hash)
   pre-checks:
         runs-on: ubuntu-latest
         # actions: write needed by skip-duplicate-actions

.github/workflows/clang_format.yml

@@ -22,7 +22,7 @@ jobs:
     - run: git diff HEAD > format_patch.txt
     - run: if [ "$(cat format_patch.txt)" == "" ] ; then rm format_patch.txt ; else cat format_patch.txt; fi
 
-    - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
+    - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
       id: upload-artf
       if: ${{ hashFiles('format_patch.txt') != '' }}
       with:

.github/workflows/codeql.yml

@@ -62,7 +62,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
+      uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -85,6 +85,6 @@ jobs:
           make -j 2
       
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
+      uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/scorecards.yml

@@ -58,14 +58,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
+        uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
         with:
           sarif_file: results.sarif

.github/workflows/spack.yml

@@ -4,25 +4,25 @@ on:
     types:
       - opened
       - synchronize
-  pull_request_review:
-    types: 
-      - submitted
+  branches:
+    - master
+    - develop
   workflow_dispatch:
 
+# Cancels any in progress 'workflow' associated with this PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
 jobs:
   gcc10-openmpi416:
     permissions:
-      actions: write  # for styfle/cancel-workflow-action to cancel/stop running workflows
       contents: read  # for actions/checkout to fetch code
     runs-on: [self-hosted, gcc-10.3.0_openmpi-4.1.6]
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # 0.11.0
-        with:
-          access_token: ${{ github.token }}
       - name: Clone Trilinos
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:

cmake/tribits/CHANGELOG.md

@@ -2,6 +2,46 @@
 ChangeLog for TriBITS
 ----------------------------------------
 
+## 2024-10-08:
+
+* **Changed:** The TriBITS framework find operation for
+  Python<sup>[&dagger;](#tribits_python_support)</sup> has been changed from
+  calling `find_package(PythonInterp)` (which uses the deprecated
+  `FindPythonInterp.cmake` module) to calling `find_package(Python3)` (which
+  uses [FindPython3.cmake]).  In the process, the internal CMake cache
+  variable set by this operation was changed from `PYTHON_EXECUTABLE` to
+  `Python3_EXECUTABLE`, and TriBITS projects need make that change as well
+  when upgrading TriBITS.  (This change can be made automatically in all of
+  the project's CMake files by running the script
+  `tribits/refactoring/to-python3.sh <dir>`.)  However, backward compatibility
+  is provided for users confiugring TriBITS CMake projects which set `-D
+  PYTHON_EXECUTABLE=<path>`.  In this case, if user sets `-D
+  PYTHON_EXECUTABLE=<path>` in the cache, TriBITS will set that value `<path>`
+  to the variable `Python3_EXECUTABLE` and avoid the call to
+  `find_package(Python3)` (however, a deprecation warning we be issued by
+  default, see [tribits_deprecated()] and [adjusting CMake DEPRECATION
+  warnings]).  TriBITS project users should change to use `-D
+  Python3_EXECUTABLE=<path>` instead, or just remove setting
+  `PYTHON_EXECUTABLE` or `Python3_EXECUTABLE` altogether and just make sure
+  that the desired `python3` executable is in the path.  See issue
+  [TriBITSPub/TriBITS#610] for more details.
+
+<a name="tribits_python_support"/>&dagger; **TriBITS Python Support**: See "Find Python" at [Full Processing of TriBITS Project Files], [Python Support] and [Setting or disabling Python]
+
+[FindPython3.cmake]: https://cmake.org/cmake/help/latest/module/FindPython3.html
+
+[Full Processing of TriBITS Project Files]: https://tribitspub.github.io/TriBITS/users_guide/index.html#full-tribits-project-configuration
+
+[Python Support]: https://tribitspub.github.io/TriBITS/users_guide/index.html#python-support
+
+[Setting or disabling Python]: https://tribitspub.github.io/TriBITS/build_ref/index.html#setting-or-disabling-python
+
+[tribits_deprecated()]: https://tribitspub.github.io/TriBITS/users_guide/index.html#tribits-deprecated
+
+[Adjusting CMake DEPRECATION warnings]: https://tribitspub.github.io/TriBITS/build_ref/index.html#adjusting-cmake-deprecation-warnings
+
+[TriBITSPub/TriBITS#610]: https://github.com/TriBITSPub/TriBITS/issues/610
+
 ## 2023-06-22:
 
 * **Added:** Packages are now determined to be missing if their dependencies

cmake/tribits/LICENSE

@@ -1,3 +1,5 @@
+SPDX-License-Identifier: BSD-3-Clause
+
 Copyright (c) 2013 NTESS and the TriBITS contributors.
 
 Redistribution and use in source and binary forms, with or without

cmake/tribits/ci_support/TribitsDependencies.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # @HEADER
 # *****************************************************************************

cmake/tribits/ci_support/TribitsWriteXmlDependenciesFiles.cmake

@@ -52,7 +52,7 @@ macro(tribits_write_xml_dependency_files)
       " ${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE} ..." )
     set(tribitsCiSupportDir "${${PROJECT_NAME}_TRIBITS_DIR}/${TRIBITS_CI_SUPPORT_DIR}")
     execute_process(
-      COMMAND ${PYTHON_EXECUTABLE}
+      COMMAND ${Python3_EXECUTABLE}
         ${tribitsCiSupportDir}/dump-package-dep-table.py
         --input-xml-deps-file=${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE}
         --output-html-deps-file=${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE} )
@@ -70,7 +70,7 @@ macro(tribits_write_xml_dependency_files)
       "${${PROJECT_NAME}_TRIBITS_DIR}/${TRIBITS_CTEST_DRIVER_DIR}")
     if (EXISTS "${tribitsCtestDriverDir}")
       execute_process(
-        COMMAND ${PYTHON_EXECUTABLE}
+        COMMAND ${Python3_EXECUTABLE}
           ${tribitsCtestDriverDir}/dump-cdash-deps-xml-file.py
           --input-xml-deps-file=${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE}
           --output-cdash-deps-xml-file=${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE})

cmake/tribits/ci_support/cdash_analyze_and_report.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # @HEADER
 # *****************************************************************************

cmake/tribits/ci_support/cdash_build_testing_date.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # @HEADER
 # *****************************************************************************

cmake/tribits/ci_support/checkin-test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # @HEADER
 # *****************************************************************************

cmake/tribits/ci_support/clone_extra_repos.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # @HEADER
 # *****************************************************************************

cmake/tribits/ci_support/dump-package-dep-table.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # @HEADER
 # *****************************************************************************

cmake/tribits/ci_support/filter-packages-list.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # @HEADER
 # *****************************************************************************

cmake/tribits/ci_support/get-tribits-packages-from-last-tests-failed.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # @HEADER
 # *****************************************************************************

cmake/tribits/ci_support/get-tribits-packages.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # @HEADER
 # *****************************************************************************

cmake/tribits/ci_support/is_checkin_tested_commit.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # @HEADER
 # *****************************************************************************

cmake/tribits/core/common/TribitsConstants.cmake

@@ -14,8 +14,9 @@ set(TRIBITS_CMAKE_MINIMUM_REQUIRED 3.23.0)
 macro(tribits_asesrt_minimum_cmake_version)
 
   if (CMAKE_VERSION VERSION_LESS ${TRIBITS_CMAKE_MINIMUM_REQUIRED})
-    message(FATAL_ERROR "Error, TriBiTS must have version"
-        " ${TRIBITS_CMAKE_MINIMUM_REQUIRED} or higher!")
+    message(FATAL_ERROR "Error, this TriBITS project ${PROJECT_NAME} must have a"
+      " version of CMake ${TRIBITS_CMAKE_MINIMUM_REQUIRED} or higher but was"
+      " only provided CMake version ${CMAKE_VERSION}!" )
   endif()
 
 endmacro()