Merge branch 'main' into CalMacCQ-patch-1

CQCL · Aug 16, 2024 · f76035a · f76035a
2 parents a986248 + 1db5d73
commit f76035a
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 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.6.0.tar.gz
-        tar xzvf v3.6.0.tar.gz
-        cd Catch2-3.6.0/
+        wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.7.0.tar.gz
+        tar xzvf v3.7.0.tar.gz
+        cd Catch2-3.7.0/
         mkdir build
         cd build
         cmake -GNinja -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
@@ -96,9 +96,9 @@ jobs:
     - name: Install pybind11
       run: |
         cd ${TMP_DIR}
-        wget https://github.com/pybind/pybind11/archive/refs/tags/v2.13.3.tar.gz
-        tar xzvf v2.13.3.tar.gz
-        cd pybind11-2.13.3/
+        wget https://github.com/pybind/pybind11/archive/refs/tags/v2.13.4.tar.gz
+        tar xzvf v2.13.4.tar.gz
+        cd pybind11-2.13.4/
         mkdir build
         cd build
         cmake -GNinja -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DPYBIND11_TEST=OFF ..

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.6.0.tar.gz
-tar xzvf v3.6.0.tar.gz
-cd Catch2-3.6.0/
+wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.7.0.tar.gz
+tar xzvf v3.7.0.tar.gz
+cd Catch2-3.7.0/
 mkdir build
 cd build
 cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
@@ -119,9 +119,9 @@ cmake --install .
 
 ```
 cd ${TMP_DIR}
-wget https://github.com/pybind/pybind11/archive/refs/tags/v2.13.3.tar.gz
-tar xzvf v2.13.3.tar.gz
-cd pybind11-2.13.3/
+wget https://github.com/pybind/pybind11/archive/refs/tags/v2.13.4.tar.gz
+tar xzvf v2.13.4.tar.gz
+cd pybind11-2.13.4/
 mkdir build
 cd build
 cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DPYBIND11_TEST=OFF ..

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.6.0")
+        self.requires("catch2/3.7.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.6.0")
+        self.requires("catch2/3.7.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.6.0")
+        self.requires("catch2/3.7.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.8")
         self.requires("tkrng/0.3.3@tket/stable")
-        self.requires("catch2/3.6.0")
+        self.requires("catch2/3.7.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.8")
         self.requires("tkassert/0.3.4@tket/stable")
         self.requires("tkrng/0.3.3@tket/stable")
-        self.requires("catch2/3.6.0")
+        self.requires("catch2/3.7.0")
diff --git a/pytket/conanfile.py b/pytket/conanfile.py
@@ -32,14 +32,14 @@ def package(self):
         cmake.install()
 
     def requirements(self):
-        self.requires("tket/1.3.18@tket/stable")
+        self.requires("tket/1.3.19@tket/stable")
         self.requires("tklog/0.3.3@tket/stable")
         self.requires("tkrng/0.3.3@tket/stable")
         self.requires("tkassert/0.3.4@tket/stable")
         self.requires("tkwsm/0.3.8@tket/stable")
         self.requires("tktokenswap/0.3.8@tket/stable")
         self.requires("symengine/0.12.0")
         self.requires("gmp/6.3.0")
-        self.requires("pybind11/2.13.3")
+        self.requires("pybind11/2.13.4")
         self.requires("nlohmann_json/3.11.3")
         self.requires("pybind11_json/0.2.14")
diff --git a/recipes/pybind11/conanfile.py b/recipes/pybind11/conanfile.py
@@ -21,7 +21,7 @@
 
 class PyBind11Conan(ConanFile):
     name = "pybind11"
-    version = "2.13.3"
+    version = "2.13.4"
     description = "Seamless operability between C++11 and Python"
     topics = "pybind11", "python", "binding"
     homepage = "https://github.com/pybind/pybind11"

diff --git a/recipes/pybind11_json/all/conanfile.py b/recipes/pybind11_json/all/conanfile.py
@@ -29,7 +29,7 @@ def package_id(self):
 
     def requirements(self):
         self.requires("nlohmann_json/3.11.3")
-        self.requires("pybind11/2.13.3")
+        self.requires("pybind11/2.13.4")
 
     def source(self):
         get(

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