Update to catch2 3.8.0 (#1732)

CQCL · Jan 9, 2025 · 1a04023 · 1a04023
1 parent bffcaf9
commit 1a04023
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build-without-conan.yml b/.github/workflows/build-without-conan.yml
@@ -74,9 +74,9 @@ jobs:
     - name: Install catch2
       run: |
         cd ${TMP_DIR}
-        wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.7.1.tar.gz
-        tar xzvf v3.7.1.tar.gz
-        cd Catch2-3.7.1/
+        wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.tar.gz
+        tar xzvf v3.8.0.tar.gz
+        cd Catch2-3.8.0/
         mkdir build
         cd build
         cmake -GNinja -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..

diff --git a/build-without-conan.md b/build-without-conan.md
@@ -91,9 +91,9 @@ cmake --install .
 
 ```
 cd ${TMP_DIR}
-wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.7.1.tar.gz
-tar xzvf v3.7.1.tar.gz
-cd Catch2-3.7.1/
+wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.tar.gz
+tar xzvf v3.8.0.tar.gz
+cd Catch2-3.8.0/
 mkdir build
 cd build
 cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
@@ -133,7 +133,7 @@ cmake --install .
 
 ```
 cd ${TMP_DIR}
-wget https://github.com/pybind/pybind11_json/archive/refs/tags/0.2.14.tar.gz
+wget https://github.com/pybind/pybind11_json/archive/refs/tags/0.2.15.tar.gz
 tar xzvf 0.2.14.tar.gz
 cd pybind11_json-0.2.14/
 mkdir build

diff --git a/libs/tkassert/test/conanfile.py b/libs/tkassert/test/conanfile.py
@@ -60,4 +60,4 @@ def package(self):
 
     def requirements(self):
         self.requires("tkassert/0.3.4")
-        self.requires("catch2/3.7.1")
+        self.requires("catch2/3.8.0")
diff --git a/libs/tklog/test/conanfile.py b/libs/tklog/test/conanfile.py
@@ -60,4 +60,4 @@ def package(self):
 
     def requirements(self):
         self.requires("tklog/0.3.3")
-        self.requires("catch2/3.7.1")
+        self.requires("catch2/3.8.0")
diff --git a/libs/tkrng/test/conanfile.py b/libs/tkrng/test/conanfile.py
@@ -60,4 +60,4 @@ def package(self):
 
     def requirements(self):
         self.requires("tkrng/0.3.3")
-        self.requires("catch2/3.7.1")
+        self.requires("catch2/3.8.0")
diff --git a/libs/tktokenswap/test/conanfile.py b/libs/tktokenswap/test/conanfile.py
@@ -61,4 +61,4 @@ def package(self):
     def requirements(self):
         self.requires("tktokenswap/0.3.9")
         self.requires("tkrng/0.3.3@tket/stable")
-        self.requires("catch2/3.7.1")
+        self.requires("catch2/3.8.0")
diff --git a/libs/tkwsm/test/conanfile.py b/libs/tkwsm/test/conanfile.py
@@ -62,4 +62,4 @@ def requirements(self):
         self.requires("tkwsm/0.3.9")
         self.requires("tkassert/0.3.4@tket/stable")
         self.requires("tkrng/0.3.3@tket/stable")
-        self.requires("catch2/3.7.1")
+        self.requires("catch2/3.8.0")
diff --git a/pytket/README.md b/pytket/README.md
@@ -23,7 +23,7 @@ It is also currently necessary to use the local `pybind11_json` recipe, since
 the recipe on the `conan-center` is not yet compatible with conan 2:
 
 ```shell
-conan create recipes/pybind11_json/all --version=0.2.14
+conan create recipes/pybind11_json/all --version=0.2.15
 ```
 
 Then build the pytket module:

diff --git a/pytket/conanfile.py b/pytket/conanfile.py
@@ -38,7 +38,7 @@ def requirements(self):
         self.requires("pybind11_json/0.2.15")
         self.requires("symengine/0.13.0")
         self.requires("tkassert/0.3.4@tket/stable")
-        self.requires("tket/1.3.59@tket/stable")
+        self.requires("tket/1.3.60@tket/stable")
         self.requires("tklog/0.3.3@tket/stable")
         self.requires("tkrng/0.3.3@tket/stable")
         self.requires("tktokenswap/0.3.9@tket/stable")

diff --git a/tket/conanfile.py b/tket/conanfile.py
@@ -23,7 +23,7 @@
 
 class TketConan(ConanFile):
     name = "tket"
-    version = "1.3.59"
+    version = "1.3.60"
     package_type = "library"
     license = "Apache 2"
     homepage = "https://github.com/CQCL/tket"
@@ -121,7 +121,7 @@ def requirements(self):
         self.requires("tktokenswap/0.3.9@tket/stable")
         self.requires("tkwsm/0.3.9@tket/stable")
         if self.build_test():
-            self.test_requires("catch2/3.7.1")
+            self.test_requires("catch2/3.8.0")
         if self.build_proptest():
             self.test_requires("rapidcheck/cci.20230815")