Skip to content

Commit

Permalink
Merge branch 'main' of github.com:SciTools/iris into recent-citation
Browse files Browse the repository at this point in the history
* 'main' of github.com:SciTools/iris:
  [pre-commit.ci] pre-commit autoupdate (SciTools#5120)
  Bump actions/stale from 6 to 7 (SciTools#5117)
  • Loading branch information
jonseddon committed Jan 3, 2023
2 parents edd08f3 + f6e4b81 commit 1048b6b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
if: "github.repository == 'SciTools/iris'"
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v6
- uses: actions/stale@v7
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ repos:
args: [--config=./setup.cfg]

- repo: https://github.com/pycqa/isort
rev: v5.11.3
rev: 5.11.4
hooks:
- id: isort
types: [file, python]
Expand Down

0 comments on commit 1048b6b

Please sign in to comment.