Merge branch 'pybind:master' into master

.clang-tidy

@@ -1,66 +1,66 @@
 FormatStyle: file
 
-Checks: '
+Checks: |
-*bugprone*,
+  *bugprone*,
-clang-analyzer-optin.performance.Padding,
+  *performance*,
-clang-analyzer-optin.cplusplus.VirtualCall,
+  clang-analyzer-optin.cplusplus.VirtualCall,
-cppcoreguidelines-init-variables,
+  clang-analyzer-optin.performance.Padding,
-cppcoreguidelines-prefer-member-initializer,
+  cppcoreguidelines-init-variables,
-cppcoreguidelines-pro-type-static-cast-downcast,
+  cppcoreguidelines-prefer-member-initializer,
-cppcoreguidelines-slicing,
+  cppcoreguidelines-pro-type-static-cast-downcast,
-google-explicit-constructor,
+  cppcoreguidelines-slicing,
-llvm-namespace-comment,
+  google-explicit-constructor,
-misc-definitions-in-headers,
+  llvm-namespace-comment,
-misc-misplaced-const,
+  misc-definitions-in-headers,
-misc-non-copyable-objects,
+  misc-misplaced-const,
-misc-static-assert,
+  misc-non-copyable-objects,
-misc-throw-by-value-catch-by-reference,
+  misc-static-assert,
-misc-uniqueptr-reset-release,
+  misc-throw-by-value-catch-by-reference,
-misc-unused-parameters,
+  misc-uniqueptr-reset-release,
-modernize-avoid-bind,
+  misc-unused-parameters,
-modernize-loop-convert,
+  modernize-avoid-bind,
-modernize-make-shared,
+  modernize-loop-convert,
-modernize-redundant-void-arg,
+  modernize-make-shared,
-modernize-replace-auto-ptr,
+  modernize-redundant-void-arg,
-modernize-replace-disallow-copy-and-assign-macro,
+  modernize-replace-auto-ptr,
-modernize-replace-random-shuffle,
+  modernize-replace-disallow-copy-and-assign-macro,
-modernize-shrink-to-fit,
+  modernize-replace-random-shuffle,
-modernize-use-auto,
+  modernize-shrink-to-fit,
-modernize-use-bool-literals,
+  modernize-use-auto,
-modernize-use-default-member-init,
+  modernize-use-bool-literals,
-modernize-use-equals-default,
+  modernize-use-default-member-init,
-modernize-use-equals-delete,
+  modernize-use-emplace,
-modernize-use-emplace,
+  modernize-use-equals-default,
-modernize-use-noexcept,
+  modernize-use-equals-delete,
-modernize-use-nullptr,
+  modernize-use-noexcept,
-modernize-use-override,
+  modernize-use-nullptr,
-modernize-use-using,
+  modernize-use-override,
-*performance*,
+  modernize-use-using,
-readability-avoid-const-params-in-decls,
+  readability-avoid-const-params-in-decls,
-readability-braces-around-statements,
+  readability-braces-around-statements,
-readability-const-return-type,
+  readability-const-return-type,
-readability-container-size-empty,
+  readability-container-size-empty,
-readability-delete-null-pointer,
+  readability-delete-null-pointer,
-readability-else-after-return,
+  readability-else-after-return,
-readability-implicit-bool-conversion,
+  readability-implicit-bool-conversion,
-readability-inconsistent-declaration-parameter-name,
+  readability-inconsistent-declaration-parameter-name,
-readability-make-member-function-const,
+  readability-make-member-function-const,
-readability-misplaced-array-index,
+  readability-misplaced-array-index,
-readability-non-const-parameter,
+  readability-non-const-parameter,
-readability-qualified-auto,
+  readability-qualified-auto,
-readability-redundant-function-ptr-dereference,
+  readability-redundant-function-ptr-dereference,
-readability-redundant-smartptr-get,
+  readability-redundant-smartptr-get,
-readability-redundant-string-cstr,
+  readability-redundant-string-cstr,
-readability-simplify-subscript-expr,
+  readability-simplify-subscript-expr,
-readability-static-accessed-through-instance,
+  readability-static-accessed-through-instance,
-readability-static-definition-in-anonymous-namespace,
+  readability-static-definition-in-anonymous-namespace,
-readability-string-compare,
+  readability-string-compare,
-readability-suspicious-call-argument,
+  readability-suspicious-call-argument,
-readability-uniqueptr-delete-release,
+  readability-uniqueptr-delete-release,
--bugprone-exception-escape,
+  -bugprone-easily-swappable-parameters,
--bugprone-reserved-identifier,
+  -bugprone-exception-escape,
--bugprone-unused-raii,
+  -bugprone-reserved-identifier,
-'
+  -bugprone-unused-raii,
 
 CheckOptions:
 - key:             performance-for-range-copy.WarnOnAllAutoCopies
@@ -73,5 +73,3 @@ CheckOptions:
   value:           true
 
 HeaderFilterRegex: 'pybind11/.*h'
-
-WarningsAsErrors: '*'

.github/CONTRIBUTING.md

@@ -235,12 +235,14 @@ 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:/mounted_pybind11 -it silkeh/clang:12
+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);-fix" -DDOWNLOAD_EIGEN=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=17
+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 -- --keep-going
+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

.github/workflows/ci.yml

