Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/coactions/dynamic-…
Browse files Browse the repository at this point in the history
…matrix-3
  • Loading branch information
alisonlhart authored Sep 13, 2024
2 parents 71b3642 + 9485cee commit 4f6edc4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: logs-${{ matrix.name }}.zip
include-hidden-files: true
path: |
.tox/**/log/
.tox/**/.coverage*
Expand Down Expand Up @@ -179,6 +180,7 @@ jobs:
uses: actions/upload-artifact/merge@v4
with:
name: logs.zip
include-hidden-files: true
pattern: logs-*.zip
# artifacts like py312.zip and py312-macos do have overlapping files
separate-directories: true
Expand Down Expand Up @@ -217,4 +219,5 @@ jobs:
- name: Delete Merged Artifacts
uses: actions/upload-artifact/merge@v4
with:
include-hidden-files: true
delete-merged: true
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ repos:
- prettier-plugin-toml
- prettier-plugin-sort-json
- repo: https://github.com/streetsidesoftware/cspell-cli
rev: v8.13.1
rev: v8.13.3
hooks:
- id: cspell
# entry: codespell --relative
args: [--relative, --no-progress, --no-summary]
name: Spell check with cspell
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.1
rev: 0.29.2
hooks:
- id: check-github-workflows
- repo: https://github.com/pre-commit/pre-commit-hooks.git
Expand Down Expand Up @@ -83,14 +83,14 @@ repos:
- id: pyupgrade
args: ["--py39-plus"]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.11.1
rev: v1.11.2
hooks:
- id: mypy
# empty args needed in order to match mypy cli behavior
args: []
additional_dependencies: ["mkdocs-macros-plugin"]
- repo: https://github.com/pycqa/pylint
rev: v3.2.6
rev: v3.2.7
hooks:
- id: pylint
args:
Expand Down

0 comments on commit 4f6edc4

Please sign in to comment.