adrienverge · adrienverge · Jan 8, 2024 · Dec 31, 2023 · Jan 4, 2024
diff --git a/.flake8 b/.flake8
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -21,9 +21,9 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
       - run:
-          pip install flake8 flake8-import-order sphinx rstcheck[sphinx] doc8
+          pip install ruff sphinx rstcheck[sphinx] doc8
       - run: pip install .
-      - run: flake8 .
+      - run: ruff .
       - run: doc8 $(git ls-files '*.rst')
       - run: rstcheck --ignore-directives automodule $(git ls-files '*.rst')
       - run: yamllint --strict $(git ls-files '*.yaml' '*.yml')

diff --git a/.ruff.toml b/.ruff.toml
@@ -0,0 +1,5 @@
+[lint]
+extend-select = ["I"]
+
+[lint.isort]
+known-third-party = ["tests"]
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -23,7 +23,7 @@ Pull Request Process
 
    .. code:: bash
 
-    flake8 .
+    ruff .
 
    If you added/modified documentation:
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -1,8 +1,8 @@
 # yamllint documentation build configuration file, created by
 # sphinx-quickstart on Thu Jan 21 21:18:52 2016.
 
-import sys
 import os
+import sys
 from unittest.mock import MagicMock
 
 sys.path.insert(0, os.path.abspath('..'))

diff --git a/pyproject.toml b/pyproject.toml
@@ -26,9 +26,8 @@ dynamic = ["version"]
 [project.optional-dependencies]
 dev = [
     "doc8",
-    "flake8",
-    "flake8-import-order",
     "rstcheck[sphinx]",
+    "ruff",
     "sphinx",
 ]
 

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -15,5 +15,4 @@
 
 import locale
 
-
 locale.setlocale(locale.LC_ALL, 'C')
diff --git a/tests/common.py b/tests/common.py
@@ -21,8 +21,8 @@
 
 import yaml
 
-from yamllint.config import YamlLintConfig
 from yamllint import linter
+from yamllint.config import YamlLintConfig
 
 
 class RuleTestCase(unittest.TestCase):

diff --git a/tests/rules/test_indentation.py b/tests/rules/test_indentation.py
@@ -15,7 +15,7 @@
 
 from tests.common import RuleTestCase
 
-from yamllint.parser import token_or_comment_generator, Comment
+from yamllint.parser import Comment, token_or_comment_generator
 from yamllint.rules.indentation import check
 
 

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -13,7 +13,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from io import StringIO
 import fcntl
 import locale
 import os
@@ -22,11 +21,11 @@
 import sys
 import tempfile
 import unittest
+from io import StringIO
 
 from tests.common import build_temp_workspace, temp_workspace
 
-from yamllint import cli
-from yamllint import config
+from yamllint import cli, config
 
 
 class RunContext:

diff --git a/tests/test_config.py b/tests/test_config.py
@@ -13,18 +13,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from io import StringIO
 import os
 import shutil
 import sys
 import tempfile
 import unittest
+from io import StringIO
 
 from tests.common import build_temp_workspace
 
+from yamllint import cli, config
 from yamllint.config import YamlLintConfigError
-from yamllint import cli
-from yamllint import config
 
 
 class SimpleConfigTestCase(unittest.TestCase):

diff --git a/tests/test_linter.py b/tests/test_linter.py
@@ -16,8 +16,8 @@
 import io
 import unittest
 
-from yamllint.config import YamlLintConfig
 from yamllint import linter
+from yamllint.config import YamlLintConfig
 
 
 class LinterTestCase(unittest.TestCase):

diff --git a/tests/test_module.py b/tests/test_module.py
@@ -16,11 +16,10 @@
 import os
 import shutil
 import subprocess
-import tempfile
 import sys
+import tempfile
 import unittest
 
-
 PYTHON = sys.executable or 'python'
 
 

diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -17,9 +17,14 @@
 
 import yaml
 
