Imported Upstream version 51.3.2

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 2cb50290ea00964daa84b4d424b1ff5eba4dc92c..4d6072174118d7cc551446095171022b47dc33fa 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 51.3.1
+current_version = 51.3.2
 commit = True
 tag = True
 

diff --git a/CHANGES.rst b/CHANGES.rst
index 2be5fa2fac91bfc9e2ec5485619160ad1852c070..2de874ca960515015c149d7048326165f52fa182 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v51.3.2
+-------
+
+
+Misc
+^^^^
+* #1390: Validation of Description field now is more lenient, emitting a warning and mangling the value to be valid (replacing newlines with spaces).
+
+
 v51.3.1
 -------
 

diff --git a/setup.cfg b/setup.cfg
index aead43461bfbb5c1892f382cd335dd7548268a9c..2476ede8b0444380a4e1e2c36121a874ddf73582 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
     LICENSE
 name = setuptools
-version = 51.3.1
+version = 51.3.2
 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 2d0aac333d35fc2c5650b6426349799986414553..172d66b1f4ab1534afe605050960684c6f2d246f 100644 (file)
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -121,7 +121,9 @@ def read_pkg_file(self, file):
 def single_line(val):
     # quick and dirty validation for description pypa/setuptools#1390
     if '\n' in val:
-        raise ValueError("newlines not allowed")
+        # TODO after 2021-07-31: Replace with `raise ValueError("newlines not allowed")`
+        warnings.UserWarning("newlines not allowed and will break in the future")
+        val = val.replace('\n', ' ')
     return val