From 3a1eddab54e48bd80cc167c242bc1d9f537498c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 16 Jan 2022 21:47:58 -0500 Subject: [PATCH 1/2] chore(deps): bump jwlawson/actions-setup-cmake from 1.11 to 1.12 (#3625) Bumps [jwlawson/actions-setup-cmake](https://github.com/jwlawson/actions-setup-cmake) from 1.11 to 1.12. - [Release notes](https://github.com/jwlawson/actions-setup-cmake/releases) - [Commits](https://github.com/jwlawson/actions-setup-cmake/compare/v1.11...v1.12) --- updated-dependencies: - dependency-name: jwlawson/actions-setup-cmake dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/configure.yml | 2 +- .github/workflows/upstream.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c56e4003b..6e0ffa63a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,7 +78,7 @@ jobs: run: brew install boost - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.11 + uses: jwlawson/actions-setup-cmake@v1.12 - name: Cache wheels if: runner.os == 'macOS' @@ -216,7 +216,7 @@ jobs: debug: ${{ matrix.python-debug }} - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.11 + uses: jwlawson/actions-setup-cmake@v1.12 - name: Valgrind cache if: matrix.valgrind @@ -471,7 +471,7 @@ jobs: run: python3 -m pip install --upgrade pip - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.11 + uses: jwlawson/actions-setup-cmake@v1.12 - name: Configure shell: bash @@ -762,7 +762,7 @@ jobs: architecture: x86 - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.11 + uses: jwlawson/actions-setup-cmake@v1.12 - name: Prepare MSVC uses: ilammy/msvc-dev-cmd@v1.10.0 @@ -809,7 +809,7 @@ jobs: python-version: ${{ matrix.python }} - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.11 + uses: jwlawson/actions-setup-cmake@v1.12 - name: Prepare MSVC uses: ilammy/msvc-dev-cmd@v1.10.0 @@ -868,7 +868,7 @@ jobs: python-version: ${{ matrix.python }} - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.11 + uses: jwlawson/actions-setup-cmake@v1.12 - name: Prepare env run: | diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml index d60025e5c..66ab0e3d7 100644 --- a/.github/workflows/configure.yml +++ b/.github/workflows/configure.yml @@ -55,7 +55,7 @@ jobs: # An action for adding a specific version of CMake: # https://github.com/jwlawson/actions-setup-cmake - name: Setup CMake ${{ matrix.cmake }} - uses: jwlawson/actions-setup-cmake@v1.11 + uses: jwlawson/actions-setup-cmake@v1.12 with: cmake-version: ${{ matrix.cmake }} diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml index 654947425..138c9ad29 100644 --- a/.github/workflows/upstream.yml +++ b/.github/workflows/upstream.yml @@ -31,7 +31,7 @@ jobs: run: sudo apt-get install libboost-dev - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.11 + uses: jwlawson/actions-setup-cmake@v1.12 - name: Prepare env run: | From 9ec1128c7aac3d069a4ec2bd1dfc7f57c6526d1c Mon Sep 17 00:00:00 2001 From: Nimrod Date: Wed, 19 Jan 2022 15:22:42 +0800 Subject: [PATCH 2/2] Fix typo in doc (#3628) --- docs/advanced/functions.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/advanced/functions.rst b/docs/advanced/functions.rst index ea9f35223..d37b8ecab 100644 --- a/docs/advanced/functions.rst +++ b/docs/advanced/functions.rst @@ -120,7 +120,7 @@ targeted arguments can be passed through the :class:`cpp_function` constructor: .. code-block:: cpp class_(m, "MyClass") - .def_property("data" + .def_property("data", py::cpp_function(&MyClass::getData, py::return_value_policy::copy), py::cpp_function(&MyClass::setData) );