Update pre-commit hooks (#14837)

This PR updates pre-commit hook versions and reformats the YAML so its spacing is more similar to the YAML format elsewhere in cudf and in other RAPIDS repos. Feel free to review this as two separate commits: a content change, and a format change. The changes outside of `.pre-commit-config.yaml` are from minor updates in `black`, which removed some extraneous blank lines, and a few fixes requested by `ruff`. Also, the newer version of nbqa in this PR supports Python 3.12. Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Matthew Roeschke (https://github.com/mroeschke) - Richard (Rick) Zamora (https://github.com/rjzamora) URL: #14837
rapidsai · Jan 25, 2024 · 59199da · 59199da
1 parent f5118c2
commit 59199da
Show file tree

Hide file tree

Showing 59 changed files with 203 additions and 327 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,159 +1,159 @@
-# Copyright (c) 2019-2022, NVIDIA CORPORATION.
+# Copyright (c) 2019-2024, NVIDIA CORPORATION.
 
 repos:
-      - repo: https://github.com/pre-commit/pre-commit-hooks
-        rev: v4.3.0
-        hooks:
-              - id: trailing-whitespace
-                exclude: |
-                  (?x)^(
-                    ^python/cudf/cudf/tests/data/subword_tokenizer_data/.*
-                  )
-              - id: end-of-file-fixer
-                exclude: |
-                  (?x)^(
-                    ^python/cudf/cudf/tests/data/subword_tokenizer_data/.*
-                  )
-      - repo: https://github.com/PyCQA/isort
-        rev: 5.12.0
-        hooks:
-              - id: isort
-                # Use the config file specific to each subproject so that each
-                # project can specify its own first/third-party packages.
-                args: ["--config-root=python/", "--resolve-all-configs"]
-                files: python/.*
-                types_or: [python, cython, pyi]
-      - repo: https://github.com/psf/black
-        rev: 22.3.0
-        hooks:
-              - id: black
-                files: python/.*
-                # Explicitly specify the pyproject.toml at the repo root, not per-project.
-                args: ["--config", "pyproject.toml"]
-      - repo: https://github.com/MarcoGorelli/cython-lint
-        rev: v0.15.0
-        hooks:
-              - id: cython-lint
-      - repo: https://github.com/pre-commit/mirrors-mypy
-        rev: 'v1.3.0'
-        hooks:
-              - id: mypy
-                additional_dependencies: [types-cachetools]
-                args: ["--config-file=pyproject.toml",
-                       "python/cudf/cudf",
-                       "python/custreamz/custreamz",
-                       "python/cudf_kafka/cudf_kafka",
-                       "python/dask_cudf/dask_cudf"]
-                pass_filenames: false
-      - repo: https://github.com/PyCQA/pydocstyle
-        rev: 6.1.1
-        hooks:
-              - id: pydocstyle
-                # https://github.com/PyCQA/pydocstyle/issues/603
-                additional_dependencies: [toml]
-                args: ["--config=pyproject.toml"]
-                exclude: |
-                  (?x)^(
-                    ^python/cudf/cudf/pandas/scripts/.*|
-                    ^python/cudf/cudf_pandas_tests/.*
-                  )
-      - repo: https://github.com/nbQA-dev/nbQA
-        rev: 1.6.3
-        hooks:
-              - id: nbqa-isort
-                # Use the cudf_kafka isort orderings in notebooks so that dask
-                # and RAPIDS packages have their own sections.
-                args: ["--settings-file=python/cudf_kafka/pyproject.toml"]
-              - id: nbqa-black
-                # Explicitly specify the pyproject.toml at the repo root, not per-project.
-                args: ["--config=pyproject.toml"]
-      - repo: https://github.com/pre-commit/mirrors-clang-format
-        rev: v16.0.6
-        hooks:
-              - id: clang-format
-                types_or: [c, c++, cuda]
-                args: ["-fallback-style=none", "-style=file", "-i"]
-      - repo: https://github.com/sirosen/texthooks
-        rev: 0.4.0
-        hooks:
-              - id: fix-smartquotes
-                exclude: |
-                  (?x)^(
-                    ^cpp/include/cudf_test/cxxopts.hpp|
-                    ^python/cudf/cudf/tests/data/subword_tokenizer_data/.*|
-                    ^python/cudf/cudf/tests/text/test_text_methods.py
-                  )
-      - repo: local
-        hooks:
-              - id: no-deprecationwarning
-                name: no-deprecationwarning
-                description: 'Enforce that DeprecationWarning is not introduced (use FutureWarning instead)'
-                entry: '(category=|\s)DeprecationWarning[,)]'
-                language: pygrep
-                types_or: [python, cython]
-              - id: no-programmatic-xfail
-                name: no-programmatic-xfail
-                description: 'Enforce that pytest.xfail is not introduced (see dev docs for details)'
-                entry: 'pytest\.xfail'
-                language: pygrep
-                types: [python]
-              - id: cmake-format
-                name: cmake-format
-                entry: ./cpp/scripts/run-cmake-format.sh cmake-format
-                language: python
-                types: [cmake]
-                # Note that pre-commit autoupdate does not update the versions
-                # of dependencies, so we'll have to update this manually.
-                additional_dependencies:
-                  - cmakelang==0.6.13
-                verbose: true
-                require_serial: true
-              - id: cmake-lint
-                name: cmake-lint
-                entry: ./cpp/scripts/run-cmake-format.sh cmake-lint
-                language: python
-                types: [cmake]
-                # Note that pre-commit autoupdate does not update the versions
-                # of dependencies, so we'll have to update this manually.
-                additional_dependencies:
-                  - cmakelang==0.6.13
-                verbose: true
-                require_serial: true
-              - id: copyright-check
-                name: copyright-check
-                entry: python ./ci/checks/copyright.py --git-modified-only --update-current-year
-                language: python
-                pass_filenames: false
-                additional_dependencies: [gitpython]
-              - id: doxygen-check
-                name: doxygen-check
-                entry: ./ci/checks/doxygen.sh
-                files: ^cpp/include/
-                types_or: [file]
-                language: system
-                pass_filenames: false
-                verbose: true
-      - repo: https://github.com/codespell-project/codespell
-        rev: v2.2.2
-        hooks:
-              - id: codespell
-                additional_dependencies: [tomli]
-                args: ["--toml", "pyproject.toml"]
-                exclude: |
-                  (?x)^(
-                    .*test.*|
-                    ^CHANGELOG.md$
-                  )
-      - repo: https://github.com/rapidsai/dependency-file-generator
-        rev: v1.8.0
-        hooks:
-            - id: rapids-dependency-file-generator
-              args: ["--clean"]
-      - repo: https://github.com/astral-sh/ruff-pre-commit
-        rev: v0.0.278
-        hooks:
-          - id: ruff
-            files: python/.*$
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: trailing-whitespace
+        exclude: |
+          (?x)^(
+            ^python/cudf/cudf/tests/data/subword_tokenizer_data/.*
+          )
+      - id: end-of-file-fixer
+        exclude: |
+          (?x)^(
+            ^python/cudf/cudf/tests/data/subword_tokenizer_data/.*
+          )
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.13.2
+    hooks:
+      - id: isort
+        # Use the config file specific to each subproject so that each
+        # project can specify its own first/third-party packages.
+        args: ["--config-root=python/", "--resolve-all-configs"]
+        files: python/.*
+        types_or: [python, cython, pyi]
+  - repo: https://github.com/psf/black
+    rev: 23.12.1
+    hooks:
+      - id: black
+        files: python/.*
+        # Explicitly specify the pyproject.toml at the repo root, not per-project.
+        args: ["--config", "pyproject.toml"]
+  - repo: https://github.com/MarcoGorelli/cython-lint
+    rev: v0.16.0
+    hooks:
+      - id: cython-lint
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: 'v1.3.0'
+    hooks:
+      - id: mypy
+        additional_dependencies: [types-cachetools]
+        args: ["--config-file=pyproject.toml",
+               "python/cudf/cudf",
+               "python/custreamz/custreamz",
+               "python/cudf_kafka/cudf_kafka",
+               "python/dask_cudf/dask_cudf"]
+        pass_filenames: false
+  - repo: https://github.com/PyCQA/pydocstyle
+    rev: 6.3.0
+    hooks:
+      - id: pydocstyle
+        # https://github.com/PyCQA/pydocstyle/issues/603
+        additional_dependencies: [tomli]
+        args: ["--config=pyproject.toml"]
+        exclude: |
+          (?x)^(
+            ^python/cudf/cudf/pandas/scripts/.*|
+            ^python/cudf/cudf_pandas_tests/.*
+          )
+  - repo: https://github.com/nbQA-dev/nbQA
+    rev: 1.7.1
+    hooks:
+      - id: nbqa-isort
+        # Use the cudf_kafka isort orderings in notebooks so that dask
+        # and RAPIDS packages have their own sections.
+        args: ["--settings-file=python/cudf_kafka/pyproject.toml"]
+      - id: nbqa-black
+        # Explicitly specify the pyproject.toml at the repo root, not per-project.
+        args: ["--config=pyproject.toml"]
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v16.0.6
+    hooks:
+      - id: clang-format
+        types_or: [c, c++, cuda]
+        args: ["-fallback-style=none", "-style=file", "-i"]
+  - repo: https://github.com/sirosen/texthooks
+    rev: 0.6.3
+    hooks:
+      - id: fix-smartquotes
+        exclude: |
+          (?x)^(
+            ^cpp/include/cudf_test/cxxopts.hpp|
+            ^python/cudf/cudf/tests/data/subword_tokenizer_data/.*|
+            ^python/cudf/cudf/tests/text/test_text_methods.py
+          )
+  - repo: local
+    hooks:
+      - id: no-deprecationwarning
+        name: no-deprecationwarning
+        description: 'Enforce that DeprecationWarning is not introduced (use FutureWarning instead)'
+        entry: '(category=|\s)DeprecationWarning[,)]'
+        language: pygrep
+        types_or: [python, cython]
+      - id: no-programmatic-xfail
+        name: no-programmatic-xfail
+        description: 'Enforce that pytest.xfail is not introduced (see dev docs for details)'
+        entry: 'pytest\.xfail'
+        language: pygrep
+        types: [python]
+      - id: cmake-format
+        name: cmake-format
+        entry: ./cpp/scripts/run-cmake-format.sh cmake-format
+        language: python
+        types: [cmake]
+        # Note that pre-commit autoupdate does not update the versions
+        # of dependencies, so we'll have to update this manually.
+        additional_dependencies:
+          - cmakelang==0.6.13
+        verbose: true
+        require_serial: true
+      - id: cmake-lint
+        name: cmake-lint
+        entry: ./cpp/scripts/run-cmake-format.sh cmake-lint
+        language: python
+        types: [cmake]
+        # Note that pre-commit autoupdate does not update the versions
+        # of dependencies, so we'll have to update this manually.
+        additional_dependencies:
+          - cmakelang==0.6.13
+        verbose: true
+        require_serial: true
+      - id: copyright-check
+        name: copyright-check
+        entry: python ./ci/checks/copyright.py --git-modified-only --update-current-year
+        language: python
+        pass_filenames: false
+        additional_dependencies: [gitpython]
+      - id: doxygen-check
+        name: doxygen-check
+        entry: ./ci/checks/doxygen.sh
+        files: ^cpp/include/
+        types_or: [file]
+        language: system
+        pass_filenames: false
+        verbose: true
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.2
+    hooks:
+      - id: codespell
+        additional_dependencies: [tomli]
+        args: ["--toml", "pyproject.toml"]
+        exclude: |
+          (?x)^(
+            .*test.*|
+            ^CHANGELOG.md$
+          )
+  - repo: https://github.com/rapidsai/dependency-file-generator
+    rev: v1.8.0
+    hooks:
+      - id: rapids-dependency-file-generator
+        args: ["--clean"]
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.13
+    hooks:
+      - id: ruff
+        files: python/.*$
 
 
 default_language_version:

diff --git a/python/cudf/benchmarks/conftest.py b/python/cudf/benchmarks/conftest.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022, NVIDIA CORPORATION.
+# Copyright (c) 2022-2024, NVIDIA CORPORATION.
 
 """Defines pytest fixtures for all benchmarks.
 
@@ -206,7 +206,6 @@ def default_union_id(val):
         (r"_rows_\d+", ""),
         (r"_cols_\d+", ""),
     ]:
-
         collapse_fixtures(fixtures, pat, repl, globals(), idfunc)
 
     num_new_fixtures = len(fixtures) - num_fixtures

diff --git a/python/cudf/benchmarks/internal/conftest.py b/python/cudf/benchmarks/internal/conftest.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022, NVIDIA CORPORATION.
+# Copyright (c) 2022-2024, NVIDIA CORPORATION.
 
 """Defines pytest fixtures for internal benchmarks."""
 
@@ -50,7 +50,6 @@ def column_nulls_true(request, nr=nr):
         ("_nulls_(true|false)", ""),
         (r"_rows_\d+", ""),
     ]:
-
         collapse_fixtures(fixtures, pat, repl, globals())
 
     num_new_fixtures = len(fixtures) - num_fixtures
diff --git a/python/cudf/cudf/_fuzz_testing/fuzzer.py b/python/cudf/cudf/_fuzz_testing/fuzzer.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2022, NVIDIA CORPORATION.
+# Copyright (c) 2020-2024, NVIDIA CORPORATION.
 
 import datetime
 import json
@@ -31,7 +31,6 @@ def __init__(
         max_lists_length=None,
         max_lists_nesting_depth=None,
     ):
-
         self._target = target
         self._dirs = [] if dirs is None else dirs
         self._crash_dir = crash_reports_dir
@@ -86,7 +85,6 @@ def write_crash(self, error):
             self._data_handler.write_data(error_file_name)
 
     def start(self):
-
         while True:
             logging.info(f"Running test {self._total_executions}")
             file_name = self._data_handler.generate_input()

diff --git a/python/cudf/cudf/core/buffer/spillable_buffer.py b/python/cudf/cudf/core/buffer/spillable_buffer.py
@@ -226,7 +226,6 @@ def spill(self, target: str = "cpu") -> None:
                     color=_get_color_for_nvtx("SpillHtoD"),
                     domain="cudf_python-spill",
                 ):
-
                     dev_mem = rmm.DeviceBuffer.to_device(
                         self._ptr_desc.pop("memoryview")
                     )

diff --git a/python/cudf/cudf/core/dataframe.py b/python/cudf/cudf/core/dataframe.py
@@ -3517,7 +3517,7 @@ def rename(
 
         if index:
             if (
-                any(type(item) == str for item in index.values())
+                any(isinstance(item, str) for item in index.values())
                 and type(self.index) != cudf.StringIndex
             ):
                 raise NotImplementedError(
@@ -5274,7 +5274,6 @@ def from_pandas(cls, dataframe, nan_as_null=no_default):
             )
 
         if isinstance(dataframe, pd.DataFrame):
-
             if not dataframe.columns.is_unique:
                 raise ValueError("Duplicate column names are not allowed")
 

diff --git a/python/cudf/cudf/core/df_protocol.py b/python/cudf/cudf/core/df_protocol.py
@@ -792,7 +792,6 @@ def _set_missing_values(
     cudf_col: cudf.core.column.ColumnBase,
     allow_copy: bool,
 ) -> cudf.core.column.ColumnBase:
-
     valid_mask = protocol_col.get_buffers()["validity"]
     if valid_mask is not None:
         null, invalid = protocol_col.describe_null