Skip to content

Commit

Permalink
chore: update to black 23 (#4482)
Browse files Browse the repository at this point in the history
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
  • Loading branch information
henryiii authored Feb 1, 2023
1 parent 44e9368 commit 3efe9d4
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 30 deletions.
18 changes: 9 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,40 +54,40 @@ repos:

# Black, the code formatter, natively supports pre-commit
- repo: https://github.com/psf/black
rev: "22.12.0" # Keep in sync with blacken-docs
rev: "23.1.0" # Keep in sync with blacken-docs
hooks:
- id: black

# Also code format the docs
- repo: https://github.com/asottile/blacken-docs
rev: "v1.12.1"
rev: "1.13.0"
hooks:
- id: blacken-docs
additional_dependencies:
- black==22.10.0 # keep in sync with black hook
- black==23.1.0 # keep in sync with black hook

# Changes tabs to spaces
- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: "v1.3.1"
rev: "v1.4.2"
hooks:
- id: remove-tabs

- repo: https://github.com/sirosen/texthooks
rev: "0.4.0"
rev: "0.5.0"
hooks:
- id: fix-ligatures
- id: fix-smartquotes

# Autoremoves unused imports
- repo: https://github.com/hadialqattan/pycln
rev: "v2.1.2"
rev: "v2.1.3"
hooks:
- id: pycln
stages: [manual]

# Checking for common mistakes
- repo: https://github.com/pre-commit/pygrep-hooks
rev: "v1.9.0"
rev: "v1.10.0"
hooks:
- id: python-check-blanket-noqa
- id: python-check-blanket-type-ignore
Expand Down Expand Up @@ -116,7 +116,7 @@ repos:

# PyLint has native support - not always usable, but works for us
- repo: https://github.com/PyCQA/pylint
rev: "v2.15.9"
rev: "v2.16.0"
hooks:
- id: pylint
files: ^pybind11
Expand Down Expand Up @@ -175,7 +175,7 @@ repos:

# Clang format the codebase automatically
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: "v15.0.6"
rev: "v15.0.7"
hooks:
- id: clang-format
types_or: [c++, c, cuda]
1 change: 0 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,6 @@ def clean_up(app, exception):


def setup(app):

# Add hook for building doxygen xml when needed
app.connect("builder-inited", generate_doxygen_xml)

Expand Down
1 change: 0 additions & 1 deletion pybind11/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ def print_includes() -> None:


def main() -> None:

parser = argparse.ArgumentParser()
parser.add_argument(
"--includes",
Expand Down
3 changes: 0 additions & 3 deletions pybind11/setup_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ def _add_ldflags(self, flags: List[str]) -> None:
self.extra_link_args[:0] = flags

def __init__(self, *args: Any, **kwargs: Any) -> None:

self._cxx_level = 0
cxx_std = kwargs.pop("cxx_std", 0)

Expand Down Expand Up @@ -174,7 +173,6 @@ def cxx_std(self) -> int:

@cxx_std.setter
def cxx_std(self, level: int) -> None:

if self._cxx_level:
warnings.warn("You cannot safely change the cxx_level after setting it!")

Expand Down Expand Up @@ -439,7 +437,6 @@ def compile_function(
extra_postargs: Optional[List[str]] = None,
depends: Optional[List[str]] = None,
) -> Any:

# These lines are directly from distutils.ccompiler.CCompiler
macros, objects, extra_postargs, pp_opts, build = compiler._setup_compile( # type: ignore[attr-defined]
output_dir, macros, include_dirs, sources, depends, extra_postargs
Expand Down
2 changes: 0 additions & 2 deletions tests/extra_python_package/test_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ def normalize_line_endings(value: bytes) -> bytes:


def test_build_sdist(monkeypatch, tmpdir):

monkeypatch.chdir(MAIN_DIR)

subprocess.run(
Expand Down Expand Up @@ -186,7 +185,6 @@ def test_build_sdist(monkeypatch, tmpdir):


def test_build_global_dist(monkeypatch, tmpdir):

monkeypatch.chdir(MAIN_DIR)
monkeypatch.setenv("PYBIND11_GLOBAL_SDIST", "1")
subprocess.run(
Expand Down
4 changes: 0 additions & 4 deletions tests/test_chrono.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@


def test_chrono_system_clock():

# Get the time from both c++ and datetime
date0 = datetime.datetime.today()
date1 = m.test_chrono1()
Expand Down Expand Up @@ -122,7 +121,6 @@ def test_chrono_system_clock_roundtrip_time(time1, tz, monkeypatch):


def test_chrono_duration_roundtrip():

# Get the difference between two times (a timedelta)
date1 = datetime.datetime.today()
date2 = datetime.datetime.today()
Expand All @@ -143,7 +141,6 @@ def test_chrono_duration_roundtrip():


def test_chrono_duration_subtraction_equivalence():

date1 = datetime.datetime.today()
date2 = datetime.datetime.today()

Expand All @@ -154,7 +151,6 @@ def test_chrono_duration_subtraction_equivalence():


def test_chrono_duration_subtraction_equivalence_date():

date1 = datetime.date.today()
date2 = datetime.date.today()

Expand Down
1 change: 0 additions & 1 deletion tests/test_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ def test_inheritance(msg):


def test_inheritance_init(msg):

# Single base
class Python(m.Pet):
def __init__(self):
Expand Down
3 changes: 2 additions & 1 deletion tests/test_custom_type_casters.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ def test_noconvert_args(msg):

def test_custom_caster_destruction():
"""Tests that returning a pointer to a type that gets converted with a custom type caster gets
destroyed when the function has py::return_value_policy::take_ownership policy applied."""
destroyed when the function has py::return_value_policy::take_ownership policy applied.
"""

cstats = m.destruction_tester_cstats()
# This one *doesn't* have take_ownership: the pointer should be used but not destroyed:
Expand Down
6 changes: 0 additions & 6 deletions tests/test_eigen_tensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ def assert_equal_tensor_ref(mat, writeable=True, modified=None):
@pytest.mark.parametrize("m", submodules)
@pytest.mark.parametrize("member_name", ["member", "member_view"])
def test_reference_internal(m, member_name):

if not hasattr(sys, "getrefcount"):
pytest.skip("No reference counting")
foo = m.CustomExample()
Expand Down Expand Up @@ -108,7 +107,6 @@ def test_convert_tensor_to_py(m, func_name):

@pytest.mark.parametrize("m", submodules)
def test_bad_cpp_to_python_casts(m):

with pytest.raises(
RuntimeError, match="Cannot use reference internal when there is no parent"
):
Expand All @@ -131,7 +129,6 @@ def test_bad_cpp_to_python_casts(m):

@pytest.mark.parametrize("m", submodules)
def test_bad_python_to_cpp_casts(m):

with pytest.raises(
TypeError, match=r"^round_trip_tensor\(\): incompatible function arguments"
):
Expand Down Expand Up @@ -194,7 +191,6 @@ def test_bad_python_to_cpp_casts(m):

@pytest.mark.parametrize("m", submodules)
def test_references_actually_refer(m):

a = m.reference_tensor()
temp = a[indices]
a[indices] = 100
Expand All @@ -211,7 +207,6 @@ def test_references_actually_refer(m):

@pytest.mark.parametrize("m", submodules)
def test_round_trip(m):

assert_equal_tensor_ref(m.round_trip_tensor(tensor_ref))

with pytest.raises(TypeError, match="^Cannot cast array data from"):
Expand Down Expand Up @@ -260,7 +255,6 @@ def test_round_trip(m):

@pytest.mark.parametrize("m", submodules)
def test_round_trip_references_actually_refer(m):

# Need to create a copy that matches the type on the C side
copy = np.array(tensor_ref, dtype=np.float64, order=m.needed_options)
a = m.round_trip_view_tensor(copy)
Expand Down
3 changes: 2 additions & 1 deletion tests/test_local_bindings.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ def test_stl_bind_global():
def test_mixed_local_global():
"""Local types take precedence over globally registered types: a module with a `module_local`
type can be registered even if the type is already registered globally. With the module,
casting will go to the local type; outside the module casting goes to the global type."""
casting will go to the local type; outside the module casting goes to the global type.
"""
import pybind11_cross_module_tests as cm

m.register_mixed_global()
Expand Down
1 change: 0 additions & 1 deletion tests/test_operator_overloading.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ def test_nested():


def test_overriding_eq_reset_hash():

assert m.Comparable(15) is not m.Comparable(15)
assert m.Comparable(15) == m.Comparable(15)

Expand Down

0 comments on commit 3efe9d4

Please sign in to comment.