Validate Trove classifiers in twine check

pyproject.toml

@@ -40,6 +40,7 @@ dependencies = [
 	"keyring >= 15.1; platform_machine != 'ppc64le' and platform_machine != 's390x'",
 	"rfc3986 >= 1.4.0",
 	"rich >= 12.0.0",
+	"trove-classifiers >= 2024.10.12 ",
 
 	# workaround for #1116
 	"pkginfo < 1.11",

tests/test_check.py

@@ -281,6 +281,80 @@ def test_main(monkeypatch):
     assert check_stub.calls == [pretend.call(["dist/*"], strict=False)]
 
 
+def test_fails_invalid_classifiers(tmp_path, capsys, caplog):
+    sdist = build_sdist(
+        tmp_path,
+        {
+            "setup.cfg": (
+                """
+                    [metadata]
+                    name = test-package
+                    version = 0.0.1
+                    long_description = file:README.md
+                    long_description_content_type = text/markdown
+                    classifiers =
+                        Framework :: Django :: 5
+                    """
+            ),
+            "README.md": (
+                """
+                # test-package
+
+                A test package.
+                """
+            ),
+        },
+    )
+
+    assert check.check([sdist])
+
+    assert capsys.readouterr().out == f"Checking {sdist}: FAILED\n"
+
+    assert len(caplog.record_tuples) > 0
+    assert caplog.record_tuples == [
+        (
+            "twine.commands.check",
+            logging.ERROR,
+            "`Framework :: Django :: 5` is not a valid classifier"
+            " and would prevent upload to PyPI.\n",
+        )
+    ]
+
+
+def test_passes_valid_classifiers(tmp_path, capsys, caplog):
+    sdist = build_sdist(
+        tmp_path,
+        {
+            "setup.cfg": (
+                """
+                    [metadata]
+                    name = test-package
+                    version = 0.0.1
+                    long_description = file:README.md
+                    long_description_content_type = text/markdown
+                    classifiers =
+                        Programming Language :: Python :: 3
+                        Framework :: Django
+                        Framework :: Django :: 5.1
+                    """
+            ),
+            "README.md": (
+                """
+                # test-package
+
+                A test package.
+                """
+            ),
+        },
+    )
+
+    assert not check.check([sdist])
+
+    assert capsys.readouterr().out == f"Checking {sdist}: PASSED\n"
+
+    assert caplog.record_tuples == []
+
+
 # TODO: Test print() color output
 
 # TODO: Test log formatting

twine/commands/check.py

@@ -18,10 +18,11 @@
 import io
 import logging
 import re
-from typing import Dict, List, Optional, Tuple, cast
+from typing import Dict, List, Optional, Sequence, Tuple, cast
 
 import readme_renderer.rst
 from rich import print
+from trove_classifiers import classifiers as all_classifiers
 
 from twine import commands
 from twine import package as package_file
@@ -76,14 +77,15 @@ def _parse_content_type(value: str) -> Tuple[str, Dict[str, str]]:
 
 def _check_file(
     filename: str, render_warning_stream: _WarningStream
-) -> Tuple[List[str], bool]:
+) -> Tuple[List[str], List[str]]:
     """Check given distribution."""
     warnings = []
-    is_ok = True
+    errors = []
 
     package = package_file.PackageFile.from_filename(filename, comment=None)
-
     metadata = package.metadata_dictionary()
+
+    # Check description
     description = cast(Optional[str], metadata["description"])
     description_content_type = cast(Optional[str], metadata["description_content_type"])
 
@@ -103,24 +105,35 @@ def _check_file(
             description, stream=render_warning_stream, **params
         )
         if rendering_result is None:
-            is_ok = False
+            errors.append(
+                "`long_description` has syntax errors in markup"
+                " and would not be rendered on PyPI."
+            )
 
-    return warnings, is_ok
+    # Check classifiers
+    dist_classifiers = cast(Sequence[str], metadata["classifiers"])
+    for classifier in dist_classifiers:
+        if classifier not in all_classifiers:
+            errors.append(
+                f"`{classifier}` is not a valid classifier"
+                f" and would prevent upload to PyPI."
+            )
+
+    return warnings, errors
 
 
 def check(
     dists: List[str],
     strict: bool = False,
 ) -> bool:
-    """Check that a distribution will render correctly on PyPI and display the results.
+    """Check that a distribution will upload and render correctly on PyPI.
 
-    This is currently only validates ``long_description``, but more checks could be
-    added.
+    This currently validates
+    - ``long_description``, to make sure it would render correctly on PyPI
+    - ``classifiers``, to make sure that all classifiers are valid
 
     :param dists:
         The distribution files to check.
-    :param output_stream:
-        The destination of the resulting output.
     :param strict:
         If ``True``, treat warnings as errors.
 
@@ -137,17 +150,14 @@ def check(
     for filename in uploads:
         print(f"Checking {filename}: ", end="")
         render_warning_stream = _WarningStream()
-        warnings, is_ok = _check_file(filename, render_warning_stream)
+        warnings, errors = _check_file(filename, render_warning_stream)
 
         # Print the status and/or error
-        if not is_ok:
+        if errors:
             failure = True
             print("[red]FAILED[/red]")
-            logger.error(
-                "`long_description` has syntax errors in markup"
-                " and would not be rendered on PyPI."
-                f"\n{render_warning_stream}"
-            )
+            error_mgs = "\n".join(errors)
+            logger.error(f"{error_mgs}\n" f"{render_warning_stream}")
         elif warnings:
             if strict:
                 failure = True
@@ -173,7 +183,13 @@ def main(args: List[str]) -> bool:
     :return:
         The exit status of the ``check`` command.
     """
-    parser = argparse.ArgumentParser(prog="twine check")
+    parser = argparse.ArgumentParser(
+        prog="twine check",
+        description=(
+            "Check distribution files and make sure they will upload and render"
+            " correctly on PyPI. Validates description and all classifiers."
+        ),
+    )
     parser.add_argument(
         "dists",
         nargs="+",