pyproject.toml/.pre-commit-config.yaml: Use default import sorting rules for all files

mpsijm · mpsijm · commit 45c7f0421bde · 2025-12-15T23:04:13.000+01:00
As discussed in RagnarGrootKoerkamp#473 (comment)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,9 +9,6 @@ repos:
     hooks:
     -   id: ruff
         args: [ --fix ]
-    -   id: ruff
-        files: ^bapctools/.*\.py$
-        args: ["--select=I", "--fix"]
     -   id: ruff-format
 -   repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.15.0
diff --git a/bapctools/cli.py b/bapctools/cli.py
@@ -15,7 +15,6 @@
 """
 
 import argparse
-import colorama
 import hashlib
 import os
 import re
@@ -24,10 +23,12 @@
 import sys
 import tempfile
 from collections import Counter
-from colorama import Style
 from pathlib import Path
 from typing import Any, Optional
 
+import colorama
+from colorama import Style
+
 # Local imports
 from bapctools import (
     config,
diff --git a/bapctools/config.py b/bapctools/config.py
@@ -5,10 +5,11 @@
 import re
 import sys
 from collections.abc import Sequence
-from colorama import Fore, Style
 from pathlib import Path
 from typing import Any, Final, Literal, Optional, TypeVar
 
+from colorama import Fore, Style
+
 import bapctools
 
 # Randomly generated uuid4 for BAPCtools
diff --git a/bapctools/constraints.py b/bapctools/constraints.py
@@ -1,8 +1,9 @@
 import re
 from collections import defaultdict
-from colorama import Fore, Style
 from typing import Optional
 
+from colorama import Fore, Style
+
 from bapctools import latex, validate
 from bapctools.problem import Problem
 from bapctools.util import eprint, error, log, warn
diff --git a/bapctools/export.py b/bapctools/export.py
@@ -1,10 +1,11 @@
 import re
 import shutil
-import yaml
 import zipfile
 from pathlib import Path
 from typing import Optional
 
+import yaml
+
 from bapctools import config
 from bapctools.contest import (
     call_api,
diff --git a/bapctools/fuzz.py b/bapctools/fuzz.py
@@ -3,10 +3,11 @@
 import signal
 import threading
 import time
-from colorama import Style
 from pathlib import Path
 from typing import Any, Optional
 
+from colorama import Style
+
 from bapctools import config, generate, parallel, problem
 from bapctools.run import Run, Submission
 from bapctools.testcase import Testcase
diff --git a/bapctools/generate.py b/bapctools/generate.py
@@ -7,10 +7,11 @@
 import shutil
 import time
 from collections.abc import Callable, Iterable, Iterator, Sequence
-from colorama import Fore, Style
 from pathlib import Path, PurePosixPath
 from typing import cast, Final, Literal, Optional, overload, TypeVar
 
+from colorama import Fore, Style
+
 from bapctools import config, parallel, program, run, validate, visualize
 from bapctools.problem import Problem
 from bapctools.testcase import Testcase
diff --git a/bapctools/latex.py b/bapctools/latex.py
@@ -3,11 +3,12 @@
 import os
 import re
 import shutil
-from colorama import Fore, Style
 from enum import Enum
 from pathlib import Path
 from typing import Final, Optional, TextIO, TYPE_CHECKING
 
+from colorama import Fore, Style
+
 from bapctools import config
 from bapctools.contest import contest_yaml, problems_yaml
 from bapctools.util import (
diff --git a/bapctools/problem.py b/bapctools/problem.py
@@ -1,16 +1,13 @@
 import datetime
+import math
 import re
 import shutil
 import threading
 from collections.abc import Callable, Mapping, Sequence
-from colorama import Fore, Style
 from pathlib import Path
 from typing import Final, Literal, Optional, overload, TYPE_CHECKING
 
-if TYPE_CHECKING:  # Prevent circular import: https://stackoverflow.com/a/39757388
-    from bapctools.program import Program
-
-import math
+from colorama import Fore, Style
 
 from bapctools import (
     check_testing_tool,
@@ -51,6 +48,9 @@
     YamlParser,
 )
 
+if TYPE_CHECKING:  # Prevent circular import: https://stackoverflow.com/a/39757388
+    from bapctools.program import Program
+
 if has_ryaml:
     import ruamel.yaml
 
diff --git a/bapctools/program.py b/bapctools/program.py
@@ -5,10 +5,11 @@
 import subprocess
 import threading
 from collections.abc import Callable, Mapping, Sequence
-from colorama import Fore
 from pathlib import Path
 from typing import Any, Final, Optional, TYPE_CHECKING
 
+from colorama import Fore
+
 from bapctools import config
 from bapctools.util import (
     combine_hashes,
diff --git a/bapctools/run.py b/bapctools/run.py
@@ -3,11 +3,12 @@
 import subprocess
 import sys
 from collections.abc import Sequence
-from colorama import Fore, Style
 from contextlib import nullcontext
 from pathlib import Path
 from typing import Optional
 
+from colorama import Fore, Style
+
 from bapctools import config, interactive, parallel, problem, program, validate, visualize
 from bapctools.testcase import Testcase
 from bapctools.util import (
diff --git a/bapctools/stats.py b/bapctools/stats.py
@@ -1,11 +1,12 @@
 import statistics
 from collections.abc import Callable, Sequence
-from colorama import ansi, Fore, Style
 from datetime import datetime, timedelta, timezone
-from dateutil import parser
 from pathlib import Path
 from typing import Any, cast, Literal, Optional
 
+from colorama import ansi, Fore, Style
+from dateutil import parser
+
 from bapctools import config, generate, latex, program, validate
 from bapctools.problem import Problem
 from bapctools.util import eprint, error, glob, log, ShellCommand, warn
diff --git a/bapctools/testcase.py b/bapctools/testcase.py
@@ -1,10 +1,11 @@
 """Test case"""
 
 from collections.abc import Sequence
-from colorama import Fore, Style
 from pathlib import Path
 from typing import Optional, TYPE_CHECKING
 
+from colorama import Fore, Style
+
 from bapctools import config, validate
 from bapctools.util import (
     BAR_TYPE,
diff --git a/bapctools/util.py b/bapctools/util.py
@@ -13,9 +13,7 @@
 import tempfile
 import threading
 import time
-import yaml as yamllib
 from collections.abc import Callable, Mapping, Sequence
-from colorama import Fore, Style
 from enum import Enum
 from functools import wraps
 from io import StringIO
@@ -36,6 +34,9 @@
 )
 from uuid import UUID
 
+import yaml as yamllib
+from colorama import Fore, Style
+
 from bapctools import config
 
 try:
diff --git a/bapctools/verdicts.py b/bapctools/verdicts.py
@@ -3,11 +3,12 @@
 import sys
 import threading
 from collections.abc import Sequence
-from colorama import Fore, Style
 from enum import Enum
 from pathlib import Path
 from typing import Any, Literal, Optional, TYPE_CHECKING
 
+from colorama import Fore, Style
+
 from bapctools import config, testcase
 from bapctools.util import eprint, ITEM_TYPE, ProgressBar
 
diff --git a/bin/misc/rejudge_analyser.py b/bin/misc/rejudge_analyser.py
@@ -5,9 +5,10 @@
 # those that were AC originally and on the latest rejudge.
 
 import json
-import matplotlib.pyplot as plt
 from pathlib import Path
 
+import matplotlib.pyplot as plt
+
 
 def read_json(path):
     return json.loads(Path(path).read_text())
diff --git a/pyproject.toml b/pyproject.toml
@@ -28,11 +28,12 @@ build-backend = "hatchling.build"
 [tool.ruff]
 line-length = 100
 
+[tool.ruff.lint]
+# Enable import sorting rules
+extend-select = ["I"]
+
 [tool.ruff.lint.isort]
-# organize imports in two blocks, non local and local
-section-order = ["standard-library", "first-party"]
-default-section = "standard-library"
-# X,y,Z case insensitive in from ? import X, y, Z
+# Case-insensitive ordering in `from ? import X, y, Z`
 order-by-type = false
 
 [tool.pyright]
diff --git a/test/problems/alternativeencryption/generators/eval.py b/test/problems/alternativeencryption/generators/eval.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
-from random import seed, choice, randrange
-from string import ascii_lowercase as sigma
 import sys
+from random import choice, randrange, seed
+from string import ascii_lowercase as sigma
 
 # to make ruff happy
 randrange(1, 2)
diff --git a/test/problems/alternativeencryption/generators/generator.py b/test/problems/alternativeencryption/generators/generator.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
-import sys
 import random
+import sys
 
 maxlen = 100
 
diff --git a/test/problems/boolfind/input_validators/validate.py b/test/problems/boolfind/input_validators/validate.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python3
 
-import sys
 import re
-
+import sys
 
 try:
     line = sys.stdin.readline()
diff --git a/test/problems/different/input_validators/validate.py b/test/problems/different/input_validators/validate.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
-from sys import stdin
-import sys
 import re
+import sys
 
 integer = "(0|-?[1-9]\d*)"
 
@@ -10,7 +9,7 @@
 cases = 0
 
 while True:
-    line = stdin.readline()
+    line = sys.stdin.readline()
     if len(line) == 0:
         break
     assert re.match(integer + " " + integer + "\n", line), "'%s' is not a pair of integers" % line
diff --git a/test/problems/divsort/answer_validators/format/answer_format.py b/test/problems/divsort/answer_validators/format/answer_format.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-import sys
 import re
+import sys
 
 line = sys.stdin.readline()
 if not re.match(r"\d+(\.\d+)? [a-zA-Z]+\n", line):
diff --git a/test/problems/guess/input_validators/validate.py b/test/problems/guess/input_validators/validate.py
@@ -1,15 +1,14 @@
 #!/usr/bin/env python3
-from sys import stdin
-import sys
 import re
+import sys
 
 integer = "(0|-?[1-9]\d*)"
 pat = "(fixed|random|adaptive) " + integer + "\n"
 
-line = stdin.readline()
+line = sys.stdin.readline()
 assert re.match(pat, line)
 
-line = stdin.readline()
+line = sys.stdin.readline()
 assert len(line) == 0
 
 # Nothing to report
diff --git a/test/problems/guess/output_visualizer_disabled/guess-visualizer.py b/test/problems/guess/output_visualizer_disabled/guess-visualizer.py
@@ -1,7 +1,6 @@
 import sys
 from pathlib import Path
 
-
 with open(sys.argv[1]) as in_file, open(sys.argv[3] / Path("judgemessage.txt"), "r") as msg_file:
     mode = in_file.read().split()[0]
     assert mode in ("random", "fixed", "adaptive"), mode
diff --git a/test/problems/guessnoeofcheck/input_validators/validate.py b/test/problems/guessnoeofcheck/input_validators/validate.py
@@ -1,15 +1,14 @@
 #!/usr/bin/python
-from sys import stdin
-import sys
 import re
+import sys
 
 integer = "(0|-?[1-9]\d*)"
 pat = "(fixed|random|adaptive) " + integer + "\n"
 
-line = stdin.readline()
+line = sys.stdin.readline()
 assert re.match(pat, line)
 
-line = stdin.readline()
+line = sys.stdin.readline()
 assert len(line) == 0
 
 # Nothing to report
diff --git a/test/problems/helloproblemtools/input_validators/validate.py b/test/problems/helloproblemtools/input_validators/validate.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python3
-from sys import stdin
 import sys
 
 # The input should be ``Hello``
-assert stdin.readline() == "Hello!\n"
-assert len(stdin.readline()) == 0
+assert sys.stdin.readline() == "Hello!\n"
+assert len(sys.stdin.readline()) == 0
 
 sys.exit(42)
diff --git a/test/problems/identity/generators/dir/main.py b/test/problems/identity/generators/dir/main.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import sys
+
 import lib
 
 lib.output(sys.argv[1])
diff --git a/test/problems/identity/generators/main.py b/test/problems/identity/generators/main.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import sys
+
 import lib
 
 lib.output(sys.argv[1])
diff --git a/test/problems/identity/generators/random_gen.py b/test/problems/identity/generators/random_gen.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
-import sys
 import random
+import sys
 
 random.seed(sys.argv[1])
 print(random.randint(0, 1000))
diff --git a/test/problems/identity/generators/y/y.py b/test/problems/identity/generators/y/y.py
diff --git a/test/problems/interactivemultipass/output_validator/interctive_multipass_validator.py b/test/problems/interactivemultipass/output_validator/interctive_multipass_validator.py
diff --git a/test/problems/multipass/output_validator/multipass_validator.py b/test/problems/multipass/output_validator/multipass_validator.py
diff --git a/test/test_default_output_validator.py b/test/test_default_output_validator.py
diff --git a/test/test_generators_yaml.py b/test/test_generators_yaml.py
diff --git a/test/test_problem_yaml.py b/test/test_problem_yaml.py
diff --git a/test/test_problems.py b/test/test_problems.py
