From 23f31ec7b1550e38591194fbc4135ded272d7413 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Wed, 13 Sep 2023 00:12:55 +0300 Subject: [PATCH] update template (#30) * update template * Delete .github/workflows/release.yaml.rej * Delete pyproject.toml.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 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.cruft.json b/.cruft.json index 53012a1..e1525e5 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 e94ffe5..8fcd2a4 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