diff --git a/.cruft.json b/.cruft.json index 1fc41c2..e3c721d 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/release.yaml b/.github/workflows/release.yaml index 5d5457c..e7589f6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,6 +9,10 @@ permissions: jobs: pip: + environment: pypi + permissions: + contents: read + id-token: write runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 @@ -27,5 +31,3 @@ jobs: twine check dist/* - name: Publish packages to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{ secrets.PYPI_TOKEN }} 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 0cfee93..3b6371c 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