From fe3708e3a19806a216bd31cf7611137009d1d399 Mon Sep 17 00:00:00 2001
From: Alec Edgington <alec.edgington@quantinuum.com>
Date: Thu, 14 Dec 2023 10:53:58 +0000
Subject: [PATCH 1/2] Update catch2 to 3.5.0.

---
 .github/workflows/build-without-conan.yml | 6 +++---
 build-without-conan.md                    | 6 +++---
 libs/tkassert/test/conanfile.py           | 2 +-
 libs/tklog/test/conanfile.py              | 2 +-
 libs/tkrng/test/conanfile.py              | 2 +-
 libs/tktokenswap/test/conanfile.py        | 2 +-
 libs/tkwsm/test/conanfile.py              | 2 +-
 tket/conanfile.py                         | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-without-conan.yml b/.github/workflows/build-without-conan.yml
index aff43ee7fe..6508c654ac 100644
--- 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.3.2.tar.gz
-        tar xzvf v3.3.2.tar.gz
-        cd Catch2-3.3.2/
+        wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.5.0.tar.gz
+        tar xzvf v3.5.0.tar.gz
+        cd Catch2-3.5.0/
         mkdir build
         cd build
         cmake -GNinja -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
diff --git a/build-without-conan.md b/build-without-conan.md
index d66ae6b8ed..affe4fdfd7 100644
--- 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.3.2.tar.gz
-tar xzvf v3.3.2.tar.gz
-cd Catch2-3.3.2/
+wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.5.0.tar.gz
+tar xzvf v3.5.0.tar.gz
+cd Catch2-3.5.0/
 mkdir build
 cd build
 cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
diff --git a/libs/tkassert/test/conanfile.py b/libs/tkassert/test/conanfile.py
index 395d89f11c..d5aa278b16 100644
--- 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.3.2")
+        self.requires("catch2/3.5.0")
diff --git a/libs/tklog/test/conanfile.py b/libs/tklog/test/conanfile.py
index 68f90cefc2..414798317e 100644
--- 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.3.2")
+        self.requires("catch2/3.5.0")
diff --git a/libs/tkrng/test/conanfile.py b/libs/tkrng/test/conanfile.py
index c490692260..606348783e 100644
--- 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.3.2")
+        self.requires("catch2/3.5.0")
diff --git a/libs/tktokenswap/test/conanfile.py b/libs/tktokenswap/test/conanfile.py
index 18c548eb1c..98f8d9c651 100644
--- 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.6")
         self.requires("tkrng/0.3.3@tket/stable")
-        self.requires("catch2/3.3.2")
+        self.requires("catch2/3.5.0")
diff --git a/libs/tkwsm/test/conanfile.py b/libs/tkwsm/test/conanfile.py
index 5802b184bc..b51828fc2c 100644
--- a/libs/tkwsm/test/conanfile.py
+++ b/libs/tkwsm/test/conanfile.py
@@ -62,4 +62,4 @@ def requirements(self):
         self.requires("tkwsm/0.3.6")
         self.requires("tkassert/0.3.4@tket/stable")
         self.requires("tkrng/0.3.3@tket/stable")
-        self.requires("catch2/3.3.2")
+        self.requires("catch2/3.5.0")
diff --git a/tket/conanfile.py b/tket/conanfile.py
index d9f9823e8b..2022e00cb9 100644
--- a/tket/conanfile.py
+++ b/tket/conanfile.py
@@ -121,7 +121,7 @@ def requirements(self):
         self.requires("tktokenswap/0.3.6@tket/stable")
         self.requires("tkwsm/0.3.6@tket/stable")
         if self.build_test():
-            self.test_requires("catch2/3.3.2")
+            self.test_requires("catch2/3.5.0")
         if self.build_proptest():
             self.test_requires("rapidcheck/cci.20220514")
 

From e2e99c1e45a8c5cd07874b155237a1503fa3cd54 Mon Sep 17 00:00:00 2001
From: Alec Edgington <alec.edgington@quantinuum.com>
Date: Thu, 14 Dec 2023 10:54:40 +0000
Subject: [PATCH 2/2] Bump tket version.

---
 pytket/conanfile.py | 2 +-
 tket/conanfile.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pytket/conanfile.py b/pytket/conanfile.py
index 6f231d3fd5..1c115d411b 100644
--- a/pytket/conanfile.py
+++ b/pytket/conanfile.py
@@ -32,7 +32,7 @@ def package(self):
         cmake.install()
 
     def requirements(self):
-        self.requires("tket/1.2.74@tket/stable")
+        self.requires("tket/1.2.75@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")
diff --git a/tket/conanfile.py b/tket/conanfile.py
index 2022e00cb9..86a2dbf956 100644
--- a/tket/conanfile.py
+++ b/tket/conanfile.py
@@ -23,7 +23,7 @@
 
 class TketConan(ConanFile):
     name = "tket"
-    version = "1.2.74"
+    version = "1.2.75"
     package_type = "library"
     license = "Apache 2"
     homepage = "https://github.com/CQCL/tket"