-from yamllint.parser import (line_generator, token_or_comment_generator,
-                             token_or_comment_or_line_generator,
-                             Line, Token, Comment)
+from yamllint.parser import (
+    Comment,
+    Line,
+    Token,
+    line_generator,
+    token_or_comment_generator,
+    token_or_comment_or_line_generator,
+)
 
 
 class ParserTestCase(unittest.TestCase):

diff --git a/tests/test_spec_examples.py b/tests/test_spec_examples.py
@@ -17,7 +17,6 @@
 
 from tests.common import RuleTestCase
 
-
 # This file checks examples from YAML 1.2 specification [1] against yamllint.
 #
 # [1]: http://www.yaml.org/spec/1.2/spec.html

diff --git a/yamllint/cli.py b/yamllint/cli.py
@@ -19,8 +19,7 @@
 import platform
 import sys
 
-from yamllint import APP_DESCRIPTION, APP_NAME, APP_VERSION
-from yamllint import linter
+from yamllint import APP_DESCRIPTION, APP_NAME, APP_VERSION, linter
 from yamllint.config import YamlLintConfig, YamlLintConfigError
 from yamllint.linter import PROBLEM_LEVELS
 

diff --git a/yamllint/linter.py b/yamllint/linter.py
@@ -13,14 +13,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import re
 import io
+import re
 
 import yaml
 
 from yamllint import parser
 
-
 PROBLEM_LEVELS = {
     0: None,
     1: 'warning',

diff --git a/yamllint/rules/__init__.py b/yamllint/rules/__init__.py
@@ -25,6 +25,7 @@
     document_start,
     empty_lines,
     empty_values,
+    float_values,
     hyphens,
     indentation,
     key_duplicates,
@@ -33,7 +34,6 @@
     new_line_at_end_of_file,
     new_lines,
     octal_values,
-    float_values,
     quoted_strings,
     trailing_spaces,
     truthy,

diff --git a/yamllint/rules/anchors.py b/yamllint/rules/anchors.py
@@ -108,7 +108,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'anchors'
 TYPE = 'token'
 CONF = {'forbid-undeclared-aliases': bool,

diff --git a/yamllint/rules/braces.py b/yamllint/rules/braces.py
@@ -137,7 +137,6 @@
 from yamllint.linter import LintProblem
 from yamllint.rules.common import spaces_after, spaces_before
 
-
 ID = 'braces'
 TYPE = 'token'
 CONF = {'forbid': (bool, 'non-empty'),

diff --git a/yamllint/rules/brackets.py b/yamllint/rules/brackets.py
@@ -138,7 +138,6 @@
 from yamllint.linter import LintProblem
 from yamllint.rules.common import spaces_after, spaces_before
 
-
 ID = 'brackets'
 TYPE = 'token'
 CONF = {'forbid': (bool, 'non-empty'),

diff --git a/yamllint/rules/colons.py b/yamllint/rules/colons.py
@@ -82,7 +82,6 @@
 
 from yamllint.rules.common import is_explicit_key, spaces_after, spaces_before
 
-
 ID = 'colons'
 TYPE = 'token'
 CONF = {'max-spaces-before': int,

diff --git a/yamllint/rules/commas.py b/yamllint/rules/commas.py
@@ -106,7 +106,6 @@
 from yamllint.linter import LintProblem
 from yamllint.rules.common import spaces_after, spaces_before
 
-
 ID = 'commas'
 TYPE = 'token'
 CONF = {'max-spaces-before': int,

diff --git a/yamllint/rules/comments.py b/yamllint/rules/comments.py
@@ -75,7 +75,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'comments'
 TYPE = 'comment'
 CONF = {'require-starting-space': bool,

diff --git a/yamllint/rules/comments_indentation.py b/yamllint/rules/comments_indentation.py
@@ -79,7 +79,6 @@
 from yamllint.linter import LintProblem
 from yamllint.rules.common import get_line_indent
 
-
 ID = 'comments-indentation'
 TYPE = 'comment'
 

diff --git a/yamllint/rules/document_end.py b/yamllint/rules/document_end.py
@@ -85,7 +85,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'document-end'
 TYPE = 'token'
 CONF = {'present': bool}

diff --git a/yamllint/rules/document_start.py b/yamllint/rules/document_start.py
@@ -75,7 +75,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'document-start'
 TYPE = 'token'
 CONF = {'present': bool}

diff --git a/yamllint/rules/empty_lines.py b/yamllint/rules/empty_lines.py
@@ -61,7 +61,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'empty-lines'
 TYPE = 'line'
 CONF = {'max': int,

diff --git a/yamllint/rules/empty_values.py b/yamllint/rules/empty_values.py
@@ -105,7 +105,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'empty-values'
 TYPE = 'token'
 CONF = {'forbid-in-block-mappings': bool,

diff --git a/yamllint/rules/float_values.py b/yamllint/rules/float_values.py
@@ -90,7 +90,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'float-values'
 TYPE = 'token'
 CONF = {

diff --git a/yamllint/rules/hyphens.py b/yamllint/rules/hyphens.py
@@ -79,7 +79,6 @@
 
 from yamllint.rules.common import spaces_after
 
-
 ID = 'hyphens'
 TYPE = 'token'
 CONF = {'max-spaces-after': int}

diff --git a/yamllint/rules/indentation.py b/yamllint/rules/indentation.py
@@ -204,7 +204,6 @@
 from yamllint.linter import LintProblem
 from yamllint.rules.common import get_real_end_line, is_explicit_key
 
-
 ID = 'indentation'
 TYPE = 'token'
 CONF = {'spaces': (int, 'consistent'),

diff --git a/yamllint/rules/key_duplicates.py b/yamllint/rules/key_duplicates.py
@@ -93,7 +93,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'key-duplicates'
 TYPE = 'token'
 CONF = {'forbid-duplicated-merge-keys': bool}

diff --git a/yamllint/rules/key_ordering.py b/yamllint/rules/key_ordering.py
@@ -86,7 +86,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'key-ordering'
 TYPE = 'token'
 

diff --git a/yamllint/rules/line_length.py b/yamllint/rules/line_length.py
@@ -101,7 +101,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'line-length'
 TYPE = 'line'
 CONF = {'max': int,

diff --git a/yamllint/rules/new_line_at_end_of_file.py b/yamllint/rules/new_line_at_end_of_file.py
@@ -25,7 +25,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'new-line-at-end-of-file'
 TYPE = 'line'
 

diff --git a/yamllint/rules/new_lines.py b/yamllint/rules/new_lines.py
@@ -37,7 +37,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'new-lines'
 TYPE = 'line'
 CONF = {'type': ('unix', 'dos', 'platform')}

diff --git a/yamllint/rules/octal_values.py b/yamllint/rules/octal_values.py
@@ -76,7 +76,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'octal-values'
 TYPE = 'token'
 CONF = {'forbid-implicit-octal': bool,

diff --git a/yamllint/rules/trailing_spaces.py b/yamllint/rules/trailing_spaces.py
@@ -40,7 +40,6 @@
 
 from yamllint.linter import LintProblem
 
-
 ID = 'trailing-spaces'
 TYPE = 'line'
 

diff --git a/yamllint/rules/truthy.py b/yamllint/rules/truthy.py
@@ -125,7 +125,6 @@
 
 from yamllint.linter import LintProblem
 
-
 TRUTHY = ['YES', 'Yes', 'yes',
           'NO', 'No', 'no',
           'TRUE', 'True', 'true',
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ Pull Request Process @@
        .. code:: bash
-        flake8 .
+        ruff .
        If you added/modified documentation:
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,5 +15,4 @@

		import locale


		locale.setlocale(locale.LC_ALL, 'C')
Original file line number	Diff line number	Diff line change
Expand Up		@@ -86,7 +86,6 @@

		from yamllint.linter import LintProblem


		ID = 'key-ordering'
		TYPE = 'token'

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,7 +25,6 @@

		from yamllint.linter import LintProblem


		ID = 'new-line-at-end-of-file'
		TYPE = 'line'

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,7 +40,6 @@

		from yamllint.linter import LintProblem


		ID = 'trailing-spaces'
		TYPE = 'line'

Expand Down