Catch2: 2.13.4+ (#940)

* Catch2: 2.13.4

* Docs: Catch2 v2.13.4

* SerialIOTest: Fix -Wsign-compare

* CI: Add missing apt-get update lines

* ParallelIOTest: Fix -Wsign-compare

Co-authored-by: Martin Hořeňovský <[email protected]>

Author: ax3l

.github/workflows/unix.yml

@@ -12,6 +12,7 @@ jobs:
       with: {path: /opt/spack, key: clangtidy10_nopy_ompi_h5_ad1_ad2 }
     - name: Install
       run: |
+        sudo apt-get update
         sudo apt-get install clang clang-tidy gfortran libopenmpi-dev python
         sudo .github/workflows/dependencies/install_spack
     - name: Build
@@ -36,6 +37,7 @@ jobs:
       with: {path: /opt/spack, key: clang5_nopy_nompi_h5 }
     - name: Install
       run: |
+        sudo apt-get update
         sudo apt-get install clang-5.0
         sudo .github/workflows/dependencies/install_spack
     - name: Build
@@ -59,6 +61,7 @@ jobs:
       with: {path: /opt/spack, key: clang5_nopy_ompi_h5_ad1_ad2_bp3 }
     - name: Install
       run: |
+        sudo apt-get update
         sudo apt-get install clang-5.0 gfortran libopenmpi-dev python3
         sudo .github/workflows/dependencies/install_spack
     - name: Build
@@ -87,6 +90,7 @@ jobs:
       with: {path: /opt/spack, key: clang5_nopy_ompi_h5_ad1_ad2_bp3 }
     - name: Install
       run: |
+        sudo apt-get update
         sudo apt-get install clang-5.0 gfortran libopenmpi-dev python3
         sudo .github/workflows/dependencies/install_spack
     - name: Build
@@ -111,6 +115,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Install
       run: |
+        sudo apt-get update
         sudo apt-get install clang-10 libc++-dev libc++abi-dev libhdf5-dev python3
         python3 -m pip install -U pip
         python3 -m pip install -U numpy
@@ -178,6 +183,7 @@ jobs:
       with: {path: /opt/spack, key: gcc5_py36_ompi_h5_ad1_ad2 }
     - name: Install
       run: |
+        sudo apt-get update
         sudo apt-get install g++-5 gfortran libopenmpi-dev python3 python3-setuptools
         sudo .github/workflows/dependencies/install_spack
         python3 -m pip install -U pip
@@ -202,6 +208,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Install
       run: |
+        sudo apt-get update
         sudo apt-get install g++ libopenmpi-dev libhdf5-openmpi-dev libadios-dev python3 python3-numpy python3-mpi4py python3-pandas
 #       TODO ADIOS1 (.pc file broken?) ADIOS2
     - name: Build

CMakeLists.txt

@@ -440,9 +440,9 @@ if(openPMD_BUILD_TESTING)
         target_include_directories(openPMD::thirdparty::Catch2 SYSTEM INTERFACE
             $<BUILD_INTERFACE:${openPMD_SOURCE_DIR}/share/openPMD/thirdParty/catch2/include>
         )
-        message(STATUS "Catch2: Using INTERNAL version '2.6.1'")
+        message(STATUS "Catch2: Using INTERNAL version '2.13.4'")
     else()
-        find_package(Catch2 2.6.1 REQUIRED CONFIG)
+        find_package(Catch2 2.13.4 REQUIRED CONFIG)
         target_link_libraries(openPMD::thirdparty::Catch2
             INTERFACE Catch2::Catch2)
         message(STATUS "Catch2: Found version '${Catch2_VERSION}'")

README.md

@@ -104,7 +104,7 @@ Required:
 
 Shipped internally in `share/openPMD/thirdParty/`:
 * [MPark.Variant](https://github.com/mpark/variant) 1.4.0+ ([BSL-1.0](https://github.com/mpark/variant/blob/master/LICENSE.md))
-* [Catch2](https://github.com/catchorg/Catch2) 2.6.1+ ([BSL-1.0](https://github.com/catchorg/Catch2/blob/master/LICENSE.txt))
+* [Catch2](https://github.com/catchorg/Catch2) 2.13.4+ ([BSL-1.0](https://github.com/catchorg/Catch2/blob/master/LICENSE.txt))
 * [pybind11](https://github.com/pybind/pybind11) 2.6.1+ ([new BSD](https://github.com/pybind/pybind11/blob/master/LICENSE))
 * [NLohmann-JSON](https://github.com/nlohmann/json) 3.9.1+ ([MIT](https://github.com/nlohmann/json/blob/develop/LICENSE.MIT))
 
@@ -259,7 +259,7 @@ The following options allow to switch to external installs:
 | CMake Option                    | Values     | Library       | Version |
 |---------------------------------|------------|---------------|---------|
 | `openPMD_USE_INTERNAL_VARIANT`  | **ON**/OFF | MPark.Variant |  1.4.0+ |
-| `openPMD_USE_INTERNAL_CATCH`    | **ON**/OFF | Catch2        |  2.6.1+ |
+| `openPMD_USE_INTERNAL_CATCH`    | **ON**/OFF | Catch2        | 2.13.4+ |
 | `openPMD_USE_INTERNAL_PYBIND11` | **ON**/OFF | pybind11      |  2.6.1+ |
 | `openPMD_USE_INTERNAL_JSON`     | **ON**/OFF | NLohmann-JSON |  3.9.1+ |
 

docs/source/dev/buildoptions.rst

@@ -68,7 +68,7 @@ The following options allow to switch to external installs of dependencies:
 CMake Option                      Values      Installs Library       Version
 ================================= =========== ======== ============= ========
 ``openPMD_USE_INTERNAL_VARIANT``  **ON**/OFF  Yes      MPark.Variant   1.4.0+
-``openPMD_USE_INTERNAL_CATCH``    **ON**/OFF  No       Catch2          2.6.1+
+``openPMD_USE_INTERNAL_CATCH``    **ON**/OFF  No       Catch2         2.13.4+
 ``openPMD_USE_INTERNAL_PYBIND11`` **ON**/OFF  No       pybind11        2.6.1+
 ``openPMD_USE_INTERNAL_JSON``     **ON**/OFF  No       NLohmann-JSON   3.9.1+
 ================================= =========== ======== ============= ========

docs/source/dev/dependencies.rst

@@ -18,7 +18,7 @@ Shipped internally
 The following libraries are shipped internally in ``share/openPMD/thirdParty/`` for convenience:
 
 * `MPark.Variant <https://github.com/mpark/variant>`_ 1.4.0+ (`BSL-1.0 <https://github.com/mpark/variant/blob/master/LICENSE.md>`_)
-* `Catch2 <https://github.com/catchorg/Catch2>`_ 2.6.1+ (`BSL-1.0 <https://github.com/catchorg/Catch2/blob/master/LICENSE.txt>`__)
+* `Catch2 <https://github.com/catchorg/Catch2>`_ 2.13.4+ (`BSL-1.0 <https://github.com/catchorg/Catch2/blob/master/LICENSE.txt>`__)
 * `pybind11 <https://github.com/pybind/pybind11>`_ 2.6.1+ (`new BSD <https://github.com/pybind/pybind11/blob/master/LICENSE>`_)
 * `NLohmann-JSON <https://github.com/nlohmann/json>`_ 3.9.1+ (`MIT <https://github.com/nlohmann/json/blob/develop/LICENSE.MIT>`_)