@@ -281,6 +281,8 @@ jobs:
             std: 20
           - clang: 10
             std: 17
+          - clang: 14
+            std: 20
 
     name: "🐍 3 • Clang ${{ matrix.clang }} • C++${{ matrix.std }} • x64"
     container: "silkeh/clang:${{ matrix.clang }}"

.github/workflows/format.yml

@@ -36,7 +36,7 @@ jobs:
     # in .github/CONTRIBUTING.md and update as needed.
     name: Clang-Tidy
     runs-on: ubuntu-latest
-    container: silkeh/clang:12
+    container: silkeh/clang:13
     steps:
     - uses: actions/checkout@v3
 
@@ -46,7 +46,7 @@ jobs:
     - name: Configure
       run: >
         cmake -S . -B build
-        -DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy)"
+        -DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy);--use-color;--warnings-as-errors=*"
         -DDOWNLOAD_EIGEN=ON
         -DDOWNLOAD_CATCH=ON
         -DCMAKE_CXX_STANDARD=17

docs/_static/css/custom.css

@@ -0,0 +1,3 @@
+.highlight .go {
+  color: #707070;
+}

docs/_static/theme_overrides.css

@@ -1,11 +0,0 @@
-.wy-table-responsive table td,
-.wy-table-responsive table th {
-    white-space: initial !important;
-}
-.rst-content table.docutils td {
-    vertical-align: top !important;
-}
-div[class^='highlight'] pre {
-    white-space: pre;
-    white-space: pre-wrap;
-}

docs/conf.py

@@ -35,6 +35,7 @@ DIR = Path(__file__).parent.resolve()
 # ones.
 extensions = [
     "breathe",
+    "sphinx_copybutton",
     "sphinxcontrib.rsvgconverter",
     "sphinxcontrib.moderncmakedomain",
 ]
@@ -125,23 +126,7 @@ todo_include_todos = False
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 
-on_rtd = os.environ.get("READTHEDOCS", None) == "True"
+html_theme = "furo"
-
-if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
-
-    html_theme = "sphinx_rtd_theme"
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-    html_context = {"css_files": ["_static/theme_overrides.css"]}
-else:
-    html_context = {
-        "css_files": [
-            "//media.readthedocs.org/css/sphinx_rtd_theme.css",
-            "//media.readthedocs.org/css/readthedocs-doc-embed.css",
-            "_static/theme_overrides.css",
-        ]
-    }
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -172,6 +157,10 @@ else:
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ["_static"]
 
+html_css_files = [
+    "css/custom.css",
+]
+
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.

docs/requirements.txt

@@ -1,5 +1,6 @@
-breathe==4.32.0
+breathe==4.34.0
-sphinx==4.4.0
+furo==2022.6.21
-sphinx_rtd_theme==1.0.0
+sphinx==5.0.2
+sphinx-copybutton==0.5.0
 sphinxcontrib-moderncmakedomain==3.21.4
 sphinxcontrib-svg2pdfconverter==1.2.0

include/pybind11/eigen.h

@@ -692,9 +692,9 @@ struct type_caster<Type, enable_if_t<is_eigen_sparse<Type>::value>> {
         array outerIndices((rowMajor ? src.rows() : src.cols()) + 1, src.outerIndexPtr());
         array innerIndices(src.nonZeros(), src.innerIndexPtr());
 
-        return matrix_type(std::make_tuple(
+        return matrix_type(pybind11::make_tuple(
                                std::move(data), std::move(innerIndices), std::move(outerIndices)),
-                           std::make_pair(src.rows(), src.cols()))
+                           pybind11::make_tuple(src.rows(), src.cols()))
             .release();
     }
 

noxfile.py

@@ -61,10 +61,10 @@ def docs(session: nox.Session) -> None:
     session.chdir("docs")
 
     if "pdf" in session.posargs:
-        session.run("sphinx-build", "-b", "latexpdf", ".", "_build")
+        session.run("sphinx-build", "-M", "latexpdf", ".", "_build")
         return
 
-    session.run("sphinx-build", "-b", "html", ".", "_build")
+    session.run("sphinx-build", "-M", "html", ".", "_build")
 
     if "serve" in session.posargs:
         session.log("Launching docs at http://localhost:8000/ - use Ctrl-C to quit")

tests/test_embed/CMakeLists.txt

@@ -7,7 +7,7 @@ if("${PYTHON_MODULE_EXTENSION}" MATCHES "pypy" OR "${Python_INTERPRETER_ID}" STR
   return()
 endif()
 
-find_package(Catch 2.13.5)
+find_package(Catch 2.13.9)
 
 if(CATCH_FOUND)
   message(STATUS "Building interpreter tests using Catch v${CATCH_VERSION}")

tests/test_virtual_functions.cpp

@@ -342,9 +342,8 @@ TEST_SUBMODULE(virtual_functions, m) {
              const AdderBase &adder,
              const AdderBase::DataVisitor &visitor) {
               adder(first, second, [&](const AdderBase::Data &first_plus_second) {
-                  adder(first_plus_second,
+                  // NOLINTNEXTLINE(readability-suspicious-call-argument)
-                        third,
+                  adder(first_plus_second, third, visitor);
-                        visitor); // NOLINT(readability-suspicious-call-argument)
               });
           });