Support more modern ruff versions

* It's now called "ruff check"
* Some options need to be in tool.ruff.lint section of pyproject.toml

These still work for the ruff version (0.1.7) used in rubin-env 8.

Author: timj

pyproject.toml

@@ -7,9 +7,13 @@ profile = "black"
 line_length = 110
 
 [tool.ruff]
+line-length = 110
+target-version = "py311"
 exclude = [
     "__init__.py",
 ]
+
+[tool.ruff.lint]
 ignore = [
     "N802",
     "N803",
@@ -19,22 +23,20 @@ ignore = [
     "N816",
     "N999",
 ]
-line-length = 110
 select = [
     "E",  # pycodestyle
     "F",  # pyflakes
     "N",  # pep8-naming
     "W",  # pycodestyle
 ]
-target-version = "py311"
 extend-select = [
     "RUF100", # Warn about unused noqa
 ]
 
-[tool.ruff.pycodestyle]
+[tool.ruff.lint.pycodestyle]
 max-doc-length = 79
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "numpy"
 
 [tool.pytest.ini_options]

python/lsst/sconsUtils/tests.py

@@ -313,6 +313,7 @@ def runPythonLinter(self):
             if no suitable linter configuration was found.
         """
         linter: str | None = None
+        lint_options = ""
         root = SCons.Script.Dir("#").abspath
 
         # Never want linters to look in this directory.
@@ -333,6 +334,7 @@ def runPythonLinter(self):
                 else:
                     if "tool" in parsed and "ruff" in parsed["tool"]:
                         linter = "ruff"
+                        lint_options = "check"
 
                         # Ruff can complain about noqa in shebang line
                         # added by sconsUtils to bin/ scripts. Need to ignore.
@@ -371,8 +373,8 @@ def runPythonLinter(self):
         for path in glob.glob(os.path.join(self._tmpDir, "linter-*.log*")):
             os.unlink(path)
 
-        # Specify exclude directories.
-        lint_options = f"--extend-exclude={','.join(exclude_dirs)}"
+        # Specify exclude directories. Append to any existing lint options.
+        lint_options += f" --extend-exclude={','.join(exclude_dirs)}"
 
         cmd = f"""
         @printf "%s\\n" 'Running python linter {linter}...';