diff --git a/.github/renovate.json b/.github/renovate.json index ee6feba..f434968 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -45,6 +45,18 @@ "shellcheck-py/shellcheck-py" ], "versioning": "loose" + }, + { + "matchPackageNames": [ + "python" + ], + "matchDatasources": [ + "docker" + ], + "separateMinorPatch": true, + "minor": { + "dependencyDashboardApproval": true + } } ], "regexManagers": [ diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 885ff4d..b9d8c24 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -27,14 +27,19 @@ jobs: path: | ~/.cache/pip ~/.cache/pre-commit - key: ${{ runner.os }}-pre-commit-${{ hashFiles('**/requirements*.txt') }}-${{ hashFiles('.pre-commit-config.yaml') }} + key: ${{ runner.os }}-pre-commit-${{ hashFiles('**/requirements*.txt') }}-${{ hashFiles('.pre-commit-config.yaml') }}-${{ hashFiles('pyproject.toml') }} - name: Setup Python uses: actions/setup-python@v5 with: python-version: '3.11' + - name: Update pip + run: python -m pip install --upgrade pip wheel - name: Install dependencies run: | - python -m pip install --upgrade pip wheel - pip install -r requirements-lint.txt + if [ -f requirements-lint.txt ] ; then + pip install -r requirements-lint.txt + else + pip install -e .[lint] + fi - name: pre-commit run: pre-commit run --all diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fb89afc..ad43c0d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,19 +20,12 @@ repos: rev: v1.33.0 hooks: - id: yamllint -- repo: https://github.com/PyCQA/isort - rev: 5.13.2 - hooks: - - id: isort -- repo: https://github.com/psf/black - rev: 23.12.0 - hooks: - - id: black - repo: https://github.com/astral-sh/ruff-pre-commit rev: v0.1.8 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] + - id: ruff-format - repo: https://github.com/asottile/blacken-docs rev: 1.16.0 hooks: