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

Remove lorem_ipsum from jaraco.text when vendored. #3077

Merged
merged 1 commit into from
Feb 3, 2022
+3 −2
Merged

Remove lorem_ipsum from jaraco.text when vendored. #3077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/3072.misc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove lorem_ipsum from jaraco.text when vendored.
1 change: 0 additions & 1 deletion pkg_resources/_vendor/jaraco/text/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ def unwrap(s):
return '\n'.join(cleaned)


lorem_ipsum: str = files(__name__).joinpath('Lorem ipsum.txt').read_text()


class Splitter(object):
Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
package_data = dict(
setuptools=['script (dev).tmpl', 'script.tmpl', 'site-patch.py'],
)
package_data.update({'pkg_resources._vendor.jaraco.text': ['*.txt']})

force_windows_specific_files = (
os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES", "1").lower()
Expand Down
2 changes: 2 additions & 0 deletions tools/vendored.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def rewrite_jaraco_text(pkg_files, new_root):
text = file.read_text()
text = re.sub(r' (jaraco\.)', rf' {new_root}.\1', text)
text = re.sub(r' (importlib_resources)', rf' {new_root}.\1', text)
# suppress loading of lorem_ipsum; ref #3072
text = re.sub(r'^lorem_ipsum.*\n$', '', text, flags=re.M)
file.write_text(text)


Expand Down