Merge branch 'main' into fix-prerelease-detection-for->-and-<

docs/utils.rst

@@ -56,11 +56,12 @@ Reference
         >>> is_normalized_name("Django")
         False
 
-.. function:: canonicalize_version(version)
+.. function:: canonicalize_version(version, strip_trailing_zero=True)
 
     This function takes a string representing a package version (or a
     :class:`~packaging.version.Version` instance), and returns the
-    normalized form of it.
+    normalized form of it. By default, it strips trailing zeros from
+    the release segment.
 
     :param str version: The version to normalize.
 

src/packaging/metadata.py

@@ -167,7 +167,7 @@ class RawMetadata(TypedDict, total=False):
 
 
 def _parse_keywords(data: str) -> list[str]:
-    """Split a string of comma-separate keyboards into a list of keywords."""
+    """Split a string of comma-separated keywords into a list of keywords."""
     return [k.strip() for k in data.split(",")]
 
 

src/packaging/version.py

@@ -350,8 +350,8 @@ def public(self) -> str:
         '1.2.3'
         >>> Version("1.2.3+abc").public
         '1.2.3'
-        >>> Version("1.2.3+abc.dev1").public
-        '1.2.3'
+        >>> Version("1!1.2.3dev1+abc").public
+        '1!1.2.3.dev1'
         """
         return str(self).split("+", 1)[0]
 
@@ -363,7 +363,7 @@ def base_version(self) -> str:
         '1.2.3'
         >>> Version("1.2.3+abc").base_version
         '1.2.3'
-        >>> Version("1!1.2.3+abc.dev1").base_version
+        >>> Version("1!1.2.3dev1+abc").base_version
         '1!1.2.3'
 
         The "base version" is the public version of the project without any pre or post