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.

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 to pybind11-json 0.2.15 #1717

Merged
merged 3 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ jobs:
- name: Install pybind11_json
run: |
cd ${TMP_DIR}
wget https://github.com/pybind/pybind11_json/archive/refs/tags/0.2.14.tar.gz
tar xzvf 0.2.14.tar.gz
cd pybind11_json-0.2.14/
wget https://github.com/pybind/pybind11_json/archive/refs/tags/0.2.15.tar.gz
tar xzvf 0.2.15.tar.gz
cd pybind11_json-0.2.15/
mkdir build
cd build
cmake -GNinja -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,14 @@ jobs:
- name: Install pytket requirements
run: |
conan create recipes/pybind11
conan create recipes/pybind11_json/all --version 0.2.14
conan create recipes/pybind11_json/all --version 0.2.15
- name: check that version is consistent
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
run: ./.github/workflows/check-tket-reqs ${{ needs.check_changes.outputs.tket_ver }}
- name: Install pytket requirements
run: |
conan create recipes/pybind11
conan create recipes/pybind11_json/all --version 0.2.14
conan create recipes/pybind11_json/all --version 0.2.15
- name: Set up Python (pull request)
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
uses: actions/setup-python@v5
Expand Down Expand Up @@ -381,14 +381,14 @@ jobs:
- name: Install pytket requirements
run: |
conan create recipes/pybind11
conan create recipes/pybind11_json/all --version 0.2.14
conan create recipes/pybind11_json/all --version 0.2.15
- name: check that version is consistent
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
run: ./.github/workflows/check-tket-reqs ${{ needs.check_changes.outputs.tket_ver }}
- name: Install pytket requirements
run: |
conan create recipes/pybind11
conan create recipes/pybind11_json/all --version 0.2.14
conan create recipes/pybind11_json/all --version 0.2.15
- name: Set up Python (pull request)
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
uses: actions/setup-python@v5
Expand Down Expand Up @@ -513,14 +513,14 @@ jobs:
- name: Install pytket requirements
run: |
conan create recipes/pybind11
conan create recipes/pybind11_json/all --version 0.2.14
conan create recipes/pybind11_json/all --version 0.2.15
- name: check that version is consistent
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
run: ./.github/workflows/check-tket-reqs ${{ needs.check_changes.outputs.tket_ver }}
- name: Install pytket requirements
run: |
conan create recipes/pybind11
conan create recipes/pybind11_json/all --version 0.2.14
conan create recipes/pybind11_json/all --version 0.2.15
- name: Set up Python 3.10
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
uses: actions/setup-python@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linuxbuildwheel
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ mkdir /tket/pytket/audited

# Install pybind11 and pybind11_json
${CONAN_CMD} create recipes/pybind11
${CONAN_CMD} create recipes/pybind11_json/all --version 0.2.14
${CONAN_CMD} create recipes/pybind11_json/all --version 0.2.15

# build pytket
cd pytket
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytket_benchmarking.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Build wheel
run: |
conan create recipes/pybind11
conan create recipes/pybind11_json/all --version 0.2.14
conan create recipes/pybind11_json/all --version 0.2.15
cd pytket
# Ensure wheels are compatible with MacOS 12.0 and later:
export WHEEL_PLAT_NAME=macosx_12_0_arm64
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
- name: Build wheel
run: |
conan create recipes/pybind11
conan create recipes/pybind11_json/all --version 0.2.14
conan create recipes/pybind11_json/all --version 0.2.15
cd pytket
# Ensure wheels are compatible with MacOS 13.0 and later:
export WHEEL_PLAT_NAME=macosx_13_0_x86_64
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
- name: Build wheel
run: |
conan create recipes/pybind11
conan create recipes/pybind11_json/all --version 0.2.14
conan create recipes/pybind11_json/all --version 0.2.15
cd pytket
# Ensure wheels are compatible with MacOS 13.0 and later:
export WHEEL_PLAT_NAME=macosx_13_0_arm64
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
- name: Build wheel
run: |
conan create recipes/pybind11
conan create recipes/pybind11_json/all --version 0.2.14
conan create recipes/pybind11_json/all --version 0.2.15
cd pytket
python -m pip install -U pip build
python -m build --outdir "${{ github.workspace }}/wheelhouse"
Expand Down
2 changes: 1 addition & 1 deletion pytket/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def requirements(self):
self.requires("gmp/6.3.0")
self.requires("nlohmann_json/3.11.3")
self.requires("pybind11/2.13.6")
self.requires("pybind11_json/0.2.14")
self.requires("pybind11_json/0.2.15")
self.requires("symengine/0.13.0")
self.requires("tkassert/0.3.4@tket/stable")
self.requires("tket/1.3.55@tket/stable")
Expand Down
12 changes: 3 additions & 9 deletions recipes/pybind11_json/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
sources:
"0.2.15":
url: "https://github.com/pybind/pybind11_json/archive/0.2.15.tar.gz"
sha256: "9a4a1494549a2db27bc4c5a16743a5c88ebc18e13c73019c56f399ae0310baf2"
"0.2.14":
url: "https://github.com/pybind/pybind11_json/archive/0.2.14.tar.gz"
sha256: "bc4ad7e308add59886a961c21f3ba431e43fe7faa2ef5bd9925c66d042d28cde"
"0.2.13":
url: "https://github.com/pybind/pybind11_json/archive/0.2.13.tar.gz"
sha256: "6b12ddb4930a3135322890318fc15c4a69134f21120ea82163827c11411107a3"
"0.2.12":
url: "https://github.com/pybind/pybind11_json/archive/0.2.12.tar.gz"
sha256: "a9e308d4cf3de16d192cd0baf641bfe17a3a3046e8652e6724204afa3e736db7"
"0.2.11":
sha256: 7fbf30c2f184decf3987f4e177d0fb29a72adc86160e43907b18f0d93c935b36
url: https://github.com/pybind/pybind11_json/archive/refs/tags/0.2.11.tar.gz
Loading