Merge branch 'smart_holder' into pywrapcc_merge_sh

Author: rwgk

.pre-commit-config.yaml

@@ -42,7 +42,7 @@ repos:
 
 # Black, the code formatter, natively supports pre-commit
 - repo: https://github.com/psf/black
-  rev: "23.1.0" # Keep in sync with blacken-docs
+  rev: "23.3.0" # Keep in sync with blacken-docs
   hooks:
   - id: black
 
@@ -52,11 +52,11 @@ repos:
   hooks:
   - id: blacken-docs
     additional_dependencies:
-    - black==23.1.0 # keep in sync with black hook
+    - black==23.3.0 # keep in sync with black hook
 
 # Changes tabs to spaces
 - repo: https://github.com/Lucas-C/pre-commit-hooks
-  rev: "v1.4.2"
+  rev: "v1.5.1"
   hooks:
   - id: remove-tabs
     exclude: (^docs/.*|\.patch)?$
@@ -70,7 +70,7 @@ repos:
 
 # Ruff, the Python auto-correcting linter written in Rust
 - repo: https://github.com/charliermarsh/ruff-pre-commit
-  rev: v0.0.254
+  rev: v0.0.263
   hooks:
   - id: ruff
     args: ["--fix", "--show-fixes"]
@@ -85,7 +85,7 @@ repos:
 
 # PyLint has native support - not always usable, but works for us
 - repo: https://github.com/PyCQA/pylint
-  rev: "v2.16.4"
+  rev: "v3.0.0a6"
   hooks:
   - id: pylint
     files: ^pybind11
@@ -101,7 +101,7 @@ repos:
 
 # Check static types with mypy
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: "v1.0.1"
+  rev: "v1.1.1"
   hooks:
   - id: mypy
     args: []
@@ -121,11 +121,11 @@ repos:
 # Use tools/codespell_ignore_lines_from_errors.py
 # to rebuild .codespell-ignore-lines
 - repo: https://github.com/codespell-project/codespell
-  rev: "v2.2.2"
+  rev: "v2.2.4"
   hooks:
   - id: codespell
     exclude: ".supp$"
-    args: ["-x", ".codespell-ignore-lines"]
+    args: ["-x.codespell-ignore-lines", "-Lccompiler"]
 
 # Check for common shell mistakes
 - repo: https://github.com/shellcheck-py/shellcheck-py
@@ -144,7 +144,7 @@ repos:
 
 # Clang format the codebase automatically
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: "v15.0.7"
+  rev: "v16.0.0"
   hooks:
   - id: clang-format
     types_or: [c++, c, cuda]

include/pybind11/detail/type_caster_base.h

