Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump pre-commit from 3.6.2 to 3.7.1 #382

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
run: sudo apt-get install -y '^libxcb.*-dev' libegl-dev libwebp-dev libpng16-16 libx11-xcb-dev rpm
- name: Cache python packages
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .venv
key: venv-${{ env.LATEST_PY_VERSION }}-pyinstaller-${{ matrix.os }}-${{ hashFiles('poetry.lock') }}
Expand Down Expand Up @@ -111,21 +111,21 @@ jobs:

# Upload workflow artifacts
- name: Upload pyinstaller package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: naturtag-${{ env.DIST_NAME }}.tar.gz
path: naturtag-${{ env.DIST_NAME }}.tar.gz

- name: Upload disk image (macOS)
if: ${{ matrix.os == 'macos-latest' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: naturtag.dmg
path: dist/naturtag.dmg

- name: Upload FPM workflow artifacts (Linux)
if : ${{ matrix.os == 'ubuntu-latest' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: naturtag-fpm
path: dist/naturtag.*
Expand All @@ -136,7 +136,7 @@ jobs:
runs-on: ubuntu-latest
needs: build-app-packages
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
- name: Collect artifacts from workflow subdirs
run: |
find . -type d -depth -name 'naturtag*' -exec mv {} {}_dir \;
Expand All @@ -145,7 +145,7 @@ jobs:
ls -ARl

- name: Create release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
files: 'naturtag*'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
# Cache packages per python version, and reuse until lockfile changes
- name: Cache python packages
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .venv
key: venv-${{ matrix.python-version }}-${{ hashFiles('poetry.lock') }}
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ repos:
- id: mixed-line-ending
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.7
rev: v0.2.2
hooks:
- id: ruff
- id: ruff-format
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.4.0
rev: v1.8.0
hooks:
- id: mypy
additional_dependencies: [attrs, types-python-dateutil, types-requests, types-PyYAML]
3 changes: 2 additions & 1 deletion naturtag/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ class YamlMixin:
@classmethod
def read(cls, path: Optional[Path]) -> 'YamlMixin':
"""Read settings from config file"""
path = path or cls.path
# TODO: conflicts with class variable access?
path = path or cls.path # type: ignore

# New file; no contents to read
if not path or not path.is_file():
Expand Down
Loading
Loading