A round of ruff format after ruff check --fix

Author: DimitriPapadopoulos

pkg_resources/__init__.py

@@ -3049,7 +3049,7 @@ def version(self):
             version = self._get_version()
             if version is None:
                 path = self._get_metadata_path_for_display(self.PKG_INFO)
-                msg = (f"Missing 'Version:' header and/or {self.PKG_INFO} file at path: {path}")
+                msg = f"Missing 'Version:' header and/or {self.PKG_INFO} file at path: {path}"
                 raise ValueError(msg, self) from e
 
             return version
@@ -3105,9 +3105,7 @@ def requires(self, extras: Iterable[str] = ()) -> list[Requirement]:
             try:
                 deps.extend(dm[safe_extra(ext)])
             except KeyError as e:
-                raise UnknownExtra(
-                    f"{self} has no such extra feature {ext!r}"
-                ) from e
+                raise UnknownExtra(f"{self} has no such extra feature {ext!r}") from e
         return deps
 
     def _get_metadata_path_for_display(self, name):

pkg_resources/tests/test_pkg_resources.py

@@ -255,7 +255,9 @@ def test_distribution_version_missing(
     basename = f'foo.{suffix}'
     dist, dist_dir = make_distribution_no_version(tmpdir, basename)
 
-    expected_text = (f"Missing 'Version:' header and/or {expected_filename} file at path: ")
+    expected_text = (
+        f"Missing 'Version:' header and/or {expected_filename} file at path: "
+    )
     metadata_path = os.path.join(dist_dir, expected_filename)
 
     # Now check the exception raised when the "version" attribute is accessed.

setuptools/__init__.py

@@ -181,9 +181,7 @@ def _ensure_stringlike(self, option, what, default=None):
             setattr(self, option, default)
             return default
         elif not isinstance(val, str):
-            raise DistutilsOptionError(
-                f"'{option}' must be a {what} (got `{val}`)"
-            )
+            raise DistutilsOptionError(f"'{option}' must be a {what} (got `{val}`)")
         return val
 
     def ensure_string_list(self, option: str) -> None:

setuptools/command/bdist_egg.py

@@ -263,9 +263,7 @@ def zap_pyfiles(self):
                     pattern = r'(?P<name>.+)\.(?P<magic>[^.]+)\.pyc'
                     m = re.match(pattern, name)
                     path_new = os.path.join(base, os.pardir, m.group('name') + '.pyc')
-                    log.info(
-                        f"Renaming file from [{path_old}] to [{path_new}]"
-                    )
+                    log.info(f"Renaming file from [{path_old}] to [{path_new}]")
                     try:
                         os.remove(path_new)
                     except OSError:

setuptools/command/easy_install.py

@@ -1112,7 +1112,9 @@ def install_wheel(self, wheel_path, tmpdir):
             self.execute(
                 wheel.install_as_egg,
                 (destination,),
-                (f"Installing {os.path.basename(wheel_path)} to {os.path.dirname(destination)}"),
+                (
+                    f"Installing {os.path.basename(wheel_path)} to {os.path.dirname(destination)}"
+                ),
             )
         finally:
             update_dist_caches(destination, fix_zipimporter_caches=False)

setuptools/command/install_egg_info.py

@@ -36,9 +36,7 @@ def run(self) -> None:
             self.execute(os.unlink, (self.target,), "Removing " + self.target)
         if not self.dry_run:
             ensure_directory(self.target)
-        self.execute(
-            self.copytree, (), f"Copying {self.source} to {self.target}"
-        )
+        self.execute(self.copytree, (), f"Copying {self.source} to {self.target}")
         self.install_namespaces()
 
     def get_outputs(self):

setuptools/dist.py

@@ -835,9 +835,7 @@ def _include_misc(self, name: str, value: _Sequence) -> None:
         try:
             old = getattr(self, name)
         except AttributeError as e:
-            raise DistutilsSetupError(
-                f"{name}: No such distribution setting"
-            ) from e
+            raise DistutilsSetupError(f"{name}: No such distribution setting") from e
         if old is None:
             setattr(self, name, value)
         elif not isinstance(old, _sequence):

setuptools/msvc.py

@@ -697,9 +697,7 @@ def FSharpInstallDir(self):
         str
             path
         """
-        path = os.path.join(
-            self.ri.visualstudio, rf'{self.vs_ver:0.1f}\Setup\F#'
-        )
+        path = os.path.join(self.ri.visualstudio, rf'{self.vs_ver:0.1f}\Setup\F#')
         return self.ri.lookup(path, 'productdir') or ''
 
     @property
@@ -717,9 +715,7 @@ def UniversalCRTSdkDir(self):
 
         # Find path of the more recent Kit
         for ver in vers:
-            sdkdir = self.ri.lookup(
-                self.ri.windows_kits_roots, f'kitsroot{ver}'
-            )
+            sdkdir = self.ri.lookup(self.ri.windows_kits_roots, f'kitsroot{ver}')
             if sdkdir:
                 return sdkdir or ''
 

setuptools/package_index.py

@@ -530,7 +530,8 @@ def check_hash(self, checker, filename, tfp) -> None:
             tfp.close()
             os.unlink(filename)
             raise DistutilsError(
-                f"{checker.hash.name} validation failed for {os.path.basename(filename)}; " "possible download problem?"
+                f"{checker.hash.name} validation failed for {os.path.basename(filename)}; "
+                "possible download problem?"
             )
 
     def add_find_links(self, urls) -> None:
@@ -744,9 +745,7 @@ def _download_to(self, url, filename):
             checker = HashChecker.from_url(url)
             fp = self.open_url(url)
             if isinstance(fp, urllib.error.HTTPError):
-                raise DistutilsError(
-                    f"Can't download {url}: {fp.code} {fp.msg}"
-                )
+                raise DistutilsError(f"Can't download {url}: {fp.code} {fp.msg}")
             headers = fp.info()
             blocknum = 0
             bs = self.dl_blocksize
@@ -793,9 +792,7 @@ def open_url(self, url, warning=None):  # noqa: C901  # is too complex (12)
             if warning:
                 self.warn(warning, v.reason)
             else:
-                raise DistutilsError(
-                    f"Download error for {url}: {v.reason}"
-                ) from v
+                raise DistutilsError(f"Download error for {url}: {v.reason}") from v
         except http.client.BadStatusLine as v:
             if warning:
                 self.warn(warning, v.line)

setuptools/wheel.py

@@ -145,9 +145,7 @@ def get_metadata(name):
         wheel_version = parse_version(wheel_metadata.get('Wheel-Version'))
         wheel_v1 = parse_version('1.0') <= wheel_version < parse_version('2.0dev0')
         if not wheel_v1:
-            raise ValueError(
-                f'unsupported wheel format version: {wheel_version}'
-            )
+            raise ValueError(f'unsupported wheel format version: {wheel_version}')
         # Extract to target directory.
         _unpack_zipfile_obj(zf, destination_eggdir)
         # Convert metadata.