chore: format all files with ruff and hatch fmt

Author: ido50

README.md

@@ -254,7 +254,7 @@ Morgan was written because of insufficiencies of other mirroring solutions:
   from PyPI at regular intervals. It also has many non-standard-library
   dependencies.
 - [pypickup](https://github.com/UB-Quantic/pypickup) was started around the same time as Morgan. It is more fitting for
-  and offline mirror than the above three but takes a different approach than Morgan. It
+  an offline mirror than the above three but takes a different approach than Morgan. It
   doesn't include a server, instead relying on `pip`'s ability to install from
   a directory tree, so this tree needs to be accessible to your servers. It also
   favors CLI commands over a configuration file (e.g. an `add` command is used to

morgan/__init__.py

@@ -149,16 +149,16 @@ def _mirror(
             return None
 
         if required_by:
-            print("[{}]: {}".format(required_by, requirement))
+            print(f"[{required_by}]: {requirement}")
         else:
-            print("{}".format(requirement))
+            print(f"{requirement}")
 
         data: dict = None
 
         # get information about this package from the Simple API in JSON
         # format as per PEP 691
         request = urllib.request.Request(
-            "{}{}/".format(self.index_url, requirement.name),
+            f"{self.index_url}{requirement.name}/",
             headers={
                 "Accept": "application/vnd.pypi.simple.v1+json",
             },
@@ -186,10 +186,9 @@ def _mirror(
         if files is None:
             if required_by is None:
                 raise Exception("No files match requirement")
-            else:
-                # this is a dependency, assume the dependency is not relevant
-                # for any of our environments and don't return an error
-                return None
+            # this is a dependency, assume the dependency is not relevant
+            # for any of our environments and don't return an error
+            return None
 
         if len(files) == 0:
             raise Exception(f"No files match requirement {requirement}")
@@ -294,7 +293,7 @@ def _filter_files(
         return files
 
     def _matches_environments(self, fileinfo: dict) -> bool:
-        if req := fileinfo.get("requires-python", None):
+        if req := fileinfo.get("requires-python"):
             # The Python versions in all of our environments must be supported
             # by this file in order to match.
             # Some packages specify their required Python versions with a simple
@@ -318,7 +317,7 @@ def _matches_environments(self, fileinfo: dict) -> bool:
                 print(f"\tIgnoring {fileinfo['filename']}: {e}")
                 return False
 
-        if fileinfo.get("tags", None):
+        if fileinfo.get("tags"):
             # At least one of the tags must match ALL of our environments
             for tag in fileinfo["tags"]:
                 (intrp_name, intrp_ver) = parse_interpreter(tag.interpreter)
@@ -341,11 +340,10 @@ def _matches_environments(self, fileinfo: dict) -> bool:
 
                 if tag.platform == "any":
                     return True
-                else:
-                    for platformre in self._supported_platforms:
-                        if platformre.fullmatch(tag.platform):
-                            # tag matched, accept this file
-                            return True
+                for platformre in self._supported_platforms:
+                    if platformre.fullmatch(tag.platform):
+                        # tag matched, accept this file
+                        return True
 
             # none of the tags matched, reject this file
             return False
@@ -429,8 +427,8 @@ def _hash_file(self, filepath: str, hashalg: str) -> str:
         truehash = hashlib.new(hashalg)
         truehash.update(contents)
 
-        with open("{}.hash".format(filepath), "w") as out:
-            out.write("{}={}".format(hashalg, truehash.hexdigest()))
+        with open(f"{filepath}.hash", "w") as out:
+            out.write(f"{hashalg}={truehash.hexdigest()}")
 
         return truehash.hexdigest()
 
@@ -455,16 +453,16 @@ def _extract_metadata(
             members = [member.name for member in archive.getmembers()]
             opener = archive.extractfile
         else:
-            raise Exception("Unexpected distribution file {}".format(filepath))
+            raise Exception(f"Unexpected distribution file {filepath}")
 
         for member in members:
             try:
                 md.parse(opener, member)
             except Exception as e:
-                print("Failed parsing member {} of {}: {}".format(member, filepath, e))
+                print(f"Failed parsing member {member} of {filepath}: {e}")
 
         if md.seen_metadata_file():
-            md.write_metadata_file("{}.metadata".format(filepath))
+            md.write_metadata_file(f"{filepath}.metadata")
 
         archive.close()
 
@@ -487,7 +485,7 @@ def parse_interpreter(inp: str) -> Tuple[str, str]:
     if m.lastindex > 1:
         version = m.group(2)
         if m.lastindex > 2:
-            version = "{}.{}".format(version, m.group(3))
+            version = f"{version}.{m.group(3)}"
 
     return (intr, version)
 
@@ -624,14 +622,14 @@ def my_url(arg):
     if args.command == "generate_env":
         configurator.generate_env(args.env)
         return
-    elif args.command == "generate_reqs":
+    if args.command == "generate_reqs":
         configurator.generate_reqs(args.mode)
         return
-    elif args.command == "serve":
+    if args.command == "serve":
         server.run(args.index_path, args.host, args.port, args.no_metadata)
         return
-    elif args.command == "version":
-        print("Morgan v{}".format(__version__))
+    if args.command == "version":
+        print(f"Morgan v{__version__}")
         return
 
     if not args.config:

morgan/configurator.py

@@ -1,17 +1,17 @@
 import argparse
-from collections import OrderedDict
 import configparser
 import os
 import platform
 import sys
 import sysconfig
+from collections import OrderedDict
 
 from packaging.version import Version
 
 if Version(platform.python_version()) < Version("3.8"):
     import importlib_metadata as metadata
 else:
-    import importlib.metadata as metadata
+    from importlib import metadata
 
 
 def generate_env(name: str = "local"):
@@ -23,7 +23,7 @@ def generate_env(name: str = "local"):
     """
 
     config = configparser.ConfigParser()
-    config["env.{}".format(name)] = {
+    config[f"env.{name}"] = {
         "os_name": os.name,
         "platform_tag": sysconfig.get_platform(),
         "sys_platform": sys.platform,

morgan/metadata.py

@@ -1,13 +1,14 @@
 import email.parser
 import re
-from typing import Dict, Set, Callable, BinaryIO, Iterable
+from typing import BinaryIO, Callable, Dict, Iterable, Set
 
-from packaging.version import Version
+import tomli
+from packaging.markers import Marker
+from packaging.markers import Variable as MarkerVariable
 from packaging.requirements import Requirement
-from packaging.utils import canonicalize_name
 from packaging.specifiers import SpecifierSet
-from packaging.markers import Marker, Variable as MarkerVariable
-import tomli
+from packaging.utils import canonicalize_name
+from packaging.version import Version
 
 from morgan.utils import filter_relevant_requirements
 

morgan/server.py

@@ -37,7 +37,7 @@ def do_GET(self):
             self.end_headers()
             self.wfile.write(
                 b"The server cannot generate a response "
-                + b"in any of the requested MIME types"
+                b"in any of the requested MIME types"
             )
             return
 
@@ -100,7 +100,7 @@ def _serve_project(self, ct, project):
 
         path = pathlib.Path(index_path, project)
         if not path.exists() or not path.is_dir():
-            self._serve_notfound("No such project {}".format(project))
+            self._serve_notfound(f"No such project {project}")
             return
 
         files = []
@@ -109,22 +109,22 @@ def _serve_project(self, ct, project):
                 if re.search(r"\.(whl|zip|tar\.gz)$", entry.name):
                     file = {
                         "filename": entry.name,
-                        "url": "/{}/{}".format(project, entry.name),
+                        "url": f"/{project}/{entry.name}",
                         "hashes": {},
                     }
 
                     # read file hash
-                    hashfile = path.joinpath("{}.hash".format(entry.name))
+                    hashfile = path.joinpath(f"{entry.name}.hash")
                     if hashfile.exists():
-                        with open(hashfile, "r") as hf:
+                        with open(hashfile) as hf:
                             data = hf.read().strip().split("=")
                             file["hashes"][data[0]] = data[1]
 
                     # do we have a metadata file?
                     file["dist-info-metadata"] = (
                         False
                         if no_metadata
-                        else path.joinpath("{}.metadata".format(entry.name)).exists()
+                        else path.joinpath(f"{entry.name}.metadata").exists()
                     )
 
                     files.append(file)
@@ -174,11 +174,11 @@ def _serve_file(self, project, filename):
 
         path = pathlib.Path(index_path, project, filename)
         if not path.exists() or not path.is_file():
-            self._serve_notfound("No such project {}".format(project))
+            self._serve_notfound(f"No such project {project}")
             return
 
         if no_metadata and re.search(r"\.metadata$", filename):
-            self._serve_notfound("No such file {}".format(filename))
+            self._serve_notfound(f"No such file {filename}")
             return
 
         ct = "text/plain"

tests/test_init.py

@@ -79,7 +79,7 @@ def temp_index_path(self, tmpdir):
                 requests = >=2.0.0
                 """
             )
-        yield tmpdir
+        return tmpdir
 
     def test_mirrorer_initialization(self, temp_index_path):
         args = argparse.Namespace(
@@ -141,13 +141,13 @@ def test_file_hashing(self, temp_index_path):
 
         expected_hash = hashlib.sha256(test_data).hexdigest()
 
-        # noqa: SLF001 # pylint: disable=W0212
+        # pylint: disable=W0212
         digest = mirrorer._hash_file(test_file, "sha256")
 
         assert digest == expected_hash, "Returned hash should match sha256 digest"
         hash_file = test_file + ".hash"
         assert os.path.exists(hash_file), "Hash file should be created"
-        with open(hash_file, "r", encoding="utf-8") as file:
+        with open(hash_file, encoding="utf-8") as file:
             assert file.read() == f"sha256={expected_hash}", (
                 "Hash file content should be correctly formatted"
             )
@@ -168,7 +168,7 @@ def temp_index_path(self, tmp_path):
                 platform_tag = manylinux
                 """
             )
-        yield tmp_path
+        return tmp_path
 
     @pytest.fixture
     def make_mirrorer(self, temp_index_path):
@@ -179,7 +179,7 @@ def _make_mirrorer(mirror_all_versions):
                 index_url="https://example.com/simple",
                 config=os.path.join(temp_index_path, "morgan.ini"),
                 mirror_all_versions=mirror_all_versions,
-                package_type_regex=r"(whl|zip|tar\.gz)"
+                package_type_regex=r"(whl|zip|tar\.gz)",
             )
             return Mirrorer(args)
 
@@ -229,12 +229,12 @@ def test_filter_files_with_all_versions_mirrored(
         """Test that file filtering correctly handles different version specifications."""
         mirrorer = make_mirrorer(
             mirror_all_versions=True,
-            )
+        )
         requirement = packaging.requirements.Requirement(
             f"sample_package{version_spec}"
         )
 
-        # noqa: SLF001 # pylint: disable=W0212
+        # pylint: disable=W0212
         filtered_files = mirrorer._filter_files(
             requirement=requirement, required_by=None, files=sample_files
         )
@@ -260,7 +260,7 @@ def test_filter_files_with_latest_version_mirrored(
             f"sample_package{version_spec}"
         )
 
-        # noqa: SLF001 # pylint: disable=W0212
+        # pylint: disable=W0212
         filtered_files = mirrorer._filter_files(
             requirement=requirement, required_by=None, files=sample_files
         )

tests/test_metadata_parser.py

@@ -78,7 +78,7 @@ def test_init(self, parser):
     def test_parse_metadata_file(self, parser, metadata_content):
         """Test parsing a metadata file with dependencies"""
         mock_fp = io.BytesIO(metadata_content)
-        # noqa: SLF001 # pylint: disable=W0212
+        # pylint: disable=W0212
         parser._parse_metadata_file(mock_fp)
 
         assert parser.name == "example-package"
@@ -115,7 +115,7 @@ def test_parse_pyproject(self, parser, pyproject_content):
                 },
             },
         ):
-            # noqa: SLF001 # pylint: disable=W0212
+            # pylint: disable=W0212
             parser._parse_pyproject(mock_fp)
 
         assert parser.name == "example-package"
@@ -137,7 +137,7 @@ def test_parse_requirestxt(self, parser, requires_txt_content):
         mock_fp = io.BytesIO(requires_txt_content)
         mock_fp.name = "package.egg-info/requires.txt"  # Not setup_requires.txt
 
-        # noqa: SLF001 # pylint: disable=W0212
+        # pylint: disable=W0212
         parser._parse_requirestxt(mock_fp)
 
         assert len(parser.core_dependencies) == 2

tests/test_server.py

@@ -8,23 +8,23 @@
     [
         (server.GENL_HTML_TYPE, {"mime": server.GENL_HTML_TYPE, "priority": 0}),
         (
-            "{};q=1".format(server.GENL_HTML_TYPE),
+            f"{server.GENL_HTML_TYPE};q=1",
             {"mime": server.GENL_HTML_TYPE, "priority": 1},
         ),
         (
-            "{};q=0.9".format(server.GENL_HTML_TYPE),
+            f"{server.GENL_HTML_TYPE};q=0.9",
             {"mime": server.GENL_HTML_TYPE, "priority": 0.9},
         ),
         (
-            "{} ; q=0.9".format(server.GENL_HTML_TYPE),
+            f"{server.GENL_HTML_TYPE} ; q=0.9",
             {"mime": server.GENL_HTML_TYPE, "priority": 0.9},
         ),
         (
-            "{};q=0.9&charset=UTF-8".format(server.GENL_HTML_TYPE),
+            f"{server.GENL_HTML_TYPE};q=0.9&charset=UTF-8",
             {"mime": server.GENL_HTML_TYPE, "priority": 0.9},
         ),
         (
-            "{};charset=UTF-8&q=0.9".format(server.GENL_HTML_TYPE),
+            f"{server.GENL_HTML_TYPE};charset=UTF-8&q=0.9",
             {"mime": server.GENL_HTML_TYPE, "priority": 0.9},
         ),
     ],
@@ -47,7 +47,7 @@ def test_parse_accept_option(accept_option, exp_dict):
             server.PYPI_JSON_TYPE_V1,
         ),
         (
-            "{};q=0.5, {}; q=1".format(server.PYPI_JSON_TYPE_V1, server.GENL_HTML_TYPE),
+            f"{server.PYPI_JSON_TYPE_V1};q=0.5, {server.GENL_HTML_TYPE}; q=1",
             server.GENL_HTML_TYPE,
         ),
         (