Merge branch 'main' into support-===foobar

Author: notatallshaw

docs/utils.rst

@@ -81,8 +81,10 @@ Reference
     :class:`~packaging.version.Version`. The build number is ``()`` if
     there is no build number in the wheel filename, otherwise a
     two-item tuple of an integer for the leading digits and
-    a string for the rest of the build number. The tags portion is an
-    instance of :class:`~packaging.tags.Tag`.
+    a string for the rest of the build number. The tags portion is a
+    frozen set of :class:`~packaging.tags.Tag` instances (as the tag
+    string format allows multiple tags to be combined into a single
+    string).
 
     :param str filename: The name of the wheel file.
     :raises InvalidWheelFilename: If the filename in question

noxfile.py

@@ -43,21 +43,19 @@ def tests(session):
     coverage = ["python", "-m", "coverage"]
 
     session.install(*nox.project.dependency_groups(PYPROJECT, "test"))
-    session.install(".")
+    session.install("-e.")
     env = {} if session.python != "3.14" else {"COVERAGE_CORE": "sysmon"}
 
     if "pypy" not in session.python:
         session.run(
             *coverage,
             "run",
-            "--source",
-            "packaging",
             "-m",
             "pytest",
             *session.posargs,
             env=env,
         )
-        session.run(*coverage, "report", "-m", "--fail-under", "100")
+        session.run(*coverage, "report")
     else:
         # Don't do coverage tracking for PyPy, since it's SLOW.
         session.run(
@@ -237,6 +235,7 @@ def _check_git_state(session, version_tag):
     ]
     result = subprocess.run(
         ["git", "remote", "get-url", "--push", "upstream"],
+        check=False,
         capture_output=True,
         encoding="utf-8",
     )
@@ -245,6 +244,7 @@ def _check_git_state(session, version_tag):
     # Ensure we're on main branch for cutting a release.
     result = subprocess.run(
         ["git", "rev-parse", "--abbrev-ref", "HEAD"],
+        check=False,
         capture_output=True,
         encoding="utf-8",
     )
@@ -253,15 +253,21 @@ def _check_git_state(session, version_tag):
 
     # Ensure there are no uncommitted changes.
     result = subprocess.run(
-        ["git", "status", "--porcelain"], capture_output=True, encoding="utf-8"
+        ["git", "status", "--porcelain"],
+        check=False,
+        capture_output=True,
+        encoding="utf-8",
     )
     if result.stdout:
         print(result.stdout, end="", file=sys.stderr)
         session.error("The working tree has uncommitted changes")
 
     # Ensure this tag doesn't exist already.
     result = subprocess.run(
-        ["git", "rev-parse", version_tag], capture_output=True, encoding="utf-8"
+        ["git", "rev-parse", version_tag],
+        check=False,
+        capture_output=True,
+        encoding="utf-8",
     )
     if not result.returncode:
         session.error(f"Tag already exists! {version_tag} -- {result.stdout!r}")
@@ -280,30 +286,26 @@ def _bump(session, *, version, file, kind):
     file.write_text(new_contents)
 
     session.log("git commit")
-    subprocess.run(["git", "add", str(file)])
-    subprocess.run(["git", "commit", "-m", f"Bump for {kind}"])
+    subprocess.run(["git", "add", str(file)], check=False)
+    subprocess.run(["git", "commit", "-m", f"Bump for {kind}"], check=False)
 
 
 @contextlib.contextmanager
 def _replace_file(original_path):
     # Create a temporary file.
     fh, replacement_path = tempfile.mkstemp()
 
-    try:
-        with os.fdopen(fh, "w") as replacement:
-            with open(original_path) as original:
-                yield original, replacement
-    except Exception:
-        raise
-    else:
-        shutil.copymode(original_path, replacement_path)
-        os.remove(original_path)
-        shutil.move(replacement_path, original_path)
+    with os.fdopen(fh, "w") as replacement, open(original_path) as original:
+        yield original, replacement
+
+    shutil.copymode(original_path, replacement_path)
+    os.remove(original_path)
+    shutil.move(replacement_path, original_path)
 
 
 def _changelog_update_unreleased_title(version, *, file):
     """Update an "*unreleased*" heading to "{version} - {date}" """