@@ -258,9 +258,9 @@ struct value_and_holder {
 
     // Main constructor for a found value/holder:
     value_and_holder(instance *i, const detail::type_info *type, size_t vpos, size_t index)
-        : inst{i}, index{index}, type{type}, vh{inst->simple_layout
-                                                    ? inst->simple_value_holder
-                                                    : &inst->nonsimple.values_and_holders[vpos]} {}
+        : inst{i}, index{index}, type{type},
+          vh{inst->simple_layout ? inst->simple_value_holder
+                                 : &inst->nonsimple.values_and_holders[vpos]} {}
 
     // Default constructor (used to signal a value-and-holder not found by get_value_and_holder())
     value_and_holder() = default;

pyproject.toml

@@ -93,3 +93,4 @@ isort.known-first-party = ["env", "pybind11_cross_module_tests", "pybind11_tests
 
 [tool.ruff.per-file-ignores]
 "tests/**" = ["EM", "N"]
+"tests/test_call_policies.py" = ["PLC1901"]

tests/test_class_sh_property.py

@@ -92,7 +92,7 @@ def test_uqp(m_attr_readwrite, msg):
     field_orig.num = 39
     setattr(outer, m_attr_readwrite, field_orig)
     with pytest.raises(ValueError) as excinfo:
-        field_orig.num
+        _ = field_orig.num
     assert (
         msg(excinfo.value)
         == "Missing value for wrapped C++ type: Python instance was disowned."
@@ -103,7 +103,7 @@ def test_uqp(m_attr_readwrite, msg):
     field_retr1.num = 93
     setattr(outer, m_attr_readwrite, field_retr1)
     with pytest.raises(ValueError):
-        field_retr1.num
+        _ = field_retr1.num
     field_retr2 = getattr(outer, m_attr_readwrite)
     assert field_retr2.num == 93
 
@@ -150,7 +150,7 @@ def test_unique_ptr_field_proxy_poc(m_attr):
     assert field_proxy.num == 45
     assert field_proxy.num == 45
     with pytest.raises(AttributeError):
-        field_proxy.xyz
+        _ = field_proxy.xyz
     assert field_proxy.num == 45
     field_proxy.num = 82
     assert field_proxy.num == 82

tests/test_class_sh_property_non_owning.cpp

@@ -14,8 +14,8 @@ struct CoreField {
 struct DataField {
     DataField(int i_value, int i_shared, int i_unique)
         : core_fld_value{i_value}, core_fld_shared_ptr{new CoreField{i_shared}},
-          core_fld_raw_ptr{core_fld_shared_ptr.get()}, core_fld_unique_ptr{
-                                                           new CoreField{i_unique}} {}
+          core_fld_raw_ptr{core_fld_shared_ptr.get()},
+          core_fld_unique_ptr{new CoreField{i_unique}} {}
     CoreField core_fld_value;
     std::shared_ptr<CoreField> core_fld_shared_ptr;
     CoreField *core_fld_raw_ptr;

tests/test_class_sh_trampoline_self_life_support.py

@@ -14,7 +14,7 @@ def test_m_big5():
     assert o1 is not obj
     assert o1.history == "Seed"
     with pytest.raises(ValueError) as excinfo:
-        obj.history
+        _ = obj.history
     assert "Python instance was disowned" in str(excinfo.value)
     assert o2 is None
 

tests/test_class_sh_trampoline_shared_from_this.py

@@ -29,7 +29,7 @@ def test_release_and_shared_from_this_leak():
     obj = PySft("")
     while True:
         m.pass_shared_ptr(obj)
-        assert obj.history == ""
+        assert not obj.history
         assert m.use_count(obj) == 1
         break  # Comment out for manual leak checking (use `top` command).
 
@@ -82,11 +82,11 @@ def test_release_and_stash_leak():
     while True:
         stash1 = m.SftSharedPtrStash(1)
         stash1.Add(obj)
-        assert obj.history == ""
+        assert not obj.history
         assert m.use_count(obj) == 2
         assert stash1.use_count(0) == 1
         stash1.Add(obj)
-        assert obj.history == ""
+        assert not obj.history
         assert m.use_count(obj) == 3
         assert stash1.use_count(0) == 2
         assert stash1.use_count(1) == 2
@@ -117,10 +117,10 @@ def test_release_and_stash_via_shared_from_this_leak():
             stash1.AddSharedFromThis(obj)
         assert str(exc_info.value) == "bad_weak_ptr"
         stash1.Add(obj)
-        assert obj.history == ""
+        assert not obj.history
         assert stash1.use_count(0) == 1
         stash1.AddSharedFromThis(obj)
-        assert obj.history == ""
+        assert not obj.history
         assert stash1.use_count(0) == 2
         assert stash1.use_count(1) == 2
         break  # Comment out for manual leak checking (use `top` command).
@@ -186,7 +186,7 @@ def test_multiple_registered_instances_for_same_pointee_leak():
         stash1.Add(m.Sft(obj0))
         assert stash1.use_count(0) == 1
         assert stash1.use_count(1) == 1
-        assert obj0.history == ""
+        assert not obj0.history
         break  # Comment out for manual leak checking (use `top` command).
 
 

tests/test_iostream.py

@@ -9,16 +9,16 @@ def test_captured(capsys):
     m.captured_output(msg)
     stdout, stderr = capsys.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
 
     m.captured_output_default(msg)
     stdout, stderr = capsys.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
 
     m.captured_err(msg)
     stdout, stderr = capsys.readouterr()
-    assert stdout == ""
+    assert not stdout
     assert stderr == msg
 
 
@@ -30,7 +30,7 @@ def test_captured_large_string(capsys):
     m.captured_output_default(msg)
     stdout, stderr = capsys.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
 
 
 def test_captured_utf8_2byte_offset0(capsys):
@@ -40,7 +40,7 @@ def test_captured_utf8_2byte_offset0(capsys):
     m.captured_output_default(msg)
     stdout, stderr = capsys.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
 
 
 def test_captured_utf8_2byte_offset1(capsys):
@@ -50,7 +50,7 @@ def test_captured_utf8_2byte_offset1(capsys):
     m.captured_output_default(msg)
     stdout, stderr = capsys.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
 
 
 def test_captured_utf8_3byte_offset0(capsys):
@@ -60,7 +60,7 @@ def test_captured_utf8_3byte_offset0(capsys):
     m.captured_output_default(msg)
     stdout, stderr = capsys.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
 
 
 def test_captured_utf8_3byte_offset1(capsys):
@@ -70,7 +70,7 @@ def test_captured_utf8_3byte_offset1(capsys):
     m.captured_output_default(msg)
     stdout, stderr = capsys.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
 
 
 def test_captured_utf8_3byte_offset2(capsys):
@@ -80,7 +80,7 @@ def test_captured_utf8_3byte_offset2(capsys):
     m.captured_output_default(msg)
     stdout, stderr = capsys.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
 
 
 def test_captured_utf8_4byte_offset0(capsys):
@@ -90,7 +90,7 @@ def test_captured_utf8_4byte_offset0(capsys):
     m.captured_output_default(msg)
     stdout, stderr = capsys.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
 
 
 def test_captured_utf8_4byte_offset1(capsys):
@@ -100,7 +100,7 @@ def test_captured_utf8_4byte_offset1(capsys):
     m.captured_output_default(msg)
     stdout, stderr = capsys.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
 
 
 def test_captured_utf8_4byte_offset2(capsys):
@@ -110,7 +110,7 @@ def test_captured_utf8_4byte_offset2(capsys):
     m.captured_output_default(msg)
     stdout, stderr = capsys.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
 
 
 def test_captured_utf8_4byte_offset3(capsys):
@@ -120,15 +120,15 @@ def test_captured_utf8_4byte_offset3(capsys):
     m.captured_output_default(msg)
     stdout, stderr = capsys.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
 
 
 def test_guard_capture(capsys):
     msg = "I've been redirected to Python, I hope!"
     m.guard_output(msg)
     stdout, stderr = capsys.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
 
 
 def test_series_captured(capture):
@@ -145,7 +145,7 @@ def test_flush(capfd):
     with m.ostream_redirect():
         m.noisy_function(msg, flush=False)
         stdout, stderr = capfd.readouterr()
-        assert stdout == ""
+        assert not stdout
 
         m.noisy_function(msg2, flush=True)
         stdout, stderr = capfd.readouterr()
@@ -164,15 +164,15 @@ def test_not_captured(capfd):
         m.raw_output(msg)
     stdout, stderr = capfd.readouterr()
     assert stdout == msg
-    assert stderr == ""
-    assert stream.getvalue() == ""
+    assert not stderr
+    assert not stream.getvalue()
 
     stream = StringIO()
     with redirect_stdout(stream):
         m.captured_output(msg)
     stdout, stderr = capfd.readouterr()
-    assert stdout == ""
-    assert stderr == ""
+    assert not stdout
+    assert not stderr
     assert stream.getvalue() == msg
 
 
@@ -182,16 +182,16 @@ def test_err(capfd):
     with redirect_stderr(stream):
         m.raw_err(msg)
     stdout, stderr = capfd.readouterr()
-    assert stdout == ""
+    assert not stdout
     assert stderr == msg
-    assert stream.getvalue() == ""
+    assert not stream.getvalue()
 
     stream = StringIO()
     with redirect_stderr(stream):
         m.captured_err(msg)
     stdout, stderr = capfd.readouterr()
-    assert stdout == ""
-    assert stderr == ""
+    assert not stdout
+    assert not stderr
     assert stream.getvalue() == msg
 
 
@@ -221,21 +221,21 @@ def test_redirect(capfd):
         m.raw_output(msg)
     stdout, stderr = capfd.readouterr()
     assert stdout == msg
-    assert stream.getvalue() == ""
+    assert not stream.getvalue()
 
     stream = StringIO()
     with redirect_stdout(stream), m.ostream_redirect():
         m.raw_output(msg)
     stdout, stderr = capfd.readouterr()
-    assert stdout == ""
+    assert not stdout
     assert stream.getvalue() == msg
 
     stream = StringIO()
     with redirect_stdout(stream):
         m.raw_output(msg)
     stdout, stderr = capfd.readouterr()
     assert stdout == msg
-    assert stream.getvalue() == ""
+    assert not stream.getvalue()
 
 
 def test_redirect_err(capfd):
@@ -248,7 +248,7 @@ def test_redirect_err(capfd):
         m.raw_err(msg2)
     stdout, stderr = capfd.readouterr()
     assert stdout == msg
-    assert stderr == ""
+    assert not stderr
     assert stream.getvalue() == msg2
 
 
@@ -262,8 +262,8 @@ def test_redirect_both(capfd):
         m.raw_output(msg)
         m.raw_err(msg2)
     stdout, stderr = capfd.readouterr()
-    assert stdout == ""
-    assert stderr == ""
+    assert not stdout
+    assert not stderr
     assert stream.getvalue() == msg
     assert stream2.getvalue() == msg2