diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2022-02-02 20:39:38 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2022-02-02 20:43:05 -0500 |
| commit | e04aa8ac322a8cb92064ccf832d864674eddb964 (patch) | |
| tree | c51aa54153c1d66d87359239ace500270ece38db | |
| parent | 763cf01ef7df80a5d0b64ec69427336a9cb419b8 (diff) | |
| download | python-setuptools-git-e04aa8ac322a8cb92064ccf832d864674eddb964.tar.gz | |
Remove 'lorem_ipsum' property from jaraco.text, bypassing the behavior on import and other issues.
| -rw-r--r-- | changelog.d/3072.misc.rst | 1 | ||||
| -rw-r--r-- | pkg_resources/_vendor/jaraco/text/__init__.py | 1 | ||||
| -rwxr-xr-x | setup.py | 1 | ||||
| -rw-r--r-- | tools/vendored.py | 2 |
4 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/3072.misc.rst b/changelog.d/3072.misc.rst new file mode 100644 index 00000000..362c9c30 --- /dev/null +++ b/changelog.d/3072.misc.rst @@ -0,0 +1 @@ +Remove lorem_ipsum from jaraco.text when vendored. diff --git a/pkg_resources/_vendor/jaraco/text/__init__.py b/pkg_resources/_vendor/jaraco/text/__init__.py index f39f2d93..c466378c 100644 --- a/pkg_resources/_vendor/jaraco/text/__init__.py +++ b/pkg_resources/_vendor/jaraco/text/__init__.py @@ -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): @@ -13,7 +13,6 @@ here = os.path.dirname(__file__) 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() diff --git a/tools/vendored.py b/tools/vendored.py index a5f3b9f1..7159928a 100644 --- a/tools/vendored.py +++ b/tools/vendored.py @@ -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) |