diff --git a/.cruft.json b/.cruft.json index fca5072..26ac40f 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/iterative/cookiecutter-dvc-plugin", - "commit": "b5468040d24fba172720eaa61fb37dab48bda808", + "commit": "d98b3c3d7a00a8277dd6ae2acd6d7a8fd7c68a11", "checkout": null, "context": { "cookiecutter": { diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 25b28cb..40669bf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,6 +2,12 @@ ci: skip: [mypy, pylint] repos: + - hooks: + - id: no rej + name: Check for .rej files + entry: .rej files found, fix conflicts from these rejected files. + language: fail + files: \.rej$ - hooks: - id: black language_version: python3 diff --git a/pyproject.toml b/pyproject.toml index 4185081..93585c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,8 +58,8 @@ load-plugins = ["pylint_pytest"] [tool.pylint.message_control] disable = [ - "format", "refactoring", "spelling", "design", "no-self-use", - "invalid-name", "misplaced-comparison-constant", "duplicate-code", "fixme", + "format", "refactoring", "spelling", "design", + "invalid-name", "duplicate-code", "fixme", "unused-wildcard-import", "cyclic-import", "wrong-import-order", "wrong-import-position", "ungrouped-imports", "multiple-imports", "logging-format-interpolation", "logging-fstring-interpolation", diff --git a/setup.cfg b/setup.cfg index e214bf5..42efdee 100644 --- a/setup.cfg +++ b/setup.cfg @@ -52,14 +52,14 @@ tests = collective.checkdocs==0.2 pydocstyle==6.1.1 # pylint requirements - pylint==2.11.1 + pylint==2.16.2 # we use this to suppress pytest-related false positives in our tests. pylint-pytest==1.1.2 # we use this to suppress some messages in tests, eg: foo/bar naming, # and, protected method calls in our tests pylint-plugin-utils==0.6 # type-checking - mypy==0.910 + mypy==0.981 types-requests==2.25.11 types-tabulate==0.8.3 types-toml==0.10.1