From c6e32a5ab27fe7d3f5bd2cad92b446967ece5fd8 Mon Sep 17 00:00:00 2001 From: JinWang An Date: Mon, 27 Mar 2023 17:02:39 +0900 Subject: [PATCH] Imported Upstream version 59.4.0 --- .bumpversion.cfg | 2 +- CHANGES.rst | 9 +++++++++ setup.cfg | 2 +- setuptools/dist.py | 8 ++++---- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 67dc085..9dfdfbd 100644 --- 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 8fbae4f..58f35ed 100644 --- 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 6aabb1a..b96c2f2 100644 --- 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 848d6b0..fb16886 100644 --- 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 -- 2.34.1