From 01bc1e796e6da39258cd10c9c684143856d13a95 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Mon, 18 Jul 2022 15:39:04 +0900 Subject: [PATCH] Imported Upstream version 59.4.0 --- CHANGES.rst | 9 +++++++++ PKG-INFO | 2 +- setup.cfg | 2 +- setuptools.egg-info/PKG-INFO | 2 +- setuptools/dist.py | 8 ++++---- 5 files changed, 16 insertions(+), 7 deletions(-) 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/PKG-INFO b/PKG-INFO index 034237b..7ba0d56 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: setuptools -Version: 59.3.0 +Version: 59.4.0 Summary: Easily download, build, install, upgrade, and uninstall Python packages Home-page: https://github.com/pypa/setuptools Author: Python Packaging Authority diff --git a/setup.cfg b/setup.cfg index 4be71c0..05cae4a 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.egg-info/PKG-INFO b/setuptools.egg-info/PKG-INFO index 034237b..7ba0d56 100644 --- a/setuptools.egg-info/PKG-INFO +++ b/setuptools.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: setuptools -Version: 59.3.0 +Version: 59.4.0 Summary: Easily download, build, install, upgrade, and uninstall Python packages Home-page: https://github.com/pypa/setuptools Author: Python Packaging Authority 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.7.4