Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update versions of catch2 and rapidcheck. #1190

Merged
merged 5 commits into from
Jan 5, 2024
Merged

Update versions of catch2 and rapidcheck. #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c2d3538
Update to catch2 3.5.1.
cqc-alec Jan 2, 2024
6727368
Bump tket version.
cqc-alec Jan 3, 2024
9867c43
Bump rapidcheck version.
cqc-alec Jan 3, 2024
dbce135
Merge branch 'develop' into feature/catch2-3.5.1
cqc-alec Jan 5, 2024
cc9020d
Bump tket version.
cqc-alec Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build-without-conan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ jobs:
- name: Install catch2
run: |
cd ${TMP_DIR}
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/
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/
mkdir build
cd build
cmake -GNinja -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
Expand All @@ -85,9 +85,9 @@ jobs:
- name: Install rapidcheck
run: |
cd ${TMP_DIR}
wget https://github.com/emil-e/rapidcheck/archive/8fafda42e732164db58003e542196e94a28481f9.zip
unzip 8fafda42e732164db58003e542196e94a28481f9.zip
cd rapidcheck-8fafda42e732164db58003e542196e94a28481f9/
wget https://github.com/emil-e/rapidcheck/archive/1c91f40e64d87869250cfb610376c629307bf77d.zip
unzip 1c91f40e64d87869250cfb610376c629307bf77d.zip
cd rapidcheck-1c91f40e64d87869250cfb610376c629307bf77d/
mkdir build
cd build
cmake -GNinja -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
Expand Down
12 changes: 6 additions & 6 deletions build-without-conan.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ cmake --install .

```
cd ${TMP_DIR}
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/
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/
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
Expand All @@ -105,9 +105,9 @@ cmake --install .

```
cd ${TMP_DIR}
wget https://github.com/emil-e/rapidcheck/archive/8fafda42e732164db58003e542196e94a28481f9.zip
unzip 8fafda42e732164db58003e542196e94a28481f9.zip
cd rapidcheck-8fafda42e732164db58003e542196e94a28481f9/
wget https://github.com/emil-e/rapidcheck/archive/1c91f40e64d87869250cfb610376c629307bf77d.zip
unzip 1c91f40e64d87869250cfb610376c629307bf77d.zip
cd rapidcheck-1c91f40e64d87869250cfb610376c629307bf77d/
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
Expand Down
2 changes: 1 addition & 1 deletion libs/tkassert/test/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ def package(self):

def requirements(self):
self.requires("tkassert/0.3.4")
self.requires("catch2/3.5.0")
self.requires("catch2/3.5.1")
2 changes: 1 addition & 1 deletion libs/tklog/test/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ def package(self):

def requirements(self):
self.requires("tklog/0.3.3")
self.requires("catch2/3.5.0")
self.requires("catch2/3.5.1")
2 changes: 1 addition & 1 deletion libs/tkrng/test/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ def package(self):

def requirements(self):
self.requires("tkrng/0.3.3")
self.requires("catch2/3.5.0")
self.requires("catch2/3.5.1")
2 changes: 1 addition & 1 deletion libs/tktokenswap/test/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0")
self.requires("catch2/3.5.1")
2 changes: 1 addition & 1 deletion libs/tkwsm/test/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0")
self.requires("catch2/3.5.1")
2 changes: 1 addition & 1 deletion pytket/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def package(self):
cmake.install()

def requirements(self):
self.requires("tket/1.2.79@tket/stable")
self.requires("tket/1.2.80@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")
Expand Down
6 changes: 3 additions & 3 deletions tket/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

class TketConan(ConanFile):
name = "tket"
version = "1.2.79"
version = "1.2.80"
package_type = "library"
license = "Apache 2"
homepage = "https://github.com/CQCL/tket"
Expand Down Expand Up @@ -121,9 +121,9 @@ 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.0")
self.test_requires("catch2/3.5.1")
if self.build_proptest():
self.test_requires("rapidcheck/cci.20220514")
self.test_requires("rapidcheck/cci.20230815")

def build_test(self):
return self.options.with_test or self.options.with_all_tests
Expand Down
Loading