Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fail on a multiline distribution package summary #2870

Merged
merged 5 commits into from
Nov 13, 2021
Merged

Fail on a multiline distribution package summary #2870

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8fe4a8
Fail on a multiline distribution package summary
webknjaz Nov 11, 2021
818fdb9
Add a change note for PR #2870
webknjaz Nov 11, 2021
65d6653
Fix the word "breaks" in the change note
webknjaz Nov 12, 2021
a4b7cae
Restore single_line as a simple, universal validator.
jaraco Nov 13, 2021
25d1d54
Change is backward-incompatible for projects with newlines in the sum…
jaraco Nov 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/2870.change.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Started failing on invalid inline description with line brakes :class:`ValueError` -- by :user:`webknjaz`
webknjaz marked this conversation as resolved.
Show resolved Hide resolved
14 changes: 8 additions & 6 deletions setuptools/dist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,14 @@ def read_pkg_file(self, file):
self.license_files = _read_list_from_msg(msg, 'license-file')


def single_line(val):
# quick and dirty validation for description pypa/setuptools#1390
def ensure_summary_single_line(val):
"""Validate that the summary does not have line breaks."""
jaraco marked this conversation as resolved.
Show resolved Hide resolved
# Ref: https://github.com/pypa/setuptools/issues/1390
if '\n' in val:
# 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.replace('\n', ' ')
raise ValueError(
'Newlines in the package distribution summary are not allowed',
)

return val


Expand All @@ -164,7 +166,7 @@ def write_field(key, value):
write_field('Metadata-Version', str(version))
write_field('Name', self.get_name())
write_field('Version', self.get_version())
write_field('Summary', single_line(self.get_description()))
write_field('Summary', ensure_summary_single_line(self.get_description()))
write_field('Home-page', self.get_url())

optional_fields = (
Expand Down