From 7b624cfd906d6bb19fc75347c078a96bf39466f0 Mon Sep 17 00:00:00 2001 From: Alec Edgington Date: Tue, 10 Dec 2024 15:21:21 +0000 Subject: [PATCH 1/3] Remove old versions. --- recipes/pybind11_json/all/conandata.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/recipes/pybind11_json/all/conandata.yml b/recipes/pybind11_json/all/conandata.yml index bbb34dfcf9..37b7667568 100644 --- a/recipes/pybind11_json/all/conandata.yml +++ b/recipes/pybind11_json/all/conandata.yml @@ -2,12 +2,3 @@ sources: "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 From cf27e54d7549cdbebdc17d39e9f959a1682fc1de Mon Sep 17 00:00:00 2001 From: Alec Edgington Date: Tue, 10 Dec 2024 15:22:42 +0000 Subject: [PATCH 2/3] Add 0.2.15. --- recipes/pybind11_json/all/conandata.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/pybind11_json/all/conandata.yml b/recipes/pybind11_json/all/conandata.yml index 37b7667568..a3eeeca982 100644 --- a/recipes/pybind11_json/all/conandata.yml +++ b/recipes/pybind11_json/all/conandata.yml @@ -1,4 +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" From 65ea8b242b1899b9e1acdfed81d6acee11b010f8 Mon Sep 17 00:00:00 2001 From: Alec Edgington Date: Tue, 10 Dec 2024 15:23:23 +0000 Subject: [PATCH 3/3] Use 0.2.15. --- .github/workflows/build-without-conan.yml | 6 +++--- .github/workflows/build_and_test.yml | 12 ++++++------ .github/workflows/linuxbuildwheel | 2 +- .github/workflows/pytket_benchmarking.yml | 2 +- .github/workflows/release.yml | 6 +++--- pytket/conanfile.py | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-without-conan.yml b/.github/workflows/build-without-conan.yml index 9544d442a3..533c68c014 100644 --- a/.github/workflows/build-without-conan.yml +++ b/.github/workflows/build-without-conan.yml @@ -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} .. diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index a870b45a61..d7ed381c99 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/linuxbuildwheel b/.github/workflows/linuxbuildwheel index 1b75adae19..91d0f6f10c 100755 --- a/.github/workflows/linuxbuildwheel +++ b/.github/workflows/linuxbuildwheel @@ -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 diff --git a/.github/workflows/pytket_benchmarking.yml b/.github/workflows/pytket_benchmarking.yml index c9c9293cbf..99714e3b96 100644 --- a/.github/workflows/pytket_benchmarking.yml +++ b/.github/workflows/pytket_benchmarking.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2a675b349e..4beb87c522 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 @@ -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" diff --git a/pytket/conanfile.py b/pytket/conanfile.py index 126fa10d52..5d892a4b2d 100644 --- a/pytket/conanfile.py +++ b/pytket/conanfile.py @@ -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")