Update to pybind11_json 0.2.14 (#1389)

CQCL · May 14, 2024 · aafcd59 · aafcd59
1 parent fede38d
commit aafcd59
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 24 deletions.
diff --git 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.13.tar.gz
-        tar xzvf 0.2.13.tar.gz
-        cd pybind11_json-0.2.13/
+        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/
         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
@@ -257,7 +257,7 @@ jobs:
     - name: Install pytket requirements
       run: |
         conan create recipes/pybind11
-        conan create recipes/pybind11_json/all --version 0.2.13
+        conan create recipes/pybind11_json/all --version 0.2.14
     - name: Set up Python (pull request)
       if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
       uses: actions/setup-python@v5
@@ -370,7 +370,7 @@ jobs:
     - name: Install pytket requirements
       run: |
         conan create recipes/pybind11
-        conan create recipes/pybind11_json/all --version 0.2.13
+        conan create recipes/pybind11_json/all --version 0.2.14
     - name: Set up Python (pull request)
       if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
       uses: actions/setup-python@v5
@@ -490,7 +490,7 @@ jobs:
     - name: Install pytket requirements
       run: |
         conan create recipes/pybind11
-        conan create recipes/pybind11_json/all --version 0.2.13
+        conan create recipes/pybind11_json/all --version 0.2.14
     - 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
@@ -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.13
+${CONAN_CMD} create recipes/pybind11_json/all --version 0.2.14
 
 # build pytket
 cd pytket

diff --git a/.github/workflows/pytket_benchmarking.yml b/.github/workflows/pytket_benchmarking.yml
@@ -42,7 +42,7 @@ jobs:
     - name: Build wheel
       run: |
         conan create recipes/pybind11
-        conan create recipes/pybind11_json/all --version 0.2.13
+        conan create recipes/pybind11_json/all --version 0.2.14
         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
@@ -92,7 +92,7 @@ jobs:
     - name: Build wheel
       run: |
         conan create recipes/pybind11
-        conan create recipes/pybind11_json/all --version 0.2.13
+        conan create recipes/pybind11_json/all --version 0.2.14
         cd pytket
         # Ensure wheels are compatible with MacOS 12.0 and later:
         export WHEEL_PLAT_NAME=macosx_12_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.13
+        conan create recipes/pybind11_json/all --version 0.2.14
         cd pytket
         # Ensure wheels are compatible with MacOS 12.0 and later:
         export WHEEL_PLAT_NAME=macosx_12_0_arm64
@@ -179,7 +179,7 @@ jobs:
     - name: Build wheel
       run: |
         conan create recipes/pybind11
-        conan create recipes/pybind11_json/all --version 0.2.13
+        conan create recipes/pybind11_json/all --version 0.2.14
         cd pytket
         python -m pip install -U pip build
         python -m build --outdir "${{ github.workspace }}/wheelhouse"

diff --git a/build-without-conan.md b/build-without-conan.md
@@ -133,9 +133,9 @@ cmake --install .
 
 ```
 cd ${TMP_DIR}
-wget https://github.com/pybind/pybind11_json/archive/refs/tags/0.2.13.tar.gz
-tar xzvf 0.2.13.tar.gz
-cd pybind11_json-0.2.13/
+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/
 mkdir build
 cd build
 cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..

diff --git a/nix-support/third-party-python-packages.nix b/nix-support/third-party-python-packages.nix
@@ -4,8 +4,8 @@ self: super: {
     src = super.fetchFromGitHub {
       owner = "pybind";
       repo = "pybind11_json";
-      rev = "0.2.13";
-      sha256 = "sha256:Kl/QflV2bBoH72/LW03K8JDlhBF+DYYXL47A5s1nmTw=";
+      rev = "0.2.14";
+      sha256 = "sha256-6L675DsfafzRv0mRR3b0eUFFjUpll3jCPoBAAffk7U0=";
     };
     nativeBuildInputs = [ super.cmake ];
     buildInputs = [ super.python3Packages.pybind11 super.nlohmann_json ];

diff --git a/pytket/CMakeLists.txt b/pytket/CMakeLists.txt
@@ -61,10 +61,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
     # remove -Wno-deprecated-declarations once https://github.com/boostorg/boost/issues/688 is resolved
 endif()
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    # Suppress warnings coming from headers in pybind11_json/0.2.13:
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-redundant-move")
-endif()
 
 if (UNIX)
     # Allow binder libraries to load other shared libraries from same directory.

diff --git a/pytket/README.md b/pytket/README.md
@@ -23,7 +23,7 @@ It is also currently necessary to use the local `pybind11_json` recipe, since
 the recipe on the `conan-center` is not yet compatible with conan 2:
 
 ```shell
-conan create recipes/pybind11_json/all --version=0.2.13
+conan create recipes/pybind11_json/all --version=0.2.14
 ```
 
 Then build the pytket module:

diff --git 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.123@tket/stable")
+        self.requires("tket/1.2.124@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")
@@ -42,4 +42,4 @@ def requirements(self):
         self.requires("gmp/6.3.0")
         self.requires("pybind11/2.12.0")
         self.requires("nlohmann_json/3.11.3")
-        self.requires("pybind11_json/0.2.13")
+        self.requires("pybind11_json/0.2.14")
diff --git a/recipes/pybind11_json/all/conandata.yml b/recipes/pybind11_json/all/conandata.yml
@@ -1,4 +1,7 @@
 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"

diff --git a/recipes/pybind11_json/config.yml b/recipes/pybind11_json/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "0.2.14":
+    folder: all
   "0.2.13":
     folder: all
   "0.2.12":

diff --git a/tket/conanfile.py b/tket/conanfile.py
@@ -23,7 +23,7 @@
 
 class TketConan(ConanFile):
     name = "tket"
-    version = "1.2.123"
+    version = "1.2.124"
     package_type = "library"
     license = "Apache 2"
     homepage = "https://github.com/CQCL/tket"