From a85d47c42e8ef500ef60e684cd250de0d206633c Mon Sep 17 00:00:00 2001 From: daavoo Date: Wed, 24 May 2023 01:39:59 +0000 Subject: [PATCH] update template --- .cruft.json | 2 +- pyproject.toml.rej | 12 ++++++++++++ setup.cfg.rej | 27 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 pyproject.toml.rej create mode 100644 setup.cfg.rej diff --git a/.cruft.json b/.cruft.json index 8c7b014..3cc33c7 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/iterative/cookiecutter-dvc-plugin", - "commit": "b5468040d24fba172720eaa61fb37dab48bda808", + "commit": "5e94b9534e6e169da559d3621884051c1575e7e1", "checkout": null, "context": { "cookiecutter": { diff --git a/pyproject.toml.rej b/pyproject.toml.rej new file mode 100644 index 0000000..999e3c0 --- /dev/null +++ b/pyproject.toml.rej @@ -0,0 +1,12 @@ +diff a/pyproject.toml b/pyproject.toml (rejected hunks) +@@ -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.rej b/setup.cfg.rej new file mode 100644 index 0000000..17f2d70 --- /dev/null +++ b/setup.cfg.rej @@ -0,0 +1,27 @@ +diff a/setup.cfg b/setup.cfg (rejected hunks) +@@ -40,7 +40,7 @@ tests = + pytest-xdist==2.4.0 + pytest-mock==3.6.1 + pytest-lazy-fixture==0.6.3 +- pytest-docker==0.10.3 ++ pytest-docker>=1,<2 + flaky==3.7.0 + mock==4.0.3 + wget==3.2 +@@ -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