Merge branch 'main' into stdlib-importlib.metadata

docs/changelog.rst

@@ -12,6 +12,21 @@ schemes recommended by the Python Packaging Authority.
 
 .. towncrier release notes start
 
+Twine 5.1.1 (2024-06-26)
+------------------------
+
+Bugfixes
+^^^^^^^^
+
+- Resolve DeprecationWarnings when extracting ``twine`` metadata. (`#1115 <https://github.com/pypa/twine/issues/1115>`_)
+
+- Fix bug for Repository URLs with auth where the port was lost. When attempting
+  to prevent printing authentication credentials in URLs provided with username
+  and password, we did not properly handle the case where the URL also contains
+  a port (when reconstructing the URL). This is now handled and tested to
+  ensure no regressions. (`#fix-repo-urls-with-auth-and-port <https://github.com/pypa/twine/issues/fix-repo-urls-with-auth-and-port>`_)
+
+
 Twine 5.1.0 (2024-05-15)
 ------------------------
 

pyproject.toml

@@ -39,6 +39,9 @@ dependencies = [
 	"keyring >= 15.1",
 	"rfc3986 >= 1.4.0",
 	"rich >= 12.0.0",
+
+	# workaround for #1116
+	"pkginfo < 1.11",
 ]
 dynamic = ["version"]
 

tox.ini

@@ -95,7 +95,6 @@ commands =
 
 [testenv:changelog]
 basepython = python3
-skip_install = True
 deps =
     towncrier
 commands =

twine/__init__.py

@@ -30,6 +30,7 @@
 
 __copyright__ = "Copyright 2019 Donald Stufft and individual contributors"
 
+import email
 import sys
 
 if sys.version_info >= (3, 10):
@@ -42,8 +43,11 @@
 
 __title__ = metadata["name"]
 __summary__ = metadata["summary"]
-__uri__ = metadata["home-page"]
+__uri__ = next(
+    entry.split(", ")[1]
+    for entry in metadata.get_all("Project-URL", ())
+    if entry.startswith("Homepage")
+)
 __version__ = metadata["version"]
-__author__ = metadata["author"]
-__email__ = metadata["author-email"]
+__author__, __email__ = email.utils.parseaddr(metadata["author-email"])
 __license__ = None