Imported Upstream version 59.4.0

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 67dc08513f4f1ed142c46c3d73f0f207b681ea60..9dfdfbd6819f91d4f18cd821dfd72f9df8d93e24 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 59.3.0
+current_version = 59.4.0
 commit = True
 tag = True
 

diff --git a/CHANGES.rst b/CHANGES.rst
index 8fbae4f0f585def864cfdb4f7ad9ef54282233e1..58f35ed5c2ca8be36bbec56240ce585a53a5243f 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v59.4.0
+-------
+
+
+Changes
+^^^^^^^
+* #2893: Restore deprecated support for newlines in the Summary field.
+
+
 v59.3.0
 -------
 

diff --git a/setup.cfg b/setup.cfg
index 6aabb1a322c830a688cb927b35be2642343a5517..b96c2f248a900a4f1b5471a1aba9e4efc71b5cc6 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = setuptools
-version = 59.3.0
+version = 59.4.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 848d6b0f7538c846dde54ee687854a442a0a6303..fb1688612c1af9c66a745c1e23747f42109852f6 100644 (file)
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -145,11 +145,11 @@ def read_pkg_file(self, file):
 
 
 def single_line(val):
-    """Validate that the value does not have line breaks."""
-    # Ref: https://github.com/pypa/setuptools/issues/1390
+    # quick and dirty validation for description pypa/setuptools#1390
     if '\n' in val:
-        raise ValueError('Newlines are not allowed')
-
+        # TODO after 2021-07-31: Replace with `raise ValueError("newlines not allowed")`
+        warnings.warn("newlines not allowed and will break in the future")
+        val = val.strip().split('\n')[0]
     return val