Merge branch 'ci-fedora33-release' into ci-fedora33

* ci-fedora33-release:
  gitlab-ci: use Fedora 33 to build sources
  gitlab-ci: update Linux CI to use Fedora 33
  ci: update to Fedora 33 for Linux builds
  ci: install gmock in the Fedora 31 image
  Tests/FindBoost/TestPython: support finding 3.8 and 3.9
  clang-tidy: ignore new warnings from newer versions
  clang-tidy: ignore `misc-no-recursion`

14 files changed, 30 insertions, 27 deletions

diff --git a/.gitlab/ci/configure_fedora31_tidy.cmake b/.gitlab/ci/configure_fedora31_tidy.cmake
deleted file mode 100644
index 55d022c..0000000
--- a/.gitlab/ci/configure_fedora31_tidy.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake")
diff --git a/.gitlab/ci/configure_fedora31_common.cmake b/.gitlab/ci/configure_fedora33_common.cmake
index c343833..c343833 100644
--- a/.gitlab/ci/configure_fedora31_common.cmake
+++ b/.gitlab/ci/configure_fedora33_common.cmake
diff --git a/.gitlab/ci/configure_fedora31_makefiles.cmake b/.gitlab/ci/configure_fedora33_makefiles.cmake
index db2d005..db2d005 100644
--- a/.gitlab/ci/configure_fedora31_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora33_makefiles.cmake
diff --git a/.gitlab/ci/configure_fedora31_ninja.cmake b/.gitlab/ci/configure_fedora33_ninja.cmake
index ea429c1..883f425 100644
--- a/.gitlab/ci/configure_fedora31_ninja.cmake
+++ b/.gitlab/ci/configure_fedora33_ninja.cmake
@@ -4,4 +4,4 @@ set(CMake_TEST_GUI "ON" CACHE BOOL "")
 # Cover compilation with C++11 only and not higher standards.
 set(CMAKE_CXX_STANDARD "11" CACHE STRING "")
 
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake")
diff --git a/.gitlab/ci/configure_fedora31_ninja_multi.cmake b/.gitlab/ci/configure_fedora33_ninja_multi.cmake
index efb4b84..efb4b84 100644
--- a/.gitlab/ci/configure_fedora31_ninja_multi.cmake
+++ b/.gitlab/ci/configure_fedora33_ninja_multi.cmake
diff --git a/.gitlab/ci/configure_fedora31_sphinx.cmake b/.gitlab/ci/configure_fedora33_sphinx.cmake
index 90d159b..90d159b 100644
--- a/.gitlab/ci/configure_fedora31_sphinx.cmake
+++ b/.gitlab/ci/configure_fedora33_sphinx.cmake
diff --git a/.gitlab/ci/configure_fedora31_sphinx_package.cmake b/.gitlab/ci/configure_fedora33_sphinx_package.cmake
index e839de8..e839de8 100644
--- a/.gitlab/ci/configure_fedora31_sphinx_package.cmake
+++ b/.gitlab/ci/configure_fedora33_sphinx_package.cmake
diff --git a/.gitlab/ci/configure_fedora33_tidy.cmake b/.gitlab/ci/configure_fedora33_tidy.cmake
new file mode 100644
index 0000000..9052fdc
--- /dev/null
+++ b/.gitlab/ci/configure_fedora33_tidy.cmake
@@ -0,0 +1,3 @@
+set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake")
diff --git a/.gitlab/ci/docker/fedora31/Dockerfile b/.gitlab/ci/docker/fedora33/Dockerfile
index 80ab379..8ebcb9e 100644
--- a/.gitlab/ci/docker/fedora31/Dockerfile
+++ b/.gitlab/ci/docker/fedora33/Dockerfile
@@ -1,10 +1,10 @@
-FROM fedora:31 as rvm-build
+FROM fedora:33 as rvm-build
 MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
 
 COPY install_rvm.sh /root/install_rvm.sh
 RUN sh /root/install_rvm.sh
 
-FROM fedora:31
+FROM fedora:33
 MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
 
 COPY install_deps.sh /root/install_deps.sh
diff --git a/.gitlab/ci/docker/fedora31/install_deps.sh b/.gitlab/ci/docker/fedora33/install_deps.sh
index c1391e3..c1391e3 100755
--- a/.gitlab/ci/docker/fedora31/install_deps.sh
+++ b/.gitlab/ci/docker/fedora33/install_deps.sh
diff --git a/.gitlab/ci/docker/fedora31/install_ispc.sh b/.gitlab/ci/docker/fedora33/install_ispc.sh
index fdc14b5..fdc14b5 100755
--- a/.gitlab/ci/docker/fedora31/install_ispc.sh
+++ b/.gitlab/ci/docker/fedora33/install_ispc.sh
diff --git a/.gitlab/ci/docker/fedora31/install_rvm.sh b/.gitlab/ci/docker/fedora33/install_rvm.sh
index 2332ab7..6d4fa97 100755
--- a/.gitlab/ci/docker/fedora31/install_rvm.sh
+++ b/.gitlab/ci/docker/fedora33/install_rvm.sh
@@ -13,6 +13,9 @@ dnf install --setopt=install_weak_deps=False -y \
 
 curl -sSL https://get.rvm.io | bash -s stable
 
+# This is intentionally an older version.
+# If updating, the associated `env_fedora*_makefiles.cmake` file needs updated
+# as well.
 /usr/local/rvm/bin/rvm install ruby-2.7.0
 
 tar -C /usr/local -cf /root/rvm.tar rvm
diff --git a/.gitlab/ci/env_fedora31_makefiles.cmake b/.gitlab/ci/env_fedora33_makefiles.cmake
index 1d0efa7..1d0efa7 100644
--- a/.gitlab/ci/env_fedora31_makefiles.cmake
+++ b/.gitlab/ci/env_fedora33_makefiles.cmake
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index bab4f5a..6684d71 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -12,7 +12,7 @@
         LAUNCHER: "scl enable devtoolset-6 rh-python36 --"
 
 .linux_prep_source:
-    image: "fedora:32"
+    image: "fedora:33"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -48,36 +48,36 @@
 
 ### Fedora
 
-.fedora31:
-    image: "kitware/cmake:ci-fedora31-x86_64-2020-10-22"
+.fedora33:
+    image: "kitware/cmake:ci-fedora33-x86_64-2020-11-13"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
 
 #### Lint builds
 
-.fedora31_tidy:
-    extends: .fedora31
+.fedora33_tidy:
+    extends: .fedora33
 
     variables:
-        CMAKE_CONFIGURATION: fedora31_tidy
+        CMAKE_CONFIGURATION: fedora33_tidy
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMake_SKIP_INSTALL: 1
 
-.fedora31_sphinx:
-    extends: .fedora31
+.fedora33_sphinx:
+    extends: .fedora33
 
     variables:
-        CMAKE_CONFIGURATION: fedora31_sphinx
+        CMAKE_CONFIGURATION: fedora33_sphinx
         CTEST_NO_WARNINGS_ALLOWED: 1
         CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
         CMake_SKIP_INSTALL: 1
 
-.fedora31_sphinx_package:
-    extends: .fedora31
+.fedora33_sphinx_package:
+    extends: .fedora33
 
     variables:
-        CMAKE_CONFIGURATION: fedora31_sphinx_package
+        CMAKE_CONFIGURATION: fedora33_sphinx_package
         CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
 
 #### Build and test
@@ -89,26 +89,26 @@
         CMAKE_CONFIGURATION: debian10_ninja
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.fedora31_ninja:
-    extends: .fedora31
+.fedora33_ninja:
+    extends: .fedora33
 
     variables:
-        CMAKE_CONFIGURATION: fedora31_ninja
+        CMAKE_CONFIGURATION: fedora33_ninja
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.fedora31_ninja_multi:
-    extends: .fedora31
+.fedora33_ninja_multi:
+    extends: .fedora33
 
     variables:
-        CMAKE_CONFIGURATION: fedora31_ninja_multi
+        CMAKE_CONFIGURATION: fedora33_ninja_multi
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_GENERATOR: "Ninja Multi-Config"
 
-.fedora31_makefiles:
-    extends: .fedora31
+.fedora33_makefiles:
+    extends: .fedora33
 
     variables:
-        CMAKE_CONFIGURATION: fedora31_makefiles
+        CMAKE_CONFIGURATION: fedora33_makefiles
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_GENERATOR: "Unix Makefiles"