From a15c45dbfe385b17b8870cee02f67d9c8667046c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 17 Mar 2023 14:17:05 +0100 Subject: [PATCH] Drop pyupgrade in favor of Ruff (#89865) --- .github/workflows/ci.yaml | 13 ------------- .pre-commit-config.yaml | 6 ------ requirements_test_pre_commit.txt | 1 - 3 files changed, 20 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f23b28f2c166d..d0dafda42128e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -407,19 +407,6 @@ jobs: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{ needs.info.outputs.pre-commit_cache_key }} - - name: Run pyupgrade (fully) - if: needs.info.outputs.test_full_suite == 'true' - run: | - . venv/bin/activate - pre-commit run --hook-stage manual pyupgrade --all-files --show-diff-on-failure - - name: Run pyupgrade (partially) - if: needs.info.outputs.test_full_suite == 'false' - shell: bash - run: | - . venv/bin/activate - shopt -s globstar - pre-commit run --hook-stage manual pyupgrade --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/{*,**/*} --show-diff-on-failure - - name: Register yamllint problem matcher run: | echo "::add-matcher::.github/workflows/matchers/yamllint.json" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8cedb60b8bb39..155d966e0fe5d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,12 +5,6 @@ repos: - id: ruff args: - --fix - - repo: https://github.com/asottile/pyupgrade - rev: v3.3.1 - hooks: - - id: pyupgrade - args: [--py310-plus] - stages: [manual] - repo: https://github.com/PyCQA/autoflake rev: v2.0.0 hooks: diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt index f64f422cc4066..410d74c9e3801 100644 --- a/requirements_test_pre_commit.txt +++ b/requirements_test_pre_commit.txt @@ -5,6 +5,5 @@ bandit==1.7.4 black==23.1.0 codespell==2.2.2 isort==5.12.0 -pyupgrade==3.3.1 ruff==0.0.256 yamllint==1.28.0