Deprecate redundant linting

.github/workflows/lint.yml

@@ -29,27 +29,11 @@ jobs:
       run: python -m pip install --upgrade pip
 
     - name: Install Ruff
-      run: python -m pip install "ruff==0.1.13"
+      run: python -m pip install "ruff==0.1.14"
 
     - name: Lint with Ruff
       run: ruff . --output-format github
 
-  flake8:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install --upgrade "flake8>=3.5.0" "flake8-simplify"
-    - name: Lint with flake8
-      run: flake8 .
-
   mypy:
     runs-on: ubuntu-latest
 

.ruff.toml

@@ -1,6 +1,6 @@
 target-version = "py39"  # Pin Ruff to Python 3.9
 line-length = 95
-required-version = "0.1.13"
+required-version = "0.1.14"
 show-source = true
 
 [lint]
@@ -23,10 +23,6 @@ ignore = [
     # pylint
     "PLC1901",  # simplify truthy/falsey string comparisons
 ]
-external = [  # Whitelist for RUF100 unknown code warnings
-    "E704",
-    "SIM113",
-]
 select = [
     # flake8-builtins ('A')
       # NOT YET USED

Makefile

@@ -41,7 +41,7 @@ clean: clean
 
 .PHONY: style-check
 style-check:
-	@flake8
+	@ruff
 
 .PHONY: type-check
 type-check:

pyproject.toml

@@ -81,9 +81,7 @@ docs = [
     "sphinxcontrib-websupport",
 ]
 lint = [
-    "flake8>=3.5.0",
-    "flake8-simplify",
-    "ruff==0.1.13",
+    "ruff==0.1.14",
     "mypy==1.8.0",
     "sphinx-lint",
     "docutils-stubs",

sphinx/application.py

@@ -949,7 +949,7 @@ def add_transform(self, transform: type[Transform]) -> None:
         refs: `Transform Priority Range Categories`__
 
         __ https://docutils.sourceforge.io/docs/ref/transforms.html#transform-priority-range-categories
-        """  # NoQA: E501,RUF100  # Flake8 thinks the URL is too long, Ruff special cases URLs.
+        """  # NoQA: RUF100
         self.registry.add_transform(transform)
 
     def add_post_transform(self, transform: type[Transform]) -> None:

sphinx/environment/__init__.py

@@ -100,38 +100,38 @@
 
     class _DomainsType(MutableMapping[str, Domain]):
         @overload
-        def __getitem__(self, key: Literal["c"]) -> CDomain: ...  # NoQA: E704
+        def __getitem__(self, key: Literal["c"]) -> CDomain: ...
         @overload
-        def __getitem__(self, key: Literal["cpp"]) -> CPPDomain: ...  # NoQA: E704
+        def __getitem__(self, key: Literal["cpp"]) -> CPPDomain: ...
         @overload
-        def __getitem__(self, key: Literal["changeset"]) -> ChangeSetDomain: ...  # NoQA: E704
+        def __getitem__(self, key: Literal["changeset"]) -> ChangeSetDomain: ...
         @overload
-        def __getitem__(self, key: Literal["citation"]) -> CitationDomain: ...  # NoQA: E704
+        def __getitem__(self, key: Literal["citation"]) -> CitationDomain: ...
         @overload
-        def __getitem__(self, key: Literal["index"]) -> IndexDomain: ...  # NoQA: E704
+        def __getitem__(self, key: Literal["index"]) -> IndexDomain: ...
         @overload
-        def __getitem__(self, key: Literal["js"]) -> JavaScriptDomain: ...  # NoQA: E704
+        def __getitem__(self, key: Literal["js"]) -> JavaScriptDomain: ...
         @overload
-        def __getitem__(self, key: Literal["math"]) -> MathDomain: ...  # NoQA: E704
+        def __getitem__(self, key: Literal["math"]) -> MathDomain: ...
         @overload
-        def __getitem__(self, key: Literal["py"]) -> PythonDomain: ...  # NoQA: E704
+        def __getitem__(self, key: Literal["py"]) -> PythonDomain: ...
         @overload
-        def __getitem__(self, key: Literal["rst"]) -> ReSTDomain: ...  # NoQA: E704
+        def __getitem__(self, key: Literal["rst"]) -> ReSTDomain: ...
         @overload
-        def __getitem__(self, key: Literal["std"]) -> StandardDomain: ...  # NoQA: E704
+        def __getitem__(self, key: Literal["std"]) -> StandardDomain: ...
         @overload
-        def __getitem__(self, key: Literal["duration"]) -> DurationDomain: ...  # NoQA: E704
+        def __getitem__(self, key: Literal["duration"]) -> DurationDomain: ...
         @overload
-        def __getitem__(self, key: Literal["todo"]) -> TodoDomain: ...  # NoQA: E704
+        def __getitem__(self, key: Literal["todo"]) -> TodoDomain: ...
         @overload
-        def __getitem__(self, key: str) -> Domain: ...  # NoQA: E704
-        def __getitem__(self, key): raise NotImplementedError  # NoQA: E704
-        def __setitem__(  # NoQA: E301,E704
+        def __getitem__(self, key: str) -> Domain: ...
+        def __getitem__(self, key): raise NotImplementedError
+        def __setitem__(  # NoQA: E301
             self, key: str, value: Domain,
         ) -> NoReturn: raise NotImplementedError
-        def __delitem__(self, key: str) -> NoReturn: raise NotImplementedError  # NoQA: E704
-        def __iter__(self) -> NoReturn: raise NotImplementedError  # NoQA: E704
-        def __len__(self) -> NoReturn: raise NotImplementedError  # NoQA: E704
+        def __delitem__(self, key: str) -> NoReturn: raise NotImplementedError
+        def __iter__(self) -> NoReturn: raise NotImplementedError
+        def __len__(self) -> NoReturn: raise NotImplementedError
 
 else:
     _DomainsType = dict