From a47ee210c085534293b32b1670bf9744a5b2472e Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Wed, 13 Sep 2023 00:15:13 +0300 Subject: [PATCH] update template (#12) * update template * Delete .github/workflows/release.yaml.rej * Delete setup.cfg.rej --------- Co-authored-by: 0x2b3bfa0 <0x2b3bfa0@users.noreply.github.com> Co-authored-by: Helio Machado <0x2b3bfa0+git@googlemail.com> --- .cruft.json | 2 +- .github/workflows/update-template.yaml | 5 ++++- .pre-commit-config.yaml | 7 +++++++ pyproject.toml | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.cruft.json b/.cruft.json index a528057..3a2e085 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/iterative/cookiecutter-dvc-plugin", - "commit": "b5468040d24fba172720eaa61fb37dab48bda808", + "commit": "91159828cdce86290b97bf4985732651805523c4", "checkout": null, "context": { "cookiecutter": { diff --git a/.github/workflows/update-template.yaml b/.github/workflows/update-template.yaml index d4963aa..b238a4f 100644 --- a/.github/workflows/update-template.yaml +++ b/.github/workflows/update-template.yaml @@ -7,6 +7,9 @@ on: jobs: update: + permissions: + contents: write + pull-requests: write runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -23,4 +26,4 @@ jobs: with: commit-message: update template title: update template - token: ${{ secrets.WORKFLOW_TOKEN }} + token: ${{ github.token }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d4449c3..57660df 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,6 +2,13 @@ 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$ + repo: local - hooks: - id: black language_version: python3 diff --git a/pyproject.toml b/pyproject.toml index e39f427..5f01dec 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",