From e7f487d69605182bf07d567da936c42f2c6ba9d1 Mon Sep 17 00:00:00 2001 From: Alec Edgington Date: Thu, 18 Jan 2024 15:30:39 +0000 Subject: [PATCH 1/2] Update to catch2 3.5.2. --- .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 4c60023946..edcfba3a3f 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.5.1.tar.gz - tar xzvf v3.5.1.tar.gz - cd Catch2-3.5.1/ + wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.5.2.tar.gz + tar xzvf v3.5.2.tar.gz + cd Catch2-3.5.2/ mkdir build cd build cmake -GNinja -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} .. diff --git a/build-without-conan.md b/build-without-conan.md index 5f9b4b5c62..3ea0a2908a 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.5.1.tar.gz -tar xzvf v3.5.1.tar.gz -cd Catch2-3.5.1/ +wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.5.2.tar.gz +tar xzvf v3.5.2.tar.gz +cd Catch2-3.5.2/ 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 867a9e7861..498c921f81 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.5.1") + self.requires("catch2/3.5.2") diff --git a/libs/tklog/test/conanfile.py b/libs/tklog/test/conanfile.py index 7c5a7eff22..9d1596c24b 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.5.1") + self.requires("catch2/3.5.2") diff --git a/libs/tkrng/test/conanfile.py b/libs/tkrng/test/conanfile.py index 9715a6840a..025d26376b 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.5.1") + self.requires("catch2/3.5.2") diff --git a/libs/tktokenswap/test/conanfile.py b/libs/tktokenswap/test/conanfile.py index a8d4b316a3..865e8080bd 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.5.1") + self.requires("catch2/3.5.2") diff --git a/libs/tkwsm/test/conanfile.py b/libs/tkwsm/test/conanfile.py index 84c60d0c90..da4850bf1a 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.5.1") + self.requires("catch2/3.5.2") diff --git a/tket/conanfile.py b/tket/conanfile.py index 98f4ac9285..c6741be280 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.5.1") + self.test_requires("catch2/3.5.2") if self.build_proptest(): self.test_requires("rapidcheck/cci.20230815") From bcf908c04c090012de567311379e33ade9b33853 Mon Sep 17 00:00:00 2001 From: Alec Edgington Date: Thu, 18 Jan 2024 15:31:22 +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 352e0785b4..2c47955011 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.86@tket/stable") + self.requires("tket/1.2.87@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 c6741be280..9bc611d7ec 100644 --- a/tket/conanfile.py +++ b/tket/conanfile.py @@ -23,7 +23,7 @@ class TketConan(ConanFile): name = "tket" - version = "1.2.86" + version = "1.2.87" package_type = "library" license = "Apache 2" homepage = "https://github.com/CQCL/tket"