Skip to content

Commit 47422c5

Browse files
committed
Merge branch 'master' into sh_merge_master
2 parents 35cb542 + 8b48ff8 commit 47422c5

File tree

7 files changed

+34
-17
lines changed

7 files changed

+34
-17
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ updates:
99
actions:
1010
patterns:
1111
- "*"
12+
ignore:
13+
- dependency-name: actions/checkout
14+
versions:
15+
- "<5"

.github/workflows/ci.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ jobs:
8787
run: brew install boost
8888

8989
- name: Update CMake
90-
uses: jwlawson/actions-setup-cmake@v1.14
90+
uses: jwlawson/actions-setup-cmake@v2.0
9191

9292
- name: Cache wheels
9393
if: runner.os == 'macOS'
94-
uses: actions/cache@v3
94+
uses: actions/cache@v4
9595
with:
9696
# This path is specific to macOS - we really only need it for PyPy NumPy wheels
9797
# See https://github.com/actions/cache/blob/master/examples.md#python---pip
@@ -215,11 +215,11 @@ jobs:
215215
debug: ${{ matrix.python-debug }}
216216

217217
- name: Update CMake
218-
uses: jwlawson/actions-setup-cmake@v1.14
218+
uses: jwlawson/actions-setup-cmake@v2.0
219219

220220
- name: Valgrind cache
221221
if: matrix.valgrind
222-
uses: actions/cache@v3
222+
uses: actions/cache@v4
223223
id: cache-valgrind
224224
with:
225225
path: valgrind
@@ -485,7 +485,7 @@ jobs:
485485
run: python3 -m pip install --upgrade pip
486486

487487
- name: Update CMake
488-
uses: jwlawson/actions-setup-cmake@v1.14
488+
uses: jwlawson/actions-setup-cmake@v2.0
489489

490490
- name: Configure
491491
shell: bash
@@ -530,8 +530,6 @@ jobs:
530530
# Testing on ICC using the oneAPI apt repo
531531
icc:
532532
runs-on: ubuntu-20.04
533-
strategy:
534-
fail-fast: false
535533

536534
name: "🐍 3 • ICC latest • x64"
537535

@@ -798,7 +796,7 @@ jobs:
798796
architecture: x86
799797

800798
- name: Update CMake
801-
uses: jwlawson/actions-setup-cmake@v1.14
799+
uses: jwlawson/actions-setup-cmake@v2.0
802800

803801
- name: Prepare MSVC
804802
uses: ilammy/msvc-dev-cmd@v1.13.0
@@ -851,7 +849,7 @@ jobs:
851849
architecture: x86
852850

853851
- name: Update CMake
854-
uses: jwlawson/actions-setup-cmake@v1.14
852+
uses: jwlawson/actions-setup-cmake@v2.0
855853

856854
- name: Prepare MSVC
857855
uses: ilammy/msvc-dev-cmd@v1.13.0
@@ -902,7 +900,7 @@ jobs:
902900
python3 -m pip install -r tests/requirements.txt
903901
904902
- name: Update CMake
905-
uses: jwlawson/actions-setup-cmake@v1.14
903+
uses: jwlawson/actions-setup-cmake@v2.0
906904

907905
- name: Configure C++20
908906
run: >
@@ -1066,7 +1064,7 @@ jobs:
10661064
python-version: ${{ matrix.python }}
10671065

10681066
- name: Update CMake
1069-
uses: jwlawson/actions-setup-cmake@v1.14
1067+
uses: jwlawson/actions-setup-cmake@v2.0
10701068

10711069
- name: Install ninja-build tool
10721070
uses: seanmiddleditch/gha-setup-ninja@v4
@@ -1136,7 +1134,7 @@ jobs:
11361134
run: clang++ --version
11371135

11381136
- name: Update CMake
1139-
uses: jwlawson/actions-setup-cmake@v1.14
1137+
uses: jwlawson/actions-setup-cmake@v2.0
11401138

11411139
- name: Run pip installs
11421140
run: |

.github/workflows/configure.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
# An action for adding a specific version of CMake:
6565
# https://github.com/jwlawson/actions-setup-cmake
6666
- name: Setup CMake ${{ matrix.cmake }}
67-
uses: jwlawson/actions-setup-cmake@v1.14
67+
uses: jwlawson/actions-setup-cmake@v2.0
6868
with:
6969
cmake-version: ${{ matrix.cmake }}
7070

.github/workflows/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
python-version: "3.x"
3333
- name: Add matchers
3434
run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/matchers/pylint.json"
35-
- uses: pre-commit/action@v3.0.0
35+
- uses: pre-commit/action@v3.0.1
3636
with:
3737
# Slow hooks are marked with manual - slow is okay here, run them too
3838
extra_args: --hook-stage manual --all-files

.github/workflows/upstream.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
run: sudo apt-get install libboost-dev
3737

3838
- name: Update CMake
39-
uses: jwlawson/actions-setup-cmake@v1.14
39+
uses: jwlawson/actions-setup-cmake@v2.0
4040

4141
- name: Run pip installs
4242
run: |

.pre-commit-config.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ repos:
3232

3333
# Ruff, the Python auto-correcting linter/formatter written in Rust
3434
- repo: https://github.com/astral-sh/ruff-pre-commit
35-
rev: v0.1.9
35+
rev: v0.2.0
3636
hooks:
3737
- id: ruff
3838
args: ["--fix", "--show-fixes"]
@@ -95,7 +95,7 @@ repos:
9595

9696
# Avoid directional quotes
9797
- repo: https://github.com/sirosen/texthooks
98-
rev: "0.6.3"
98+
rev: "0.6.4"
9999
hooks:
100100
- id: fix-ligatures
101101
- id: fix-smartquotes
@@ -148,3 +148,10 @@ repos:
148148
hooks:
149149
- id: pylint
150150
files: ^pybind11
151+
152+
- repo: https://github.com/python-jsonschema/check-jsonschema
153+
rev: 0.28.0
154+
hooks:
155+
- id: check-readthedocs
156+
- id: check-github-workflows
157+
- id: check-dependabot

docs/compiling.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,3 +639,11 @@ cross-project dependency management. Additionally, it is able to autogenerate
639639
customizable pybind11-based wrappers by parsing C++ header files.
640640

641641
.. [robotpy-build] https://robotpy-build.readthedocs.io
642+
643+
[litgen]_ is an automatic python bindings generator with a focus on generating
644+
documented and discoverable bindings: bindings will nicely reproduce the documentation
645+
found in headers. It is is based on srcML (srcml.org), a highly scalable, multi-language
646+
parsing tool with a developer centric approach. The API that you want to expose to python
647+
must be C++14 compatible (but your implementation can use more modern constructs).
648+
649+
.. [litgen] https://pthom.github.io/litgen

0 commit comments

Comments
 (0)