-    yyyy_mm_dd = datetime.datetime.today().strftime("%Y-%m-%d")
+    yyyy_mm_dd = datetime.datetime.now(tz=datetime.timezone.utc).strftime("%Y-%m-%d")
     title = f"{version} - {yyyy_mm_dd}"
 
     with _replace_file(file) as (original, replacement):

pyproject.toml

@@ -37,7 +37,7 @@ Source = "https://github.com/pypa/packaging"
 
 [dependency-groups]
 test = [
-  "coverage[toml]>=5.0.0",
+  "coverage[toml]>=7.2.0",
   "pip>=21.1",
   "pretend",
   "pytest>=6.2.0",
@@ -59,16 +59,19 @@ ignore-words-list = [
 
 [tool.coverage.run]
 branch = true
+source_pkgs = ["packaging"]
 
 [tool.coverage.report]
-exclude_lines = ["pragma: no cover", "@abc.abstractmethod", "@abc.abstractproperty"]
+show_missing = true
+fail_under = 100
+exclude_also = ["@abc.abstractmethod", "@abc.abstractproperty"]
 
 [tool.pytest.ini_options]
 minversion = "6.2"
 addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"]
 xfail_strict = true
 filterwarnings = ["error"]
-log_cli_level = "INFO"
+log_level = "INFO"
 testpaths = ["tests"]
 
 
@@ -86,25 +89,57 @@ ignore_missing_imports = true
 extend-exclude = [
     "src/packaging/licenses/_spdx.py"
 ]
+show-fixes = true
 
 [tool.ruff.lint]
 extend-select = [
-    "B",
+    "ARG",   # flake8-unused-argument
+    "B",     # flake8-bugbear
+    "BLE",   # flake8-blind-except
+    "C4",    # flake8-comprehensions
+    "DTZ",   # flake8-datetimez
     "E",
+    "EXE",   # flake8-executable
     "F",
-    "FA",
-    "I",
-    "N",
-    "PYI",
-    "RUF",
-    "UP",
-    "W"
+    "FA",    # flake8-future-annotations
+    "FLY",   # flynt
+    "FURB",  # refurb
+    "G",     # flake8-logging-format
+    "I",     # isort
+    "ICN",   # flake8-import-conventions
+    "ISC",   # flake8-implicit-str-concat
+    "LOG",   # flake8-logging
+    "N",     # pep8-naming
+    "PERF",  # perflint
+    "PGH",   # pygrep-hooks
+    "PIE",   # flake8-pie
+    "PL",    # pylint
+    "PT",    # flake8-pytest-style
+    "PYI",   # flake8-pyi
+    "Q",     # flake8-quotes
+    "RSE",   # flake8-raise
+    "RUF",   # Ruff-specific rules
+    "SIM",   # flake8-simplify
+    "SLOT",  # flake8-slots
+    "T10",   # flake8-debugger
+    "TRY",   # tryceratops
+    "UP",    # pyupgrade
+    "W",
+    "YTT",   # flake8-2020
 ]
 ignore = [
-    "N818",  # exceptions must end in "*Error"
+    "N818",    # exceptions must end in "*Error"
+    "PLR09",   # too many ...
+    "PLR2004", # magic value in comparison
+    "PLW0127", # duplicate of F821
+    "SIM103",  # returning negated value directly not ideal for long chain
+    "SIM105",  # try/except is faster than contextlib.suppress
+    "TRY003",  # long messages outside exception class
 ]
+flake8-comprehensions.allow-dict-calls-with-keyword-arguments = true
+flake8-unused-arguments.ignore-variadic-names = true
 
 [tool.ruff.lint.per-file-ignores]
-"tests/test_*.py" = ["PYI024"]
+"tests/test_*.py" = ["PYI024", "PLR", "SIM201"]
 "tasks/check.py" = ["UP032"]
 "tests/test_requirements.py" = ["UP032"]

src/packaging/_manylinux.py

@@ -106,7 +106,7 @@ def _glibc_version_string_ctypes() -> str | None:
     Fallback implementation of glibc_version_string using ctypes.
     """
     try:
-        import ctypes
+        import ctypes  # noqa: PLC0415
     except ImportError:
         return None
 
@@ -184,23 +184,24 @@ def _is_compatible(arch: str, version: _GLibCVersion) -> bool:
         return False
     # Check for presence of _manylinux module.
     try:
-        import _manylinux
+        import _manylinux  # noqa: PLC0415
     except ImportError:
         return True
     if hasattr(_manylinux, "manylinux_compatible"):
         result = _manylinux.manylinux_compatible(version[0], version[1], arch)
         if result is not None:
             return bool(result)
         return True
-    if version == _GLibCVersion(2, 5):
-        if hasattr(_manylinux, "manylinux1_compatible"):
-            return bool(_manylinux.manylinux1_compatible)
-    if version == _GLibCVersion(2, 12):
-        if hasattr(_manylinux, "manylinux2010_compatible"):
-            return bool(_manylinux.manylinux2010_compatible)
-    if version == _GLibCVersion(2, 17):
-        if hasattr(_manylinux, "manylinux2014_compatible"):
-            return bool(_manylinux.manylinux2014_compatible)
+    if version == _GLibCVersion(2, 5) and hasattr(_manylinux, "manylinux1_compatible"):
+        return bool(_manylinux.manylinux1_compatible)
+    if version == _GLibCVersion(2, 12) and hasattr(
+        _manylinux, "manylinux2010_compatible"
+    ):
+        return bool(_manylinux.manylinux2010_compatible)
+    if version == _GLibCVersion(2, 17) and hasattr(
+        _manylinux, "manylinux2014_compatible"
+    ):
+        return bool(_manylinux.manylinux2014_compatible)
     return True
 
 

src/packaging/_musllinux.py

@@ -49,7 +49,7 @@ def _get_musl_version(executable: str) -> _MuslVersion | None:
         return None
     if ld is None or "musl" not in ld:
         return None
-    proc = subprocess.run([ld], stderr=subprocess.PIPE, text=True)
+    proc = subprocess.run([ld], check=False, stderr=subprocess.PIPE, text=True)
     return _parse_musl_version(proc.stderr)
 
 

src/packaging/_tokenizer.py

@@ -33,7 +33,7 @@ def __init__(
 
     def __str__(self) -> str:
         marker = " " * self.span[0] + "~" * (self.span[1] - self.span[0]) + "^"
-        return "\n    ".join([self.message, self.source, marker])
+        return f"{self.message}\n    {self.source}\n    {marker}"
 
 
 DEFAULT_RULES: dict[str, str | re.Pattern[str]] = {

src/packaging/licenses/__init__.py

@@ -94,10 +94,7 @@ def canonicalize_license_expression(
             token == "("
             and python_tokens
             and python_tokens[-1] not in {"or", "and", "("}
-        ):
-            message = f"Invalid license expression: {raw_license_expression!r}"
-            raise InvalidLicenseExpression(message)
-        elif token == ")" and python_tokens and python_tokens[-1] == "(":
+        ) or (token == ")" and python_tokens and python_tokens[-1] == "("):
             message = f"Invalid license expression: {raw_license_expression!r}"
             raise InvalidLicenseExpression(message)
         else:

src/packaging/markers.py

@@ -180,7 +180,7 @@ def _format_marker(
 def _eval_op(lhs: str, op: Op, rhs: str | AbstractSet[str]) -> bool:
     if isinstance(rhs, str):
         try:
-            spec = Specifier("".join([op.serialize(), rhs]))
+            spec = Specifier(f"{op.serialize()}{rhs}")
         except InvalidSpecifier:
             pass
         else:

src/packaging/metadata.py

@@ -360,10 +360,10 @@ def parse_email(data: bytes | str) -> tuple[RawMetadata, dict[str, list[str]]]:
     # We have to wrap parsed.keys() in a set, because in the case of multiple
     # values for a key (a list), the key will appear multiple times in the
     # list of keys, but we're avoiding that by using get_all().
-    for name in frozenset(parsed.keys()):
+    for name_with_case in frozenset(parsed.keys()):
         # Header names in RFC are case insensitive, so we'll normalize to all
         # lower case to make comparisons easier.
-        name = name.lower()
+        name = name_with_case.lower()
 
         # We use get_all() here, even for fields that aren't multiple use,
         # because otherwise someone could have e.g. two Name fields, and we
@@ -399,7 +399,7 @@ def parse_email(data: bytes | str) -> tuple[RawMetadata, dict[str, list[str]]]:
                 # can be independently encoded, so we'll need to check each
                 # of them.
                 chunks: list[tuple[bytes, str | None]] = []
-                for bin, encoding in email.header.decode_header(h):
+                for bin, _encoding in email.header.decode_header(h):
                     try:
                         bin.decode("utf8", "strict")
                     except UnicodeDecodeError: