diff --git a/.codespellrc b/.codespellrc index 7b86e0d45..1d9d7ebf1 100644 --- a/.codespellrc +++ b/.codespellrc @@ -3,5 +3,5 @@ check-filenames = check-hidden = # Disable warnings about binary files quiet-level = 2 -skip = */.git,*/common_tools/cloc,*/TriBITSDoc,*/tribits/doc/guides/rst2latex.tex,*/*.js,*/*.svg,*/tribits/doc/sphinx/*/index.html +skip = */.git,*/common_tools/cloc,*/TriBITSDoc,*/tribits/doc/guides/rst2latex.tex,*/*.js,*/*.svg,*/tribits/doc/sphinx/*/index.html,*~ ignore-words-list = thur,inout,te,nd,lod,aci,nin,nnumber,wile,reall,bu,somewhere diff --git a/CMakeLists.txt b/CMakeLists.txt index aa2037f4f..7f1f5b2f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ if (NOT TRIBITS_PROCESSING_PACKAGE) # This CMakeLists.txt file is being processed as the TriBITS projects's base # CMakeLists.txt file! (See comments at bottom of this file.) - cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR) + cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR) include("${CMAKE_CURRENT_SOURCE_DIR}/ProjectName.cmake") project(${PROJECT_NAME} NONE) set(${PROJECT_NAME}_TRIBITS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tribits" CACHE PATH "") diff --git a/dev_testing/cee-rhel8/do-configure.mpi-debug b/dev_testing/cee-rhel8/do-configure.mpi-debug new file mode 100755 index 000000000..f0fe28451 --- /dev/null +++ b/dev_testing/cee-rhel8/do-configure.mpi-debug @@ -0,0 +1,72 @@ +#!/bin/bash + +if [ -d CMakeFiles ] ; then + rm -r CMakeFiles +fi +if [ -e CMakeCache.txt ] ; then + rm CMakeCache.txt +fi + +if [ "$TRIBITS_BASE_DIR" == "" ] ; then + _ABS_FILE_PATH=`readlink -f $0` + _SCRIPT_DIR=`dirname $_ABS_FILE_PATH` + TRIBITS_BASE_DIR=$_SCRIPT_DIR/../.. +fi + +tribits_install_test_dir=/tmp/rabartl/tribits_install_tests +if [ -d "${tribits_install_test_dir}" ] ; then + echo "Makedir ${tribits_install_test_dir}" + mkdir ${tribits_install_test_dir} +fi + +${TRIBITS_BASE_DIR}/dev_testing/generic/do-configure-mpi-debug \ +-DDART_TESTING_TIMEOUT=100 \ +-DCTEST_PARALLEL_LEVEL=16 \ +-DTriBITS_CTEST_DRIVER_COVERAGE_TESTS=TRUE \ +-DTriBITS_CTEST_DRIVER_MEMORY_TESTS=TRUE \ +-DTriBITS_ENABLE_CONFIGURE_TIMING=ON \ +-DTriBITS_ENABLE_PACKAGE_CONFIGURE_TIMING=ON \ +-DTribitsExProj_INSTALL_BASE_DIR=${tribits_install_test_dir} \ +-DTribitsExProj_INSTALL_OWNING_GROUP=wg-sems-users-son \ +-DTriBITS_ENABLE_REAL_GIT_CLONE_TESTS=ON \ +-DTriBITS_SHOW_TEST_START_END_DATE_TIME=ON \ +"$@" + +#-DTriBITS_CTEST_DRIVER_COVERAGE_TESTS=TRUE \ +#-DTriBITS_CTEST_DRIVER_MEMORY_TESTS=TRUE \ + +#-DTriBITS_ENABLE_DOC_GENERATION_TESTS=ON + +# To submit to testing.sandia.gov/cdash set: +# +# -DTriBITS_CTEST_DRIVER_SUBMIT_TO=TESTING_SANDIA_CDASH + +# To submit to testing-dev.sandia.gov/cdash set: +# +# -DTriBITS_CTEST_DRIVER_SUBMIT_TO=TESTING_DEV_SANDIA_CDASH + +# To submit to exp.cdash.org set: +# +# -DTriBITS_CTEST_DRIVER_SUBMIT_TO=EXP_CDASH + +# To submit to arbitrary CDash site (e.g. testing-dev.sandia.gov/cdash) set: +# +# -DTriBITS_CTEST_DRIVER_SUBMIT_TO=CUSTOM +# -DTriBITS_CTEST_DRIVER_SUBMIT_DROP_SITE=testing-dev.sandia.gov +# -DTriBITS_CTEST_DRIVER_SUBMIT_DROP_LOCATION="/cdash/submit.php?project=TribitsExProj" + +# NOTE: Add -DTriBITS_ENABLE_REAL_GIT_CLONE_TESTS=ON to test cloning TriBITS +# Example repos and testing the clone features of the various tools. To get +# this to work on SNL machines, one may need to switch from +# 'https://github.com/' to 'git@github.com:' using: +# +# export TribitsExMetaProj_GIT_URL_REPO_BASE=git@github.com:tribits/ +# +# before configuring. +# +# NOTE: The directory /tmp/tribits_install_tests above was created beforehand with: +# +# $ mkdir /tmp/tribits_install_tests +# +# One can allow another user to create the directory with a shared group for +# more testing. diff --git a/dev_testing/cee-rhel8/load-env.clang-16.0.6.sh b/dev_testing/cee-rhel8/load-env.clang-16.0.6.sh new file mode 100644 index 000000000..86549eda9 --- /dev/null +++ b/dev_testing/cee-rhel8/load-env.clang-16.0.6.sh @@ -0,0 +1,7 @@ +module purge +module load aue/cmake/3.27.7 +module load aue/ninja/1.11.1 +module load aue/clang/16.0.6 +module load aue/openmpi/4.1.6-clang-16.0.6 + +export TribitsExMetaProj_GIT_URL_REPO_BASE=git@github.com:tribits/ diff --git a/dev_testing/cee-rhel8/load-env.gnu-10.3.0.sh b/dev_testing/cee-rhel8/load-env.gnu-10.3.0.sh new file mode 100644 index 000000000..d029a4db0 --- /dev/null +++ b/dev_testing/cee-rhel8/load-env.gnu-10.3.0.sh @@ -0,0 +1,7 @@ +module purge +module load aue/cmake/3.27.7 +module load aue/ninja/1.11.1 +module load aue/gcc/10.3.0 +module load aue/openmpi/4.1.6-gcc-10.3.0 + +export TribitsExMetaProj_GIT_URL_REPO_BASE=git@github.com:tribits/ diff --git a/dev_testing/crf450/mpi-debug/do-configure b/dev_testing/crf450/mpi-debug/do-configure index d18b58eab..c121756ba 100755 --- a/dev_testing/crf450/mpi-debug/do-configure +++ b/dev_testing/crf450/mpi-debug/do-configure @@ -14,7 +14,7 @@ if [ "$TRIBITS_BASE_DIR" == "" ] ; then fi ${TRIBITS_BASE_DIR}/dev_testing/generic/do-configure-mpi-debug \ --DDART_TESTING_TIMEOUT=85 \ +-DDART_TESTING_TIMEOUT=100 \ -DCTEST_PARALLEL_LEVEL=16 \ -DTriBITS_CTEST_DRIVER_COVERAGE_TESTS=TRUE \ -DTriBITS_CTEST_DRIVER_MEMORY_TESTS=TRUE \ diff --git a/dev_testing/generic/do-configure-mpi-debug b/dev_testing/generic/do-configure-mpi-debug index afe95538f..75294f1d5 100755 --- a/dev_testing/generic/do-configure-mpi-debug +++ b/dev_testing/generic/do-configure-mpi-debug @@ -27,6 +27,7 @@ fi cmake \ -D CMAKE_BUILD_TYPE:STRING="DEBUG" \ +-D PYTHON_EXECUTABLE=$(which python3) \ -D TPL_ENABLE_MPI:BOOL=ON \ -D TriBITS_ENABLE_Fortran:BOOL=ON \ -D TriBITS_ENABLE_TESTS:BOOL=ON \ diff --git a/test/ci_support/example_cdash_analyze_and_report_random_failures.py b/test/ci_support/example_cdash_analyze_and_report_random_failures.py index 6c93f5dd0..bf3a2d6c8 100755 --- a/test/ci_support/example_cdash_analyze_and_report_random_failures.py +++ b/test/ci_support/example_cdash_analyze_and_report_random_failures.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys import argparse diff --git a/test/ci_support/example_test_failure_github_issue.py b/test/ci_support/example_test_failure_github_issue.py index 06a43ed30..abacb9d4d 100755 --- a/test/ci_support/example_test_failure_github_issue.py +++ b/test/ci_support/example_test_failure_github_issue.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import sys diff --git a/test/core/ExamplesUnitTests/RPATH_Handling_Tests.cmake b/test/core/ExamplesUnitTests/RPATH_Handling_Tests.cmake index d6665d38f..4156563af 100644 --- a/test/core/ExamplesUnitTests/RPATH_Handling_Tests.cmake +++ b/test/core/ExamplesUnitTests/RPATH_Handling_Tests.cmake @@ -71,7 +71,7 @@ if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(RPATH_GREP_STR "@rpath/libsimplecxx[.].*[.]dylib;@rpath/libsimpletpl[.]dylib") elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(RPATH_GREP_STR - "R.*PATH *${RPATH_CURRENT_TEST_DIR}/install/lib:${SimpleTpl_install_SHARED_DIR}/install/lib") + "R.*PATH *.*${RPATH_CURRENT_TEST_DIR}/install/lib:${SimpleTpl_install_SHARED_DIR}/install/lib") # NOTE: Above matches both RPATH and RUNPATH which are used on different # Linux systems. endif() @@ -149,7 +149,7 @@ if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(RPATH_GREP_STR "@rpath/libsimplecxx[.].*[.]dylib;@rpath/libsimpletpl[.]dylib") elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(RPATH_GREP_STR - "R.*PATH *${SimpleTpl_install_SHARED_DIR}/install/lib") + "R.*PATH *.*${SimpleTpl_install_SHARED_DIR}/install/lib") endif() tribits_add_advanced_test( TribitsExampleProject_SimpleTpl_RPATH_no_SET_INSTALL_RPATH @@ -221,7 +221,7 @@ if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(RPATH_GREP_STR "@rpath/libsimplecxx[.].*[.]dylib;@rpath/libsimpletpl[.]dylib") elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(RPATH_GREP_STR - "R.*PATH *${RPATH_CURRENT_TEST_DIR}/install2/nonstd_lib_location:${SimpleTpl_install_SHARED_DIR}/install/lib") + "R.*PATH *.*${RPATH_CURRENT_TEST_DIR}/install2/nonstd_lib_location:${SimpleTpl_install_SHARED_DIR}/install/lib") endif() tribits_add_advanced_test( TribitsExampleProject_SimpleTpl_RPATH_CMAKE_INSTALL_RPATH diff --git a/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake b/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake index 651ba2f4f..7fc507096 100644 --- a/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake +++ b/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake @@ -34,29 +34,46 @@ else() set(REGEX_FOR_GITIGNORE) endif() - -if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) - set(DEPRECATED_WARNING_1_STR - "‘int SimpleCxx::HelloWorld::someOldFunc.. const’ is deprecated .declared at .*/TribitsExampleProject/packages/simple_cxx/src/SimpleCxx_HelloWorld.hpp:" - ) - if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.5) - # Only versions 4.5+ support this feature - set(DEPRECATED_MSG_STR ".* .Just don't call this function at all please!") +print_var(CMAKE_CXX_COMPILER_VERSION) + + +if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) + set(DEPRECATED_WARNING_1_STR + "‘int SimpleCxx::HelloWorld::someOldFunc.. const’ is deprecated .declared at .*/TribitsExampleProject/packages/simple_cxx/src/SimpleCxx_HelloWorld.hpp:" + ) + if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.5) + # Only versions 4.5+ support this feature + set(DEPRECATED_MSG_STR ".* .Just don't call this function at all please!") + else() + set(DEPRECATED_MSG_STR "") + endif() + set(DEPRECATED_WARNING_2_STR + "‘int SimpleCxx::HelloWorld::someOldFunc2.. const’ is deprecated .declared at .*/TribitsExampleProject/packages/simple_cxx/src/SimpleCxx_HelloWorld.hpp:${DEPRECATED_MSG_STR}" + ) else() - set(DEPRECATED_MSG_STR) + set(DEPRECATED_WARNING_1_STR + ".*/TribitsExampleProject/packages/simple_cxx/src/SimpleCxx_HelloWorld.cpp:.*: warning: .*someOldFunc.* is deprecated" + ) + set(DEPRECATED_WARNING_2_STR + ".*/TribitsExampleProject/packages/simple_cxx/src/SimpleCxx_HelloWorld.cpp:.*: warning: .*someOldFunc2.* is deprecated: .Just don.t call this function at all please." + ) endif() - set(DEPRECATED_WARNING_2_STR - "‘int SimpleCxx::HelloWorld::someOldFunc2.. const’ is deprecated .declared at .*/TribitsExampleProject/packages/simple_cxx/src/SimpleCxx_HelloWorld.hpp:${DEPRECATED_MSG_STR}" - ) -else() +elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") set(DEPRECATED_WARNING_1_STR - ".*/TribitsExampleProject/packages/simple_cxx/src/SimpleCxx_HelloWorld.cpp:.*: warning: .*int SimpleCxx::HelloWorld::someOldFunc.. const.* is deprecated" - ) - set(DEPRECATED_WARNING_2_STR - ".*/TribitsExampleProject/packages/simple_cxx/src/SimpleCxx_HelloWorld.cpp:.*: warning: .*int SimpleCxx::HelloWorld::someOldFunc2.. const.* is deprecated: .Just don.t call this function at all please." + "simple_cxx/src/SimpleCxx_HelloWorld.hpp:.*:.*: note: 'someOldFunc' has been explicitly marked deprecated here" ) + set(DEPRECATED_MSG_STR + "SIMPLECXX_DEPRECATED_MSG[(].Just don't call this function at all please..[)]") +else() + message(SEND_ERROR "Error, the CMAKE_CXX_COMPILER_ID='${CMAKE_CXX_COMPILER_ID}'" + " and CMAKE_CXX_COMPILER_VERSION='${CMAKE_CXX_COMPILER_VERSION}' is not covered" + " for setting DEPRECATED_WARNING_1_STR!") endif() +print_var(DEPRECATED_WARNING_1_STR) +print_var(DEPRECATED_MSG_STR) +print_var(DEPRECATED_WARNING_2_STR) set(LabelsForSubprojects_CMND_AND_ARGS grep ARGS "^LabelsForSubprojects:" DartConfiguration.tcl) @@ -416,7 +433,7 @@ function(TribitsExampleProject_ALL_ST_NoFortran sharedOrStatic serialOrMpi) "TribitsExProj_CXX_FLAGS = ''" "TribitsExProj_C_FLAGS = ''" "TribitsExProj_Fortran_FLAGS = ''" - "TribitsExProj_EXTRA_LD_FLAGS = ''" + "TribitsExProj_EXTRA_LD_FLAGS = '" # This is non-empty on some platforms but we can't know what it is :-( "TribitsExProj_SHARED_LIB_RPATH_COMMAND = '${TribitsExProj_SHARED_LIB_RPATH_COMMAND_REGEX}'" "TribitsExProj_BUILD_SHARED_LIBS = '${BUILD_SHARED_LIBS_VAL}'" "TribitsExProj_LINKER = '.*'" diff --git a/test/core/ExamplesUnitTests/TribitsHelloWorld_Tests.cmake b/test/core/ExamplesUnitTests/TribitsHelloWorld_Tests.cmake index cc20316c8..bbfb22eef 100644 --- a/test/core/ExamplesUnitTests/TribitsHelloWorld_Tests.cmake +++ b/test/core/ExamplesUnitTests/TribitsHelloWorld_Tests.cmake @@ -871,7 +871,7 @@ tribits_add_advanced_test( TribitsHelloWorld_install_config_dummy_proj "TribitsHelloWorld_C_FLAGS = ''" "TribitsHelloWorld_Fortran_FLAGS = ''" "TribitsHelloWorld_FORTRAN_FLAGS = ''" - "TribitsHelloWorld_EXTRA_LD_FLAGS = ''" + "TribitsHelloWorld_EXTRA_LD_FLAGS = '" # This is not empty on some platforms but we can't check the value! "TribitsHelloWorld_SHARED_LIB_RPATH_COMMAND = ''" "TribitsHelloWorld_BUILD_SHARED_LIBS = 'FALSE'" "TribitsHelloWorld_LINKER = '.*'" diff --git a/test/doc/CMakeLists.txt b/test/doc/CMakeLists.txt index 22043296a..d5d83994e 100644 --- a/test/doc/CMakeLists.txt +++ b/test/doc/CMakeLists.txt @@ -1,6 +1,13 @@ +if (PYTHON_VERSION_MAJOR GREATER_EQUAL 3) + set(HAS_PYTHON3 TRUE) +else() + set(HAS_PYTHON3 FALSE) +endif() + + advanced_set( ${PROJECT_NAME}_ENABLE_DOC_GENERATION_TESTS OFF CACHE BOOL - "Enable testing for the build of the documentation. Requires docutils and will blow away and rebuild the existing documentation in the source tree since the documentation builds in place." ) + "Enable testing for the build of the documentation, including using Sphinx. Requires docutils, sphinx, and sphinx-rd-theme and will blow away and rebuild the existing documentation in the source tree since the documentation builds in place. Therefore, one must be careful to not blow away non-tracked files." ) tribits_add_advanced_test( sphinx_rst_generator_UnitTests @@ -11,6 +18,7 @@ tribits_add_advanced_test( sphinx_rst_generator_UnitTests ARGS ${CMAKE_CURRENT_SOURCE_DIR}/sphinx_rst_generator_UnitTests.py -v PASS_REGULAR_EXPRESSION "OK" ALWAYS_FAIL_ON_NONZERO_RETURN + DISABLED "Test is broken for long time, see commit c477daa1" ) @@ -45,7 +53,7 @@ tribits_add_advanced_test( build_sphinx_docs GIT_EXECUTABLE OVERALL_NUM_MPI_PROCS 1 TEST_0 MESSAGE "Clean out any prior build of the docs" - CMND ${GIT_EXECUTABLE} ARGS clean -xdf + CMND ${GIT_EXECUTABLE} ARGS clean -xdf -- . WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tribits/doc SKIP_CLEAN_WORKING_DIRECTORY # Don't delete our source tree! TEST_1 MESSAGE "Build the sphinx documentation" @@ -82,10 +90,3 @@ if (build_docs_test_name AND build_sphinx_docs_test_name) # RUN_SERIAL because they take a long time to run and we don't want to stop # other TriBITS tests from running at the same time as these two. endif() - - -if (PYTHON_VERSION_MAJOR GREATER_EQUAL 3) - set(HAS_PYTHON3 TRUE) -else() - set(HAS_PYTHON3 FALSE) -endif() diff --git a/test/doc/sphinx_rst_generator_UnitTests.py b/test/doc/sphinx_rst_generator_UnitTests.py index 0c5338e33..f4479f952 100644 --- a/test/doc/sphinx_rst_generator_UnitTests.py +++ b/test/doc/sphinx_rst_generator_UnitTests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @HEADER # ************************************************************************ @@ -91,7 +91,8 @@ def test_1(self): rst_dir = os.path.join(tribitsDir,'doc','sphinx','copied_files') (abs_path_str, include_file_list) = SRG.change_paths_and_get_includes( source_file=source_file, src_file_path=src_file_path, - start_path=start_path, rst_dir=rst_dir, copy_file=True) + start_path=start_path, rst_dir=rst_dir, tribits_base_dir=tribitsDir, + copy_file=True) #print("abs_path_str = "+str(abs_path_str)) #print("include_file_list = "+str(include_file_list)) self.maxDiff = None diff --git a/test/python_utils/gitdist_UnitTests.py b/test/python_utils/gitdist_UnitTests.py index 1e7dd99b4..684534264 100644 --- a/test/python_utils/gitdist_UnitTests.py +++ b/test/python_utils/gitdist_UnitTests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @HEADER # ************************************************************************ diff --git a/test/python_utils/lower_case_cmake_UnitTests.py b/test/python_utils/lower_case_cmake_UnitTests.py index 43adf03a3..67ce64b78 100644 --- a/test/python_utils/lower_case_cmake_UnitTests.py +++ b/test/python_utils/lower_case_cmake_UnitTests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- ################################################################################ diff --git a/test/python_utils/utils/return_input.py b/test/python_utils/utils/return_input.py index 89ed4cd79..a8a45af1c 100755 --- a/test/python_utils/utils/return_input.py +++ b/test/python_utils/utils/return_input.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ************************************************************************ diff --git a/tribits/ci_support/TribitsDependencies.py b/tribits/ci_support/TribitsDependencies.py index fae95321a..2ba8d611e 100644 --- a/tribits/ci_support/TribitsDependencies.py +++ b/tribits/ci_support/TribitsDependencies.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/ci_support/cdash_analyze_and_report.py b/tribits/ci_support/cdash_analyze_and_report.py index 6062f4526..9f64282df 100755 --- a/tribits/ci_support/cdash_analyze_and_report.py +++ b/tribits/ci_support/cdash_analyze_and_report.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/ci_support/cdash_build_testing_date.py b/tribits/ci_support/cdash_build_testing_date.py index 1791e68da..fb2fb04ee 100755 --- a/tribits/ci_support/cdash_build_testing_date.py +++ b/tribits/ci_support/cdash_build_testing_date.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/ci_support/checkin-test.py b/tribits/ci_support/checkin-test.py index b7132ea32..23d95e307 100755 --- a/tribits/ci_support/checkin-test.py +++ b/tribits/ci_support/checkin-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/ci_support/clone_extra_repos.py b/tribits/ci_support/clone_extra_repos.py index 0b7d457c6..cc2d6f5cf 100755 --- a/tribits/ci_support/clone_extra_repos.py +++ b/tribits/ci_support/clone_extra_repos.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/ci_support/dump-package-dep-table.py b/tribits/ci_support/dump-package-dep-table.py index 7bfe11fe3..216a7c2f7 100755 --- a/tribits/ci_support/dump-package-dep-table.py +++ b/tribits/ci_support/dump-package-dep-table.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/ci_support/filter-packages-list.py b/tribits/ci_support/filter-packages-list.py index 6bb1f7fea..8a70816c4 100755 --- a/tribits/ci_support/filter-packages-list.py +++ b/tribits/ci_support/filter-packages-list.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/ci_support/get-tribits-packages-from-files-list.py b/tribits/ci_support/get-tribits-packages-from-files-list.py index 342f95cdb..6cb76171d 100755 --- a/tribits/ci_support/get-tribits-packages-from-files-list.py +++ b/tribits/ci_support/get-tribits-packages-from-files-list.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/ci_support/get-tribits-packages-from-last-tests-failed.py b/tribits/ci_support/get-tribits-packages-from-last-tests-failed.py index 3f322e1c5..8e9d6d0e2 100755 --- a/tribits/ci_support/get-tribits-packages-from-last-tests-failed.py +++ b/tribits/ci_support/get-tribits-packages-from-last-tests-failed.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/ci_support/get-tribits-packages.py b/tribits/ci_support/get-tribits-packages.py index 1f5c0e8b7..6454ad55d 100755 --- a/tribits/ci_support/get-tribits-packages.py +++ b/tribits/ci_support/get-tribits-packages.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/ci_support/is_checkin_tested_commit.py b/tribits/ci_support/is_checkin_tested_commit.py index 19a68702e..e09ced5be 100755 --- a/tribits/ci_support/is_checkin_tested_commit.py +++ b/tribits/ci_support/is_checkin_tested_commit.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/core/test_support/TribitsAddAdvancedTest.cmake b/tribits/core/test_support/TribitsAddAdvancedTest.cmake index 3a6aa01dc..3f853da63 100644 --- a/tribits/core/test_support/TribitsAddAdvancedTest.cmake +++ b/tribits/core/test_support/TribitsAddAdvancedTest.cmake @@ -345,7 +345,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/../utils/PrintVar.cmake") # instead. **WARNING:** If you want to run such tests using valgrind, you # have to use the raw executable as the ```` argument and *not* # the script. For example, if you have a python script -# ``my_python_test.py`` with ``/usr/bin/env python`` at the top, you can't +# ``my_python_test.py`` with ``/usr/bin/env python3`` at the top, you can't # just use:: # # CMND /my_python_test.py ARGS "" "" ... diff --git a/tribits/ctest_driver/dump-cdash-deps-xml-file.py b/tribits/ctest_driver/dump-cdash-deps-xml-file.py index 3ebc60cd4..ceeebe807 100755 --- a/tribits/ctest_driver/dump-cdash-deps-xml-file.py +++ b/tribits/ctest_driver/dump-cdash-deps-xml-file.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/dashboard_driver/tdd_driver.py b/tribits/dashboard_driver/tdd_driver.py index 099c6b2a9..3d68026f4 100755 --- a/tribits/dashboard_driver/tdd_driver.py +++ b/tribits/dashboard_driver/tdd_driver.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/devtools_install/install-autoconf.py b/tribits/devtools_install/install-autoconf.py index 700a2a787..88b9974ac 100755 --- a/tribits/devtools_install/install-autoconf.py +++ b/tribits/devtools_install/install-autoconf.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/devtools_install/install-cmake.py b/tribits/devtools_install/install-cmake.py index fbf07832a..2c69291d1 100755 --- a/tribits/devtools_install/install-cmake.py +++ b/tribits/devtools_install/install-cmake.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/devtools_install/install-gcc.py b/tribits/devtools_install/install-gcc.py index d2cd4fbd1..e2ab794da 100755 --- a/tribits/devtools_install/install-gcc.py +++ b/tribits/devtools_install/install-gcc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/devtools_install/install-git.py b/tribits/devtools_install/install-git.py index 4a52a2d3d..3a9ee1ba4 100755 --- a/tribits/devtools_install/install-git.py +++ b/tribits/devtools_install/install-git.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/devtools_install/install-mpich.py b/tribits/devtools_install/install-mpich.py index 529570f32..172f2383f 100755 --- a/tribits/devtools_install/install-mpich.py +++ b/tribits/devtools_install/install-mpich.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/devtools_install/install-openmpi.py b/tribits/devtools_install/install-openmpi.py index cac874f66..0d975be7f 100755 --- a/tribits/devtools_install/install-openmpi.py +++ b/tribits/devtools_install/install-openmpi.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/devtools_install/install_devtools.py b/tribits/devtools_install/install_devtools.py index a84e4f0aa..0f308469b 100755 --- a/tribits/devtools_install/install_devtools.py +++ b/tribits/devtools_install/install_devtools.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/doc/build_ref/create-project-build-ref.py b/tribits/doc/build_ref/create-project-build-ref.py index ce0ee6a92..acd76c59a 100755 --- a/tribits/doc/build_ref/create-project-build-ref.py +++ b/tribits/doc/build_ref/create-project-build-ref.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 usageHelp = r"""create-project-build-ref.py [options] diff --git a/tribits/examples/TribitsExampleProject/packages/wrap_external/external_func/configure.py b/tribits/examples/TribitsExampleProject/packages/wrap_external/external_func/configure.py index 9da2e1347..bdbba413e 100755 --- a/tribits/examples/TribitsExampleProject/packages/wrap_external/external_func/configure.py +++ b/tribits/examples/TribitsExampleProject/packages/wrap_external/external_func/configure.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys import os diff --git a/tribits/python_utils/download-cmake.py b/tribits/python_utils/download-cmake.py index 48a92a580..5a9a96f6b 100755 --- a/tribits/python_utils/download-cmake.py +++ b/tribits/python_utils/download-cmake.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/python_utils/extract_rst_cmake_doc.py b/tribits/python_utils/extract_rst_cmake_doc.py index 703896ce0..016757aae 100755 --- a/tribits/python_utils/extract_rst_cmake_doc.py +++ b/tribits/python_utils/extract_rst_cmake_doc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/python_utils/generate-docutils-output.py b/tribits/python_utils/generate-docutils-output.py index 27fc8aa77..bb70709d7 100755 --- a/tribits/python_utils/generate-docutils-output.py +++ b/tribits/python_utils/generate-docutils-output.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 usageHelp = r"""generate-docutils-output.py --file-base= [options] diff --git a/tribits/python_utils/generic-looping-demon.py b/tribits/python_utils/generic-looping-demon.py index ab6cc52d4..5494278e3 100755 --- a/tribits/python_utils/generic-looping-demon.py +++ b/tribits/python_utils/generic-looping-demon.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/python_utils/gitdist.py b/tribits/python_utils/gitdist.py index 6800e2e20..e10b6716f 100755 --- a/tribits/python_utils/gitdist.py +++ b/tribits/python_utils/gitdist.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # diff --git a/tribits/python_utils/lower_case_cmake.py b/tribits/python_utils/lower_case_cmake.py index ea769dbdb..454cabdd8 100755 --- a/tribits/python_utils/lower_case_cmake.py +++ b/tribits/python_utils/lower_case_cmake.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import sys diff --git a/tribits/python_utils/mailmsg.py b/tribits/python_utils/mailmsg.py index 4c7017d69..220c39b4d 100755 --- a/tribits/python_utils/mailmsg.py +++ b/tribits/python_utils/mailmsg.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/python_utils/mockprogram.py b/tribits/python_utils/mockprogram.py index 7813c23a9..05b898b22 100755 --- a/tribits/python_utils/mockprogram.py +++ b/tribits/python_utils/mockprogram.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** diff --git a/tribits/python_utils/snapshot-dir.py b/tribits/python_utils/snapshot-dir.py index 76436dca4..e2cf687ea 100755 --- a/tribits/python_utils/snapshot-dir.py +++ b/tribits/python_utils/snapshot-dir.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # @HEADER # ***************************************************************************** # TriBITS: Tribal Build, Integrate, and Test System diff --git a/tribits/python_utils/tree.py b/tribits/python_utils/tree.py index 15047bf6f..720ece043 100755 --- a/tribits/python_utils/tree.py +++ b/tribits/python_utils/tree.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # tree.py #