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

Jump to bottom

Update to boost 1.85.0 #1381

Merged
merged 2 commits into from
May 7, 2024
Merged

Update to boost 1.85.0 #1381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1a12f8
Update to boost 1.85.0.
cqc-alec May 7, 2024
22e488e
Bump tket version.
cqc-alec May 7, 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
6 changes: 3 additions & 3 deletions .github/workflows/build-without-conan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
- name: Install boost
run: |
cd ${TMP_DIR}
wget -O boost_1_84_0.tar.gz https://sourceforge.net/projects/boost/files/boost/1.84.0/boost_1_84_0.tar.gz/download
tar xzvf boost_1_84_0.tar.gz
cd boost_1_84_0/
wget -O boost_1_85_0.tar.gz https://sourceforge.net/projects/boost/files/boost/1.85.0/boost_1_85_0.tar.gz/download
tar xzvf boost_1_85_0.tar.gz
cd boost_1_85_0/
./bootstrap.sh --prefix=${INSTALL_DIR}
./b2
./b2 install
Expand Down
6 changes: 3 additions & 3 deletions build-without-conan.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ The versions should match the current requirements as specified in the relevant

```
cd ${TMP_DIR}
wget -O boost_1_84_0.tar.gz https://sourceforge.net/projects/boost/files/boost/1.84.0/boost_1_84_0.tar.gz/download
tar xzvf boost_1_84_0.tar.gz
cd boost_1_84_0/
wget -O boost_1_85_0.tar.gz https://sourceforge.net/projects/boost/files/boost/1.85.0/boost_1_85_0.tar.gz/download
tar xzvf boost_1_85_0.tar.gz
cd boost_1_85_0/
./bootstrap.sh --prefix=${INSTALL_DIR}
./b2
./b2 install
Expand Down
6 changes: 3 additions & 3 deletions pytket/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ def package(self):
cmake.install()

def requirements(self):
self.requires("tket/1.2.121@tket/stable")
self.requires("tket/1.2.122@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.7@tket/stable")
self.requires("tktokenswap/0.3.7@tket/stable")
self.requires("tkwsm/0.3.8@tket/stable")
self.requires("tktokenswap/0.3.8@tket/stable")
self.requires("symengine/0.11.2")
self.requires("gmp/6.3.0")
self.requires("pybind11/2.12.0")
Expand Down
8 changes: 4 additions & 4 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.121"
version = "1.2.122"
package_type = "library"
license = "Apache 2"
homepage = "https://github.com/CQCL/tket"
Expand Down Expand Up @@ -111,15 +111,15 @@ def package_info(self):
def requirements(self):
# libraries installed from remote:
# https://quantinuumsw.jfrog.io/artifactory/api/conan/tket1-libs
self.requires("boost/1.84.0", transitive_headers=True)
self.requires("boost/1.85.0", transitive_headers=True)
self.requires("symengine/0.11.2", transitive_headers=True)
self.requires("eigen/3.4.0", transitive_headers=True)
self.requires("nlohmann_json/3.11.3", transitive_headers=True)
self.requires("tklog/0.3.3@tket/stable")
self.requires("tkassert/0.3.4@tket/stable", transitive_headers=True)
self.requires("tkrng/0.3.3@tket/stable")
self.requires("tktokenswap/0.3.7@tket/stable")
self.requires("tkwsm/0.3.7@tket/stable")
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")
if self.build_proptest():
Expand Down
Loading