From 40593a3895f93b95db562c2034b73d5196466d92 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 25 Dec 2025 21:59:22 +0100 Subject: [PATCH] Use ruff check --fix instead of isort. --- .git-blame-ignore-revs | 2 ++ .isort.cfg | 7 ------- antsibull-nox.toml | 9 +++++++-- ruff.toml | 6 ++++++ 4 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 .isort.cfg diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 3ee110b0..247931f6 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -6,3 +6,5 @@ 2487d1a0bf4f2c79d3ab5a9e7d0f969432bf32a2 # Reformat with black and isort d65d37e9e9a78e03a35643704b413121515ee39c +# Reformat with ruff check --fix instead of isort +81a8bcd01f271c955a8ea773467e2d1d2c418aed diff --git a/.isort.cfg b/.isort.cfg deleted file mode 100644 index bf8cf046..00000000 --- a/.isort.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) Ansible Project -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -[isort] -profile=black -lines_after_imports = 2 diff --git a/antsibull-nox.toml b/antsibull-nox.toml index d8d40a2d..82d3845e 100644 --- a/antsibull-nox.toml +++ b/antsibull-nox.toml @@ -16,9 +16,14 @@ stable_branches = [ "stable-*" ] [sessions] [sessions.lint] -run_isort = true -isort_config = ".isort.cfg" +run_isort = false run_black = true +run_ruff_autofix = true +ruff_autofix_config = "ruff.toml" +ruff_autofix_select = [ + "I", + "RUF022", +] run_ruff_check = true ruff_check_config = "ruff.toml" run_flake8 = true diff --git a/ruff.toml b/ruff.toml index dca70302..96fc5024 100644 --- a/ruff.toml +++ b/ruff.toml @@ -29,3 +29,9 @@ unfixable = [] # Allow unused variables when underscore-prefixed or starting with dummy dummy-variable-rgx = "^(_|dummy).*$" + +[lint.isort] +known-third-party = [ + "ansible_collections.community.internal_test_tools", + "ansible_collections.community.library_inventory_filtering_v1", +]