Use ruff format

Author: timj

pyproject.toml

@@ -47,3 +47,8 @@ convention = "numpy"
 
 [tool.pytest.ini_options]
 addopts = "--import-mode=importlib"  # Recommended as best practice
+
+[tool.ruff.format]
+docstring-code-format = true
+# ruff format does not seem to take indenting into account.
+docstring-code-line-length = 69

python/lsst/sconsUtils/installation.py

@@ -230,7 +230,7 @@ def Declare(self, products=None):
                 product = self["eupsProduct"]
 
             if "EUPS_DIR" in os.environ:
-                self["ENV"]["PATH"] += os.pathsep + f'{os.environ["EUPS_DIR"]}/bin'
+                self["ENV"]["PATH"] += os.pathsep + f"{os.environ['EUPS_DIR']}/bin"
                 self["ENV"]["EUPS_LOCK_PID"] = os.environ.get("EUPS_LOCK_PID", "-1")
                 if "undeclare" in SCons.Script.COMMAND_LINE_TARGETS or self.GetOption("clean"):
                     if version:
@@ -254,15 +254,15 @@ def Declare(self, products=None):
                     )
 
                     if "eupsPath" in self:
-                        command += f' -Z {self["eupsPath"]}'
+                        command += f" -Z {self['eupsPath']}"
 
                     if version:
                         command += f" {product} {version}"
 
                     current += [command + " --current"]
 
                     if self.GetOption("tag"):
-                        command += f' --tag={self.GetOption("tag")}'
+                        command += f" --tag={self.GetOption('tag')}"
 
                     declare += [command]
 
@@ -389,8 +389,10 @@ def InstallEups(env, dest, files=[], presetup=""):
 
     .. code-block:: python
 
-        env.InstallEups(os.path.join(env['prefix'], "ups"),
-                        presetup={"sconsUtils" : env['version']})
+        env.InstallEups(
+            os.path.join(env["prefix"], "ups"),
+            presetup={"sconsUtils": env["version"]},
+        )
     """
     acts = []
     if not env.installing:
@@ -449,9 +451,9 @@ def InstallEups(env, dest, files=[], presetup=""):
         for i in build_obj:
             env.AlwaysBuild(i)
 
-            cmd = f'eups expandbuild -i --version {env["version"]} '
+            cmd = f"eups expandbuild -i --version {env['version']} "
             if "baseversion" in env:
-                cmd += f' --repoversion {env["baseversion"]} '
+                cmd += f" --repoversion {env['baseversion']} "
             cmd += str(i)
             eupsTargets.extend(env.AddPostAction(build_obj, env.Action(f"{cmd}", cmd)))
 

python/lsst/sconsUtils/state.py

@@ -72,7 +72,7 @@ def _initOptions():
         action="store_true",
         default=False,
         help="Filter out a class of warnings deemed irrelevant",
-    ),
+    )
     SCons.Script.AddOption(
         "--force",
         dest="force",
@@ -579,13 +579,13 @@ def ClassifyCc(context):
     #
     if re.search(r"^(Linux|Linux64)$", env["eupsFlavor"]) and "LD_LIBRARY_PATH" in os.environ:
         env.Append(LINKFLAGS=["-Wl,-rpath-link"])
-        env.Append(LINKFLAGS=[f'-Wl,{os.environ["LD_LIBRARY_PATH"]}'])
+        env.Append(LINKFLAGS=[f"-Wl,{os.environ['LD_LIBRARY_PATH']}"])
     #
     # Set the optimization level.
     #
     if env["opt"]:
         env["CCFLAGS"] = [o for o in env["CCFLAGS"] if not re.search(r"^-O(\d|s|g|fast)$", o)]
-        env.MergeFlags(f'-O{env["opt"]}')
+        env.MergeFlags(f"-O{env['opt']}")
     #
     # Set compiler-specific warning flags.
     #

python/lsst/sconsUtils/vcs/git.py

@@ -43,7 +43,7 @@ def guessFingerprint():
         state.log.warn(f"Cannot guess fingerprint without .git directory; will be set to '{fingerprint}'.")
     else:
         fingerprint = utils.runExternal(
-            "git describe --match=" " --always --abbrev=0 --dirty", fatal=False
+            "git describe --match= --always --abbrev=0 --dirty", fatal=False
         ).strip()
 
     return fingerprint