aboutsummaryrefslogtreecommitdiffstats
path: root/3rdparty/pybind11/.github
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/pybind11/.github')
-rw-r--r--3rdparty/pybind11/.github/CODEOWNERS9
-rw-r--r--3rdparty/pybind11/.github/CONTRIBUTING.md103
-rw-r--r--3rdparty/pybind11/.github/ISSUE_TEMPLATE/bug-report.yml45
-rw-r--r--3rdparty/pybind11/.github/ISSUE_TEMPLATE/config.yml3
-rw-r--r--3rdparty/pybind11/.github/dependabot.yml4
-rw-r--r--3rdparty/pybind11/.github/pull_request_template.md7
-rw-r--r--3rdparty/pybind11/.github/workflows/ci.yml688
-rw-r--r--3rdparty/pybind11/.github/workflows/configure.yml16
-rw-r--r--3rdparty/pybind11/.github/workflows/format.yml23
-rw-r--r--3rdparty/pybind11/.github/workflows/pip.yml39
-rw-r--r--3rdparty/pybind11/.github/workflows/upstream.yml112
11 files changed, 793 insertions, 256 deletions
diff --git a/3rdparty/pybind11/.github/CODEOWNERS b/3rdparty/pybind11/.github/CODEOWNERS
new file mode 100644
index 00000000..4e2c6690
--- /dev/null
+++ b/3rdparty/pybind11/.github/CODEOWNERS
@@ -0,0 +1,9 @@
+*.cmake @henryiii
+CMakeLists.txt @henryiii
+*.yml @henryiii
+*.yaml @henryiii
+/tools/ @henryiii
+/pybind11/ @henryiii
+noxfile.py @henryiii
+.clang-format @henryiii
+.clang-tidy @henryiii
diff --git a/3rdparty/pybind11/.github/CONTRIBUTING.md b/3rdparty/pybind11/.github/CONTRIBUTING.md
index 4ced21ba..00b1fea4 100644
--- a/3rdparty/pybind11/.github/CONTRIBUTING.md
+++ b/3rdparty/pybind11/.github/CONTRIBUTING.md
@@ -53,6 +53,33 @@ derivative works thereof, in binary and source code form.
## Development of pybind11
+### Quick setup
+
+To setup a quick development environment, use [`nox`](https://nox.thea.codes).
+This will allow you to do some common tasks with minimal setup effort, but will
+take more time to run and be less flexible than a full development environment.
+If you use [`pipx run nox`](https://pipx.pypa.io), you don't even need to
+install `nox`. Examples:
+
+```bash
+# List all available sessions
+nox -l
+
+# Run linters
+nox -s lint
+
+# Run tests on Python 3.9
+nox -s tests-3.9
+
+# Build and preview docs
+nox -s docs -- serve
+
+# Build SDists and wheels
+nox -s build
+```
+
+### Full setup
+
To setup an ideal development environment, run the following commands on a
system with CMake 3.14+:
@@ -66,11 +93,10 @@ cmake --build build -j4
Tips:
-* You can use `virtualenv` (from PyPI) instead of `venv` (which is Python 3
- only).
+* You can use `virtualenv` (faster, from PyPI) instead of `venv`.
* You can select any name for your environment folder; if it contains "env" it
will be ignored by git.
-* If you don’t have CMake 3.14+, just add “cmake” to the pip install command.
+* If you don't have CMake 3.14+, just add "cmake" to the pip install command.
* You can use `-DPYBIND11_FINDPYTHON=ON` to use FindPython on CMake 3.12+
* In classic mode, you may need to set `-DPYTHON_EXECUTABLE=/path/to/python`.
FindPython uses `-DPython_ROOT_DIR=/path/to` or
@@ -78,7 +104,7 @@ Tips:
### Configuration options
-In CMake, configuration options are given with “-D”. Options are stored in the
+In CMake, configuration options are given with "-D". Options are stored in the
build directory, in the `CMakeCache.txt` file, so they are remembered for each
build directory. Two selections are special - the generator, given with `-G`,
and the compiler, which is selected based on environment variables `CXX` and
@@ -88,12 +114,12 @@ after the initial run.
The valid options are:
* `-DCMAKE_BUILD_TYPE`: Release, Debug, MinSizeRel, RelWithDebInfo
-* `-DPYBIND11_FINDPYTHON=ON`: Use CMake 3.12+’s FindPython instead of the
+* `-DPYBIND11_FINDPYTHON=ON`: Use CMake 3.12+'s FindPython instead of the
classic, deprecated, custom FindPythonLibs
* `-DPYBIND11_NOPYTHON=ON`: Disable all Python searching (disables tests)
* `-DBUILD_TESTING=ON`: Enable the tests
* `-DDOWNLOAD_CATCH=ON`: Download catch to build the C++ tests
-* `-DOWNLOAD_EIGEN=ON`: Download Eigen for the NumPy tests
+* `-DDOWNLOAD_EIGEN=ON`: Download Eigen for the NumPy tests
* `-DPYBIND11_INSTALL=ON/OFF`: Enable the install target (on by default for the
master project)
* `-DUSE_PYTHON_INSTALL_DIR=ON`: Try to install into the python dir
@@ -126,13 +152,26 @@ cmake --build build --target check
`--target` can be spelled `-t` in CMake 3.15+. You can also run individual
tests with these targets:
-* `pytest`: Python tests only
+* `pytest`: Python tests only, using the
+[pytest](https://docs.pytest.org/en/stable/) framework
* `cpptest`: C++ tests only
* `test_cmake_build`: Install / subdirectory tests
If you want to build just a subset of tests, use
-`-DPYBIND11_TEST_OVERRIDE="test_callbacks.cpp;test_pickling.cpp"`. If this is
-empty, all tests will be built.
+`-DPYBIND11_TEST_OVERRIDE="test_callbacks;test_pickling"`. If this is
+empty, all tests will be built. Tests are specified without an extension if they need both a .py and
+.cpp file.
+
+You may also pass flags to the `pytest` target by editing `tests/pytest.ini` or
+by using the `PYTEST_ADDOPTS` environment variable
+(see [`pytest` docs](https://docs.pytest.org/en/2.7.3/customize.html#adding-default-options)). As an example:
+
+```bash
+env PYTEST_ADDOPTS="--capture=no --exitfirst" \
+ cmake --build build --target pytest
+# Or using abbreviated flags
+env PYTEST_ADDOPTS="-s -x" cmake --build build --target pytest
+```
### Formatting
@@ -164,18 +203,46 @@ name, pre-commit):
pre-commit install
```
+### Clang-Format
+
+As of v2.6.2, pybind11 ships with a [`clang-format`][clang-format]
+configuration file at the top level of the repo (the filename is
+`.clang-format`). Currently, formatting is NOT applied automatically, but
+manually using `clang-format` for newly developed files is highly encouraged.
+To check if a file needs formatting:
+
+```bash
+clang-format -style=file --dry-run some.cpp
+```
+
+The output will show things to be fixed, if any. To actually format the file:
+
+```bash
+clang-format -style=file -i some.cpp
+```
+
+Note that the `-style-file` option searches the parent directories for the
+`.clang-format` file, i.e. the commands above can be run in any subdirectory
+of the pybind11 repo.
+
### Clang-Tidy
-To run Clang tidy, the following recipe should work. Files will be modified in
-place, so you can use git to monitor the changes.
+[`clang-tidy`][clang-tidy] performs deeper static code analyses and is
+more complex to run, compared to `clang-format`, but support for `clang-tidy`
+is built into the pybind11 CMake configuration. To run `clang-tidy`, the
+following recipe should work. Run the `docker` command from the top-level
+directory inside your pybind11 git clone. Files will be modified in place,
+so you can use git to monitor the changes.
```bash
-docker run --rm -v $PWD:/pybind11 -it silkeh/clang:10
-apt-get update && apt-get install python3-dev python3-pytest
-cmake -S pybind11/ -B build -DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy);-fix"
-cmake --build build
+docker run --rm -v $PWD:/mounted_pybind11 -it silkeh/clang:13
+apt-get update && apt-get install -y python3-dev python3-pytest
+cmake -S /mounted_pybind11/ -B build -DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy);--use-color" -DDOWNLOAD_EIGEN=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=17
+cmake --build build -j 2
```
+You can add `--fix` to the options list if you want.
+
### Include what you use
To run include what you use, install (`brew install include-what-you-use` on
@@ -186,12 +253,12 @@ cmake -S . -B build-iwyu -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE=$(which include-what-y
cmake --build build
```
-The report is sent to stderr; you can pip it into a file if you wish.
+The report is sent to stderr; you can pipe it into a file if you wish.
### Build recipes
This builds with the Intel compiler (assuming it is in your path, along with a
-recent CMake and Python 3):
+recent CMake and Python):
```bash
python3 -m venv venv
@@ -313,6 +380,8 @@ if you really want to.
[pre-commit]: https://pre-commit.com
+[clang-format]: https://clang.llvm.org/docs/ClangFormat.html
+[clang-tidy]: https://clang.llvm.org/extra/clang-tidy/
[pybind11.readthedocs.org]: http://pybind11.readthedocs.org/en/latest
[issue tracker]: https://github.com/pybind/pybind11/issues
[gitter]: https://gitter.im/pybind/Lobby
diff --git a/3rdparty/pybind11/.github/ISSUE_TEMPLATE/bug-report.yml b/3rdparty/pybind11/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 00000000..bd6a9a8e
--- /dev/null
+++ b/3rdparty/pybind11/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,45 @@
+name: Bug Report
+description: File an issue about a bug
+title: "[BUG]: "
+labels: [triage]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Maintainers will only make a best effort to triage PRs. Please do your best to make the issue as easy to act on as possible, and only open if clearly a problem with pybind11 (ask first if unsure).
+ - type: checkboxes
+ id: steps
+ attributes:
+ label: Required prerequisites
+ description: Make sure you've completed the following steps before submitting your issue -- thank you!
+ options:
+ - label: Make sure you've read the [documentation](https://pybind11.readthedocs.io). Your issue may be addressed there.
+ required: true
+ - label: Search the [issue tracker](https://github.com/pybind/pybind11/issues) and [Discussions](https:/pybind/pybind11/discussions) to verify that this hasn't already been reported. +1 or comment there if it has.
+ required: true
+ - label: Consider asking first in the [Gitter chat room](https://gitter.im/pybind/Lobby) or in a [Discussion](https:/pybind/pybind11/discussions/new).
+ required: false
+
+ - type: textarea
+ id: description
+ attributes:
+ label: Problem description
+ placeholder: >-
+ Provide a short description, state the expected behavior and what
+ actually happens. Include relevant information like what version of
+ pybind11 you are using, what system you are on, and any useful commands
+ / output.
+ validations:
+ required: true
+
+ - type: textarea
+ id: code
+ attributes:
+ label: Reproducible example code
+ placeholder: >-
+ The code should be minimal, have no external dependencies, isolate the
+ function(s) that cause breakage. Submit matched and complete C++ and
+ Python snippets that can be easily compiled and run to diagnose the
+ issue. If possible, make a PR with a new, failing test to give us a
+ starting point to work on!
+ render: text
diff --git a/3rdparty/pybind11/.github/ISSUE_TEMPLATE/config.yml b/3rdparty/pybind11/.github/ISSUE_TEMPLATE/config.yml
index 20e74313..27f9a804 100644
--- a/3rdparty/pybind11/.github/ISSUE_TEMPLATE/config.yml
+++ b/3rdparty/pybind11/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,8 @@
blank_issues_enabled: false
contact_links:
+ - name: Ask a question
+ url: https://github.com/pybind/pybind11/discussions/new
+ about: Please ask and answer questions here, or propose new ideas.
- name: Gitter room
url: https://gitter.im/pybind/Lobby
about: A room for discussing pybind11 with an active community
diff --git a/3rdparty/pybind11/.github/dependabot.yml b/3rdparty/pybind11/.github/dependabot.yml
index c1eac3c4..2c7d1708 100644
--- a/3rdparty/pybind11/.github/dependabot.yml
+++ b/3rdparty/pybind11/.github/dependabot.yml
@@ -5,7 +5,3 @@ updates:
directory: "/"
schedule:
interval: "daily"
- ignore:
- # Offical actions have moving tags like v1
- # that are used, so they don't need updates here
- - dependency-name: "actions/*"
diff --git a/3rdparty/pybind11/.github/pull_request_template.md b/3rdparty/pybind11/.github/pull_request_template.md
index 5570f6f2..54b7f510 100644
--- a/3rdparty/pybind11/.github/pull_request_template.md
+++ b/3rdparty/pybind11/.github/pull_request_template.md
@@ -1,3 +1,7 @@
+<!--
+Title (above): please place [branch_name] at the beginning if you are targeting a branch other than master. *Do not target stable*.
+It is recommended to use conventional commit format, see conventionalcommits.org, but not required.
+-->
## Description
<!-- Include relevant issues or PRs here, describe what changed and why -->
@@ -5,7 +9,8 @@
## Suggested changelog entry:
-<!-- fill in the below block with the expected RestructuredText entry (delete if no entry needed) -->
+<!-- Fill in the below block with the expected RestructuredText entry. Delete if no entry needed;
+ but do not delete header or rst block if an entry is needed! Will be collected via a script. -->
```rst
diff --git a/3rdparty/pybind11/.github/workflows/ci.yml b/3rdparty/pybind11/.github/workflows/ci.yml
index 73424f92..213c6900 100644
--- a/3rdparty/pybind11/.github/workflows/ci.yml
+++ b/3rdparty/pybind11/.github/workflows/ci.yml
@@ -9,6 +9,15 @@ on:
- stable
- v*
+concurrency:
+ group: test-${{ github.ref }}
+ cancel-in-progress: true
+
+env:
+ PIP_ONLY_BINARY: numpy
+ FORCE_COLOR: 3
+ PYTEST_TIMEOUT: 300
+
jobs:
# This is the "main" test suite, which tests a large number of different
# versions of default compilers and Python versions in GitHub Actions.
@@ -16,74 +25,66 @@ jobs:
strategy:
fail-fast: false
matrix:
- runs-on: [ubuntu-latest, windows-latest, macos-latest]
+ runs-on: [ubuntu-latest, windows-2022, macos-latest]
python:
- - 2.7
- - 3.5
- - 3.6
- - 3.7
- - 3.8
- - 3.9
- # - 3.10.0-alpha.1 - need next release for pybind11 fix
- - pypy2
- - pypy3
+ - '3.6'
+ - '3.9'
+ - '3.10'
+ - '3.11-dev'
+ - 'pypy-3.7'
+ - 'pypy-3.8'
+ - 'pypy-3.9'
# Items in here will either be added to the build matrix (if not
# present), or add new keys to an existing matrix element if all the
# existing keys match.
#
- # We support three optional keys: args (both build), args1 (first
- # build), and args2 (second build).
+ # We support an optional key: args, for cmake args
include:
# Just add a key
- runs-on: ubuntu-latest
- python: 3.6
+ python: '3.6'
args: >
-DPYBIND11_FINDPYTHON=ON
- - runs-on: windows-latest
- python: 3.6
+ -DCMAKE_CXX_FLAGS="-D_=1"
+ - runs-on: ubuntu-latest
+ python: 'pypy-3.8'
args: >
-DPYBIND11_FINDPYTHON=ON
- - runs-on: ubuntu-latest
- python: 3.8
+ - runs-on: windows-2019
+ python: '3.6'
args: >
-DPYBIND11_FINDPYTHON=ON
-
- # These items will be removed from the build matrix, keys must match.
- exclude:
- # Currently 32bit only, and we build 64bit
- - runs-on: windows-latest
- python: pypy2
- - runs-on: windows-latest
- python: pypy3
-
- # Let's drop a few macOS runs since that tends to be 2.7 or 3.8+
- - runs-on: macos-latest
- python: 3.6
- - runs-on: macos-latest
- python: 3.7
+ # Inject a couple Windows 2019 runs
+ - runs-on: windows-2019
+ python: '3.9'
name: "🐍 ${{ matrix.python }} • ${{ matrix.runs-on }} • x64 ${{ matrix.args }}"
runs-on: ${{ matrix.runs-on }}
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Setup Python ${{ matrix.python }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- - name: Setup Boost (Windows / Linux latest)
- shell: bash
- run: echo "BOOST_ROOT=$BOOST_ROOT_1_72_0" >> $GITHUB_ENV
+ - name: Setup Boost (Linux)
+ # Can't use boost + define _
+ if: runner.os == 'Linux' && matrix.python != '3.6'
+ run: sudo apt-get install libboost-dev
+
+ - name: Setup Boost (macOS)
+ if: runner.os == 'macOS'
+ run: brew install boost
- name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.4
+ uses: jwlawson/actions-setup-cmake@v1.12
- name: Cache wheels
if: runner.os == 'macOS'
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
# This path is specific to macOS - we really only need it for PyPy NumPy wheels
# See https://github.com/actions/cache/blob/master/examples.md#python---pip
@@ -93,7 +94,8 @@ jobs:
key: ${{ runner.os }}-pip-${{ matrix.python }}-x64-${{ hashFiles('tests/requirements.txt') }}
- name: Prepare env
- run: python -m pip install -r tests/requirements.txt --prefer-binary
+ run: |
+ python -m pip install -r tests/requirements.txt
- name: Setup annotations on Linux
if: runner.os == 'Linux'
@@ -117,7 +119,7 @@ jobs:
- name: C++11 tests
# TODO: Figure out how to load the DLL on Python 3.8+
- if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9))"
+ if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10' || matrix.python == '3.11-dev' || matrix.python == 'pypy-3.8'))"
run: cmake --build . --target cpptest -j 2
- name: Interface test C++11
@@ -127,7 +129,7 @@ jobs:
run: git clean -fdx
# Second build - C++17 mode and in a build directory
- - name: Configure ${{ matrix.args2 }}
+ - name: Configure C++17
run: >
cmake -S . -B build2
-DPYBIND11_WERROR=ON
@@ -135,7 +137,6 @@ jobs:
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=17
${{ matrix.args }}
- ${{ matrix.args2 }}
- name: Build
run: cmake --build build2 -j 2
@@ -145,32 +146,117 @@ jobs:
- name: C++ tests
# TODO: Figure out how to load the DLL on Python 3.8+
- if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9))"
+ if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10' || matrix.python == '3.11-dev' || matrix.python == 'pypy-3.8'))"
run: cmake --build build2 --target cpptest
- - name: Interface test
- run: cmake --build build2 --target test_cmake_build
+ # Third build - C++17 mode with unstable ABI
+ - name: Configure (unstable ABI)
+ run: >
+ cmake -S . -B build3
+ -DPYBIND11_WERROR=ON
+ -DDOWNLOAD_CATCH=ON
+ -DDOWNLOAD_EIGEN=ON
+ -DCMAKE_CXX_STANDARD=17
+ -DPYBIND11_INTERNALS_VERSION=10000000
+ "-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
+ ${{ matrix.args }}
- # Eventually Microsoft might have an action for setting up
- # MSVC, but for now, this action works:
- - name: Prepare compiler environment for Windows 🐍 2.7
- if: matrix.python == 2.7 && runner.os == 'Windows'
- uses: ilammy/msvc-dev-cmd@v1
- with:
- arch: x64
+ - name: Build (unstable ABI)
+ run: cmake --build build3 -j 2
- # This makes two environment variables available in the following step(s)
- - name: Set Windows 🐍 2.7 environment variables
- if: matrix.python == 2.7 && runner.os == 'Windows'
- shell: bash
- run: |
- echo "DISTUTILS_USE_SDK=1" >> $GITHUB_ENV
- echo "MSSdk=1" >> $GITHUB_ENV
+ - name: Python tests (unstable ABI)
+ run: cmake --build build3 --target pytest
+
+ - name: Interface test
+ run: cmake --build build2 --target test_cmake_build
# This makes sure the setup_helpers module can build packages using
# setuptools
- name: Setuptools helpers test
run: pytest tests/extra_setuptools
+ if: "!(matrix.runs-on == 'windows-2022')"
+
+
+ deadsnakes:
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ # TODO: Fails on 3.10, investigate
+ - python-version: "3.9"
+ python-debug: true
+ valgrind: true
+ - python-version: "3.11-dev"
+ python-debug: false
+
+ name: "🐍 ${{ matrix.python-version }}${{ matrix.python-debug && '-dbg' || '' }} (deadsnakes)${{ matrix.valgrind && ' • Valgrind' || '' }} • x64"
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Setup Python ${{ matrix.python-version }} (deadsnakes)
+ uses: deadsnakes/action@v2.1.1
+ with:
+ python-version: ${{ matrix.python-version }}
+ debug: ${{ matrix.python-debug }}
+
+ - name: Update CMake
+ uses: jwlawson/actions-setup-cmake@v1.12
+
+ - name: Valgrind cache
+ if: matrix.valgrind
+ uses: actions/cache@v3
+ id: cache-valgrind
+ with:
+ path: valgrind
+ key: 3.16.1 # Valgrind version
+
+ - name: Compile Valgrind
+ if: matrix.valgrind && steps.cache-valgrind.outputs.cache-hit != 'true'
+ run: |
+ VALGRIND_VERSION=3.16.1
+ curl https://sourceware.org/pub/valgrind/valgrind-$VALGRIND_VERSION.tar.bz2 -o - | tar xj
+ mv valgrind-$VALGRIND_VERSION valgrind
+ cd valgrind
+ ./configure
+ make -j 2 > /dev/null
+
+ - name: Install Valgrind
+ if: matrix.valgrind
+ working-directory: valgrind
+ run: |
+ sudo make install
+ sudo apt-get update
+ sudo apt-get install libc6-dbg # Needed by Valgrind
+
+ - name: Prepare env
+ run: |
+ python -m pip install -r tests/requirements.txt
+
+ - name: Configure
+ env:
+ SETUPTOOLS_USE_DISTUTILS: stdlib
+ run: >
+ cmake -S . -B build
+ -DCMAKE_BUILD_TYPE=Debug
+ -DPYBIND11_WERROR=ON
+ -DDOWNLOAD_CATCH=ON
+ -DDOWNLOAD_EIGEN=ON
+ -DCMAKE_CXX_STANDARD=17
+
+ - name: Build
+ run: cmake --build build -j 2
+
+ - name: Python tests
+ run: cmake --build build --target pytest
+
+ - name: C++ tests
+ run: cmake --build build --target cpptest
+
+ - name: Run Valgrind on Python tests
+ if: matrix.valgrind
+ run: cmake --build build --target memcheck
# Testing on clang using the excellent silkeh clang docker images
@@ -195,12 +281,20 @@ jobs:
std: 20
- clang: 10
std: 17
+ - clang: 11
+ std: 20
+ - clang: 12
+ std: 20
+ - clang: 13
+ std: 20
+ - clang: 14
+ std: 20
name: "🐍 3 • Clang ${{ matrix.clang }} • C++${{ matrix.std }} • x64"
container: "silkeh/clang:${{ matrix.clang }}"
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Add wget and python3
run: apt-get update && apt-get install -y python3-dev python3-numpy python3-pytest libeigen3-dev
@@ -230,11 +324,11 @@ jobs:
# Testing NVCC; forces sources to behave like .cu files
cuda:
runs-on: ubuntu-latest
- name: "🐍 3.8 • CUDA 11 • Ubuntu 20.04"
- container: nvidia/cuda:11.0-devel-ubuntu20.04
+ name: "🐍 3.8 • CUDA 11.2 • Ubuntu 20.04"
+ container: nvidia/cuda:11.2.2-devel-ubuntu20.04
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
# tzdata will try to ask for the timezone, so set the DEBIAN_FRONTEND
- name: Install 🐍 3
@@ -250,70 +344,74 @@ jobs:
run: cmake --build build --target pytest
- # Testing CentOS 8 + PGI compilers
- centos-nvhpc8:
- runs-on: ubuntu-latest
- name: "🐍 3 • CentOS8 / PGI 20.7 • x64"
- container: centos:8
-
- steps:
- - uses: actions/checkout@v2
-
- - name: Add Python 3 and a few requirements
- run: yum update -y && yum install -y git python3-devel python3-numpy python3-pytest make environment-modules
-
- - name: Install CMake with pip
- run: |
- python3 -m pip install --upgrade pip
- python3 -m pip install cmake --prefer-binary
-
- - name: Install NVidia HPC SDK
- run: yum -y install https://developer.download.nvidia.com/hpc-sdk/nvhpc-20-7-20.7-1.x86_64.rpm https://developer.download.nvidia.com/hpc-sdk/nvhpc-2020-20.7-1.x86_64.rpm
-
- - name: Configure
- shell: bash
- run: |
- source /etc/profile.d/modules.sh
- module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/20.7
- cmake -S . -B build -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=14 -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
-
- - name: Build
- run: cmake --build build -j 2 --verbose
-
- - name: Python tests
- run: cmake --build build --target pytest
-
- - name: C++ tests
- run: cmake --build build --target cpptest
-
- - name: Interface test
- run: cmake --build build --target test_cmake_build
+# TODO: Internal compiler error - report to NVidia
+# # Testing CentOS 8 + PGI compilers
+# centos-nvhpc8:
+# runs-on: ubuntu-latest
+# name: "🐍 3 • CentOS8 / PGI 20.11 • x64"
+# container: centos:8
+#
+# steps:
+# - uses: actions/checkout@v3
+#
+# - name: Add Python 3 and a few requirements
+# run: yum update -y && yum install -y git python3-devel python3-numpy python3-pytest make environment-modules
+#
+# - name: Install CMake with pip
+# run: |
+# python3 -m pip install --upgrade pip
+# python3 -m pip install cmake --prefer-binary
+#
+# - name: Install NVidia HPC SDK
+# run: >
+# yum -y install
+# https://developer.download.nvidia.com/hpc-sdk/20.11/nvhpc-20-11-20.11-1.x86_64.rpm
+# https://developer.download.nvidia.com/hpc-sdk/20.11/nvhpc-2020-20.11-1.x86_64.rpm
+#
+# - name: Configure
+# shell: bash
+# run: |
+# source /etc/profile.d/modules.sh
+# module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/20.11
+# cmake -S . -B build -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=14 -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
+#
+# - name: Build
+# run: cmake --build build -j 2 --verbose
+#
+# - name: Python tests
+# run: cmake --build build --target pytest
+#
+# - name: C++ tests
+# run: cmake --build build --target cpptest
+#
+# - name: Interface test
+# run: cmake --build build --target test_cmake_build
# Testing on CentOS 7 + PGI compilers, which seems to require more workarounds
centos-nvhpc7:
runs-on: ubuntu-latest
- name: "🐍 3 • CentOS7 / PGI 20.9 • x64"
+ name: "🐍 3 • CentOS7 / PGI 22.3 • x64"
container: centos:7
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Add Python 3 and a few requirements
- run: yum update -y && yum install -y epel-release && yum install -y git python3-devel make environment-modules cmake3
+ run: yum update -y && yum install -y epel-release && yum install -y git python3-devel make environment-modules cmake3 yum-utils
- name: Install NVidia HPC SDK
- run: yum -y install https://developer.download.nvidia.com/hpc-sdk/20.9/nvhpc-20-9-20.9-1.x86_64.rpm https://developer.download.nvidia.com/hpc-sdk/20.9/nvhpc-2020-20.9-1.x86_64.rpm
+ run: yum-config-manager --add-repo https://developer.download.nvidia.com/hpc-sdk/rhel/nvhpc.repo && yum -y install nvhpc-22.3
# On CentOS 7, we have to filter a few tests (compiler internal error)
- # and allow deeper templete recursion (not needed on CentOS 8 with a newer
+ # and allow deeper template recursion (not needed on CentOS 8 with a newer
# standard library). On some systems, you many need further workarounds:
# https://github.com/pybind/pybind11/pull/2475
- name: Configure
shell: bash
run: |
source /etc/profile.d/modules.sh
- module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/20.9
+ module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/22.3
cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
-DCMAKE_CXX_STANDARD=11 \
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@@ -338,26 +436,27 @@ jobs:
- name: Interface test
run: cmake3 --build build --target test_cmake_build
+
# Testing on GCC using the GCC docker images (only recent images supported)
gcc:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
- gcc:
- - 7
- - latest
- std:
- - 11
include:
- - gcc: 10
- std: 20
+ - { gcc: 7, std: 11 }
+ - { gcc: 7, std: 17 }
+ - { gcc: 8, std: 14 }
+ - { gcc: 8, std: 17 }
+ - { gcc: 10, std: 17 }
+ - { gcc: 11, std: 20 }
+ - { gcc: 12, std: 20 }
name: "🐍 3 • GCC ${{ matrix.gcc }} • C++${{ matrix.std }}• x64"
container: "gcc:${{ matrix.gcc }}"
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v3
- name: Add Python 3
run: apt-get update; apt-get install -y python3-dev python3-numpy python3-pytest python3-pip libeigen3-dev
@@ -365,10 +464,8 @@ jobs:
- name: Update pip
run: python3 -m pip install --upgrade pip
- - name: Setup CMake 3.18
- uses: jwlawson/actions-setup-cmake@v1.4
- with:
- cmake-version: 3.18
+ - name: Update CMake
+ uses: jwlawson/actions-setup-cmake@v1.12
- name: Configure
shell: bash
@@ -392,6 +489,103 @@ jobs:
run: cmake --build build --target test_cmake_build
+ # Testing on ICC using the oneAPI apt repo
+ icc:
+ runs-on: ubuntu-20.04
+ strategy:
+ fail-fast: false
+
+ name: "🐍 3 • ICC latest • x64"
+
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Add apt repo
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y wget build-essential pkg-config cmake ca-certificates gnupg
+ wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
+ sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
+ echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
+
+ - name: Add ICC & Python 3
+ run: sudo apt-get update; sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic cmake python3-dev python3-numpy python3-pytest python3-pip
+
+ - name: Update pip
+ run: |
+ set +e; source /opt/intel/oneapi/setvars.sh; set -e
+ python3 -m pip install --upgrade pip
+
+ - name: Install dependencies
+ run: |
+ set +e; source /opt/intel/oneapi/setvars.sh; set -e
+ python3 -m pip install -r tests/requirements.txt
+
+ - name: Configure C++11
+ run: |
+ set +e; source /opt/intel/oneapi/setvars.sh; set -e
+ cmake -S . -B build-11 \
+ -DPYBIND11_WERROR=ON \
+ -DDOWNLOAD_CATCH=ON \
+ -DDOWNLOAD_EIGEN=OFF \
+ -DCMAKE_CXX_STANDARD=11 \
+ -DCMAKE_CXX_COMPILER=$(which icpc) \
+ -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
+
+ - name: Build C++11
+ run: |
+ set +e; source /opt/intel/oneapi/setvars.sh; set -e
+ cmake --build build-11 -j 2 -v
+
+ - name: Python tests C++11
+ run: |
+ set +e; source /opt/intel/oneapi/setvars.sh; set -e
+ sudo service apport stop
+ cmake --build build-11 --target check
+
+ - name: C++ tests C++11
+ run: |
+ set +e; source /opt/intel/oneapi/setvars.sh; set -e
+ cmake --build build-11 --target cpptest
+
+ - name: Interface test C++11
+ run: |
+ set +e; source /opt/intel/oneapi/setvars.sh; set -e
+ cmake --build build-11 --target test_cmake_build
+
+ - name: Configure C++17
+ run: |
+ set +e; source /opt/intel/oneapi/setvars.sh; set -e
+ cmake -S . -B build-17 \
+ -DPYBIND11_WERROR=ON \
+ -DDOWNLOAD_CATCH=ON \
+ -DDOWNLOAD_EIGEN=OFF \
+ -DCMAKE_CXX_STANDARD=17 \
+ -DCMAKE_CXX_COMPILER=$(which icpc) \
+ -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
+
+ - name: Build C++17
+ run: |
+ set +e; source /opt/intel/oneapi/setvars.sh; set -e
+ cmake --build build-17 -j 2 -v
+
+ - name: Python tests C++17
+ run: |
+ set +e; source /opt/intel/oneapi/setvars.sh; set -e
+ sudo service apport stop
+ cmake --build build-17 --target check
+
+ - name: C++ tests C++17
+ run: |
+ set +e; source /opt/intel/oneapi/setvars.sh; set -e
+ cmake --build build-17 --target cpptest
+
+ - name: Interface test C++17
+ run: |
+ set +e; source /opt/intel/oneapi/setvars.sh; set -e
+ cmake --build build-17 --target test_cmake_build
+
+
# Testing on CentOS (manylinux uses a centos base, and this is an easy way
# to get GCC 4.8, which is the manylinux1 compiler).
centos:
@@ -399,29 +593,37 @@ jobs:
strategy:
fail-fast: false
matrix:
- centos:
- - 7 # GCC 4.8
- - 8
+ container:
+ - "centos:7" # GCC 4.8
+ - "almalinux:8"
+ - "almalinux:9"
- name: "🐍 3 • CentOS ${{ matrix.centos }} • x64"
- container: "centos:${{ matrix.centos }}"
+ name: "🐍 3 • ${{ matrix.container }} • x64"
+ container: "${{ matrix.container }}"
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- - name: Add Python 3
+ - name: Add Python 3 (RHEL 7)
+ if: matrix.container == 'centos:7'
run: yum update -y && yum install -y python3-devel gcc-c++ make git
+ - name: Add Python 3 (RHEL 8+)
+ if: matrix.container != 'centos:7'
+ run: dnf update -y && dnf install -y python3-devel gcc-c++ make git
+
- name: Update pip
run: python3 -m pip install --upgrade pip
- name: Install dependencies
- run: python3 -m pip install cmake -r tests/requirements.txt --prefer-binary
+ run: |
+ python3 -m pip install cmake -r tests/requirements.txt
- name: Configure
shell: bash
run: >
cmake -S . -B build
+ -DCMAKE_BUILD_TYPE=MinSizeRel
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON
@@ -443,18 +645,18 @@ jobs:
# This tests an "install" with the CMake tools
install-classic:
- name: "🐍 3.5 • Debian • x86 • Install"
+ name: "🐍 3.7 • Debian • x86 • Install"
runs-on: ubuntu-latest
- container: i386/debian:stretch
+ container: i386/debian:buster
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v1 # Required to run inside docker
- name: Install requirements
run: |
apt-get update
apt-get install -y git make cmake g++ libeigen3-dev python3-dev python3-pip
- pip3 install "pytest==3.1.*"
+ pip3 install "pytest==6.*"
- name: Configure for install
run: >
@@ -479,33 +681,32 @@ jobs:
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
working-directory: /build-tests
- - name: Run tests
+ - name: Python tests
run: make pytest -j 2
working-directory: /build-tests
# This verifies that the documentation is not horribly broken, and does a
- # basic sanity check on the SDist.
+ # basic validation check on the SDist.
doxygen:
name: "Documentation build test"
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- - uses: actions/setup-python@v2
+ - uses: actions/setup-python@v4
+ with:
+ python-version: "3.x"
- name: Install Doxygen
run: sudo apt-get install -y doxygen librsvg2-bin # Changed to rsvg-convert in 20.04
- - name: Install docs & setup requirements
- run: python3 -m pip install -r docs/requirements.txt
-
- name: Build docs
- run: python3 -m sphinx -W -b html docs docs/.build
+ run: pipx run nox -s docs
- name: Make SDist
- run: python3 setup.py sdist
+ run: pipx run nox -s build -- --sdist
- run: git status --ignored
@@ -517,7 +718,7 @@ jobs:
- name: Compare Dists (headers only)
working-directory: include
run: |
- python3 -m pip install --user -U ../dist/*
+ python3 -m pip install --user -U ../dist/*.tar.gz
installed=$(python3 -c "import pybind11; print(pybind11.get_include() + '/pybind11')")
diff -rq $installed ./pybind11
@@ -526,42 +727,40 @@ jobs:
fail-fast: false
matrix:
python:
- - 3.5
- 3.6
- 3.7
- 3.8
- 3.9
- - pypy3
- # TODO: fix hang on pypy2
include:
- python: 3.9
- args: -DCMAKE_CXX_STANDARD=20 -DDOWNLOAD_EIGEN=OFF
+ args: -DCMAKE_CXX_STANDARD=20
- python: 3.8
args: -DCMAKE_CXX_STANDARD=17
name: "🐍 ${{ matrix.python }} • MSVC 2019 • x86 ${{ matrix.args }}"
- runs-on: windows-latest
+ runs-on: windows-2019
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Setup Python ${{ matrix.python }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
architecture: x86
- name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.4
+ uses: jwlawson/actions-setup-cmake@v1.12
- name: Prepare MSVC
- uses: ilammy/msvc-dev-cmd@v1
+ uses: ilammy/msvc-dev-cmd@v1.11.0
with:
arch: x86
- name: Prepare env
- run: python -m pip install -r tests/requirements.txt --prefer-binary
+ run: |
+ python -m pip install -r tests/requirements.txt
# First build - C++11 mode and inplace
- name: Configure ${{ matrix.args }}
@@ -575,102 +774,189 @@ jobs:
- name: Build C++11
run: cmake --build build -j 2
- - name: Run tests
+ - name: Python tests
run: cmake --build build -t pytest
- win32-msvc2015:
- name: "🐍 ${{ matrix.python }} • MSVC 2015 • x64"
- runs-on: windows-latest
+ win32-debug:
strategy:
fail-fast: false
matrix:
python:
- - 2.7
- - 3.6
- - 3.7
- # todo: check/cpptest does not support 3.8+ yet
+ - 3.8
+ - 3.9
+
+ include:
+ - python: 3.9
+ args: -DCMAKE_CXX_STANDARD=20
+ - python: 3.8
+ args: -DCMAKE_CXX_STANDARD=17
+
+ name: "🐍 ${{ matrix.python }} • MSVC 2019 (Debug) • x86 ${{ matrix.args }}"
+ runs-on: windows-2019
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- - name: Setup 🐍 ${{ matrix.python }}
- uses: actions/setup-python@v2
+ - name: Setup Python ${{ matrix.python }}
+ uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
+ architecture: x86
- name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.4
+ uses: jwlawson/actions-setup-cmake@v1.12
- name: Prepare MSVC
- uses: ilammy/msvc-dev-cmd@v1
+ uses: ilammy/msvc-dev-cmd@v1.11.0
with:
- toolset: 14.0
+ arch: x86
- name: Prepare env
- run: python -m pip install -r tests/requirements.txt --prefer-binary
+ run: |
+ python -m pip install -r tests/requirements.txt
# First build - C++11 mode and inplace
- - name: Configure
+ - name: Configure ${{ matrix.args }}
run: >
cmake -S . -B build
- -G "Visual Studio 14 2015" -A x64
+ -G "Visual Studio 16 2019" -A Win32
+ -DCMAKE_BUILD_TYPE=Debug
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON
+ ${{ matrix.args }}
+ - name: Build C++11
+ run: cmake --build build --config Debug -j 2
- - name: Build C++14
- run: cmake --build build -j 2
-
- - name: Run all checks
- run: cmake --build build -t check
+ - name: Python tests
+ run: cmake --build build --config Debug -t pytest
- win32-msvc2017:
- name: "🐍 ${{ matrix.python }} • MSVC 2017 • x64"
- runs-on: windows-2016
+ windows-2022:
strategy:
fail-fast: false
matrix:
python:
- - 2.7
- - 3.5
- - 3.7
- std:
- - 14
+ - 3.9
- include:
- - python: 2.7
- std: 17
- args: >
- -DCMAKE_CXX_FLAGS="/permissive- /EHsc /GR"
+ name: "🐍 ${{ matrix.python }} • MSVC 2022 C++20 • x64"
+ runs-on: windows-2022
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- - name: Setup 🐍 ${{ matrix.python }}
- uses: actions/setup-python@v2
+ - name: Setup Python ${{ matrix.python }}
+ uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- - name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.4
-
- name: Prepare env
- run: python -m pip install -r tests/requirements.txt --prefer-binary
+ run: |
+ python3 -m pip install -r tests/requirements.txt
- # First build - C++11 mode and inplace
- - name: Configure
+ - name: Update CMake
+ uses: jwlawson/actions-setup-cmake@v1.12
+
+ - name: Configure C++20
run: >
cmake -S . -B build
- -G "Visual Studio 15 2017" -A x64
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON
- -DCMAKE_CXX_STANDARD=${{ matrix.std }}
- ${{ matrix.args }}
+ -DCMAKE_CXX_STANDARD=20
- - name: Build ${{ matrix.std }}
+ - name: Build C++20
run: cmake --build build -j 2
- - name: Run all checks
- run: cmake --build build -t check
+ - name: Python tests
+ run: cmake --build build --target pytest
+
+ - name: C++20 tests
+ run: cmake --build build --target cpptest -j 2
+
+ - name: Interface test C++20
+ run: cmake --build build --target test_cmake_build
+
+ mingw:
+ name: "🐍 3 • windows-latest • ${{ matrix.sys }}"
+ runs-on: windows-latest
+ defaults:
+ run:
+ shell: msys2 {0}
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - { sys: mingw64, env: x86_64 }
+ - { sys: mingw32, env: i686 }
+ steps:
+ - uses: msys2/setup-msys2@v2
+ with:
+ msystem: ${{matrix.sys}}
+ install: >-
+ git
+ mingw-w64-${{matrix.env}}-gcc
+ mingw-w64-${{matrix.env}}-python-pip
+ mingw-w64-${{matrix.env}}-python-numpy
+ mingw-w64-${{matrix.env}}-python-scipy
+ mingw-w64-${{matrix.env}}-cmake
+ mingw-w64-${{matrix.env}}-make
+ mingw-w64-${{matrix.env}}-python-pytest
+ mingw-w64-${{matrix.env}}-eigen3
+ mingw-w64-${{matrix.env}}-boost
+ mingw-w64-${{matrix.env}}-catch
+
+ - uses: actions/checkout@v3
+
+ - name: Configure C++11
+ # LTO leads to many undefined reference like
+ # `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
+ run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DCMAKE_VERBOSE_MAKEFILE=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build
+
+ - name: Build C++11
+ run: cmake --build build -j 2
+
+ - name: Python tests C++11
+ run: cmake --build build --target pytest -j 2
+
+ - name: C++11 tests
+ run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build --target cpptest -j 2
+
+ - name: Interface test C++11
+ run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build --target test_cmake_build
+
+ - name: Clean directory
+ run: git clean -fdx
+
+ - name: Configure C++14
+ run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DCMAKE_VERBOSE_MAKEFILE=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build2
+
+ - name: Build C++14
+ run: cmake --build build2 -j 2
+
+ - name: Python tests C++14
+ run: cmake --build build2 --target pytest -j 2
+
+ - name: C++14 tests
+ run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build2 --target cpptest -j 2
+
+ - name: Interface test C++14
+ run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build2 --target test_cmake_build
+
+ - name: Clean directory
+ run: git clean -fdx
+
+ - name: Configure C++17
+ run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DCMAKE_VERBOSE_MAKEFILE=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build3
+
+ - name: Build C++17
+ run: cmake --build build3 -j 2
+
+ - name: Python tests C++17
+ run: cmake --build build3 --target pytest -j 2
+
+ - name: C++17 tests
+ run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build3 --target cpptest -j 2
+
+ - name: Interface test C++17
+ run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build3 --target test_cmake_build
diff --git a/3rdparty/pybind11/.github/workflows/configure.yml b/3rdparty/pybind11/.github/workflows/configure.yml
index 23f60229..edcad419 100644
--- a/3rdparty/pybind11/.github/workflows/configure.yml
+++ b/3rdparty/pybind11/.github/workflows/configure.yml
@@ -18,7 +18,7 @@ jobs:
matrix:
runs-on: [ubuntu-latest, macos-latest, windows-latest]
arch: [x64]
- cmake: [3.18]
+ cmake: ["3.23"]
include:
- runs-on: ubuntu-latest
@@ -29,22 +29,18 @@ jobs:
arch: x64
cmake: 3.7
- - runs-on: windows-2016
- arch: x86
- cmake: 3.8
-
- - runs-on: windows-2016
- arch: x86
+ - runs-on: windows-2019
+ arch: x64 # x86 compilers seem to be missing on 2019 image
cmake: 3.18
name: 🐍 3.7 • CMake ${{ matrix.cmake }} • ${{ matrix.runs-on }}
runs-on: ${{ matrix.runs-on }}
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Setup Python 3.7
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: 3.7
architecture: ${{ matrix.arch }}
@@ -55,7 +51,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.3
+ uses: jwlawson/actions-setup-cmake@v1.12
with:
cmake-version: ${{ matrix.cmake }}
diff --git a/3rdparty/pybind11/.github/workflows/format.yml b/3rdparty/pybind11/.github/workflows/format.yml
index 5cebed17..31d893c4 100644
--- a/3rdparty/pybind11/.github/workflows/format.yml
+++ b/3rdparty/pybind11/.github/workflows/format.yml
@@ -12,24 +12,33 @@ on:
- stable
- "v*"
+env:
+ FORCE_COLOR: 3
+
jobs:
pre-commit:
name: Format
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-python@v2
- - uses: pre-commit/action@v2.0.0
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
+ with:
+ python-version: "3.x"
+ - name: Add matchers
+ run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/matchers/pylint.json"
+ - uses: pre-commit/action@v3.0.0
with:
# Slow hooks are marked with manual - slow is okay here, run them too
extra_args: --hook-stage manual --all-files
clang-tidy:
+ # When making changes here, please also review the "Clang-Tidy" section
+ # in .github/CONTRIBUTING.md and update as needed.
name: Clang-Tidy
runs-on: ubuntu-latest
- container: silkeh/clang:10
+ container: silkeh/clang:13
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Install requirements
run: apt-get update && apt-get install -y python3-dev python3-pytest
@@ -37,10 +46,10 @@ jobs:
- name: Configure
run: >
cmake -S . -B build
- -DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy);--warnings-as-errors=*"
+ -DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy);--use-color;--warnings-as-errors=*"
-DDOWNLOAD_EIGEN=ON
-DDOWNLOAD_CATCH=ON
-DCMAKE_CXX_STANDARD=17
- name: Build
- run: cmake --build build -j 2
+ run: cmake --build build -j 2 -- --keep-going
diff --git a/3rdparty/pybind11/.github/workflows/pip.yml b/3rdparty/pybind11/.github/workflows/pip.yml
index 4414a12e..f03a3970 100644
--- a/3rdparty/pybind11/.github/workflows/pip.yml
+++ b/3rdparty/pybind11/.github/workflows/pip.yml
@@ -12,24 +12,28 @@ on:
types:
- published
+env:
+ PIP_ONLY_BINARY: numpy
+
jobs:
# This builds the sdists and wheels and makes sure the files are exactly as
- # expected. Using Windows and Python 2.7, since that is often the most
+ # expected. Using Windows and Python 3.6, since that is often the most
# challenging matrix element.
test-packaging:
- name: 🐍 2.7 • 📦 tests • windows-latest
+ name: 🐍 3.6 • 📦 tests • windows-latest
runs-on: windows-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- - name: Setup 🐍 2.7
- uses: actions/setup-python@v2
+ - name: Setup 🐍 3.6
+ uses: actions/setup-python@v4
with:
- python-version: 2.7
+ python-version: 3.6
- name: Prepare env
- run: python -m pip install -r tests/requirements.txt --prefer-binary
+ run: |
+ python -m pip install -r tests/requirements.txt
- name: Python Packaging tests
run: pytest tests/extra_python_package/
@@ -42,15 +46,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Setup 🐍 3.8
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: 3.8
- name: Prepare env
- run: python -m pip install -r tests/requirements.txt build twine --prefer-binary
+ run: |
+ python -m pip install -r tests/requirements.txt build twine
- name: Python Packaging tests
run: pytest tests/extra_python_package/
@@ -64,13 +69,13 @@ jobs:
run: twine check dist/*
- name: Save standard package
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: standard
path: dist/pybind11-*
- name: Save global package
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: global
path: dist/pybind11_global-*
@@ -85,19 +90,21 @@ jobs:
needs: [packaging]
steps:
- - uses: actions/setup-python@v2
+ - uses: actions/setup-python@v4
+ with:
+ python-version: "3.x"
# Downloads all to directories matching the artifact names
- - uses: actions/download-artifact@v2
+ - uses: actions/download-artifact@v3
- name: Publish standard package
- uses: pypa/gh-action-pypi-publish@v1.4.1
+ uses: pypa/gh-action-pypi-publish@v1.5.1
with:
password: ${{ secrets.pypi_password }}
packages_dir: standard/
- name: Publish global package
- uses: pypa/gh-action-pypi-publish@v1.4.1
+ uses: pypa/gh-action-pypi-publish@v1.5.1
with:
password: ${{ secrets.pypi_password_global }}
packages_dir: global/
diff --git a/3rdparty/pybind11/.github/workflows/upstream.yml b/3rdparty/pybind11/.github/workflows/upstream.yml
new file mode 100644
index 00000000..95ff4cb8
--- /dev/null
+++ b/3rdparty/pybind11/.github/workflows/upstream.yml
@@ -0,0 +1,112 @@
+
+name: Upstream
+
+on:
+ workflow_dispatch:
+ pull_request:
+
+concurrency:
+ group: upstream-${{ github.ref }}
+ cancel-in-progress: true
+
+env:
+ PIP_ONLY_BINARY: numpy
+
+jobs:
+ standard:
+ name: "🐍 3.11 latest internals • ubuntu-latest • x64"
+ runs-on: ubuntu-latest
+ if: "contains(github.event.pull_request.labels.*.name, 'python dev')"
+
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Setup Python 3.11
+ uses: actions/setup-python@v4
+ with:
+ python-version: "3.11-dev"
+
+ - name: Setup Boost (Linux)
+ if: runner.os == 'Linux'
+ run: sudo apt-get install libboost-dev
+
+ - name: Update CMake
+ uses: jwlawson/actions-setup-cmake@v1.12
+
+ - name: Prepare env
+ run: |
+ python -m pip install -r tests/requirements.txt
+
+ - name: Setup annotations on Linux
+ if: runner.os == 'Linux'
+ run: python -m pip install pytest-github-actions-annotate-failures
+
+ # First build - C++11 mode and inplace
+ - name: Configure C++11
+ run: >
+ cmake -S . -B .
+ -DPYBIND11_WERROR=ON
+ -DDOWNLOAD_CATCH=ON
+ -DDOWNLOAD_EIGEN=ON
+ -DCMAKE_CXX_STANDARD=11
+
+ - name: Build C++11
+ run: cmake --build . -j 2
+
+ - name: Python tests C++11
+ run: cmake --build . --target pytest -j 2
+
+ - name: C++11 tests
+ run: cmake --build . --target cpptest -j 2
+
+ - name: Interface test C++11
+ run: cmake --build . --target test_cmake_build
+
+ - name: Clean directory
+ run: git clean -fdx
+
+ # Second build - C++17 mode and in a build directory
+ - name: Configure C++17
+ run: >
+ cmake -S . -B build2
+ -DPYBIND11_WERROR=ON
+ -DDOWNLOAD_CATCH=ON
+ -DDOWNLOAD_EIGEN=ON
+ -DCMAKE_CXX_STANDARD=17
+ ${{ matrix.args }}
+ ${{ matrix.args2 }}
+
+ - name: Build
+ run: cmake --build build2 -j 2
+
+ - name: Python tests
+ run: cmake --build build2 --target pytest
+
+ - name: C++ tests
+ run: cmake --build build2 --target cpptest
+
+ # Third build - C++17 mode with unstable ABI
+ - name: Configure (unstable ABI)
+ run: >
+ cmake -S . -B build3
+ -DPYBIND11_WERROR=ON
+ -DDOWNLOAD_CATCH=ON
+ -DDOWNLOAD_EIGEN=ON
+ -DCMAKE_CXX_STANDARD=17
+ -DPYBIND11_INTERNALS_VERSION=10000000
+ "-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
+ ${{ matrix.args }}
+
+ - name: Build (unstable ABI)
+ run: cmake --build build3 -j 2
+
+ - name: Python tests (unstable ABI)
+ run: cmake --build build3 --target pytest
+
+ - name: Interface test
+ run: cmake --build build3 --target test_cmake_build
+
+ # This makes sure the setup_helpers module can build packages using
+ # setuptools
+ - name: Setuptools helpers test
+ run: pytest tests/extra_setuptools
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 03:41:31 +0000