upgrade precommit hooks (#263)

* Update pre-commit config

Signed-off-by: Fabrice Normandin <[email protected]>

* add missing __all__'s so Ruff doesn't break stuff

Signed-off-by: Fabrice Normandin <[email protected]>

---------

Signed-off-by: Fabrice Normandin <[email protected]>

Author: lebrice

.pre-commit-config.yaml

@@ -1,50 +1,92 @@
----
+default_language_version:
+  python: python3
+
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
-    hooks:
-    -   id: check-merge-conflict
-    -   id: end-of-file-fixer
-    -   id: trailing-whitespace
-  - repo: https://github.com/python/black
-    rev: 22.6.0
+    rev: v4.4.0
     hooks:
-      - id: black
-        args: ["--line-length=100"]
-  - repo: https://github.com/codespell-project/codespell
-    rev: v2.1.0
+      # list of supported hooks: https://pre-commit.com/hooks.html
+      - id: trailing-whitespace
+        require_serial: true
+      - id: end-of-file-fixer
+        require_serial: true
+      # - id: check-docstring-first
+      - id: check-yaml
+        require_serial: true
+      - id: debug-statements
+        require_serial: true
+      - id: detect-private-key
+        require_serial: true
+      - id: check-executables-have-shebangs
+        require_serial: true
+      - id: check-toml
+        require_serial: true
+      - id: check-case-conflict
+        require_serial: true
+      - id: check-added-large-files
+        require_serial: true
+
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    # Ruff version.
+    rev: 'v0.0.261'
     hooks:
-      - id: codespell
-        args: ["--ignore-words-list=hist,wont"]
-  - repo: https://github.com/pycqa/flake8
-    rev: 3.9.2
+      - id: ruff
+        args: ['--line-length', '99', '--fix']
+        require_serial: true
+
+  # python code formatting
+  - repo: https://github.com/psf/black
+    rev: 22.12.0
     hooks:
-      - id: flake8
-        args:
-          - --max-complexity=30
-          - --max-line-length=100
-          - --show-source
-          - --statistics
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+      - id: black
+        args: [--line-length, "99"]
+        require_serial: true
+
+  # python docstring formatting
+  - repo: https://github.com/myint/docformatter
+    rev: v1.5.1
     hooks:
-      - id: isort
-        args: ["--profile", "black"]
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v2.34.0
+      - id: docformatter
+        args: [--in-place, --wrap-summaries=99, --wrap-descriptions=99]
+        require_serial: true
+
+  # NOTE: Disabling this, since I'm having the glib-c2.29 weird bug.
+  # # yaml formatting
+  # - repo: https://github.com/pre-commit/mirrors-prettier
+  #   rev: v2.7.1
+  #   hooks:
+  #     - id: prettier
+  #       types: [yaml]
+
+  # jupyter notebook cell output clearing
+  - repo: https://github.com/kynan/nbstripout
+    rev: 0.6.1
     hooks:
-      - id: pyupgrade
-        args: ["--py37-plus"]
-  - repo: https://github.com/PyCQA/autoflake
-    rev: v1.4
+      - id: nbstripout
+        require_serial: true
+
+
+  # md formatting
+  - repo: https://github.com/executablebooks/mdformat
+    rev: 0.7.16
     hooks:
-      - id: autoflake
-        args: ["--in-place", "--expand-star-imports", "--remove-all-unused-imports", "--ignore-init-module-imports"]
+      - id: mdformat
+        args: ["--number"]
+        additional_dependencies:
+          - mdformat-gfm
+          - mdformat-tables
+          - mdformat_frontmatter
+          # - mdformat-toc
+          # - mdformat-black
+        require_serial: true
 
-  # BUG: Appears not to not always work properly! Enable locally if you want, but the CI will use
-  # the tox variant for now.
-  # - repo: https://github.com/PyCQA/doc8
-  #   rev: 0.8.1
-  #   hooks:
-  #     - id: doc8
-  #       args: ["--max-line-length=100", "--file-encoding=utf-8"]
+
+  # word spelling linter
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.2
+    hooks:
+      - id: codespell
+        args:
+          - --skip=logs/**,data/**
+          # - --ignore-words-list=abc,def
+        require_serial: true

simple_parsing/helpers/hparams/__init__.py

@@ -1,3 +1,16 @@
 from .hparam import categorical, hparam, log_uniform, loguniform, uniform
 from .hyperparameters import HP, HyperParameters, Point
 from .priors import LogUniformPrior, UniformPrior
+
+__all__ = [
+    "categorical",
+    "hparam",
+    "log_uniform",
+    "loguniform",
+    "uniform",
+    "HP",
+    "HyperParameters",
+    "Point",
+    "LogUniformPrior",
+    "UniformPrior",
+]

simple_parsing/wrappers/__init__.py

@@ -1,2 +1,4 @@
 from .dataclass_wrapper import DataclassWrapper
 from .field_wrapper import DashVariant, FieldWrapper
+
+__all__ = ["DataclassWrapper", "FieldWrapper", "DashVariant"]

test/__init__.py

@@ -3,4 +3,5 @@
 pytest.register_assert_rewrite("test.testutils")
 
 from . import testutils  # noqa: E402
-from .testutils import *  # noqa: E402
+
+__all__ = ["testutils"]

test/nesting/__init__.py

@@ -1 +0,0 @@
-from ..testutils import *

test/nesting/test_nesting_simple.py

@@ -6,7 +6,7 @@
 import simple_parsing
 from simple_parsing import ConflictResolution, field
 
-from . import TestSetup
+from ..testutils import TestSetup
 from .example_use_cases import HParams, RunConfig, TrainConfig
 
 

test/test_generation_mode.py

@@ -4,7 +4,7 @@
 
 from simple_parsing.wrappers.field_wrapper import ArgumentGenerationMode, NestedMode
 
-from . import TestSetup
+from .testutils import TestSetup
 
 
 @dataclass

test/test_suppress.py

@@ -1,7 +1,7 @@
 import argparse
 import shlex
 from dataclasses import dataclass
-from test import raises_missing_required_arg
+from test.testutils import raises_missing_required_arg
 
 from simple_parsing import ArgumentParser
 from simple_parsing.utils import str2bool