Imported Upstream version 60.7.1

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 93ad49cbed70cbb62db4e6410c43da2b4c528a4a..93a72b39661c601cc94a35e72f44907d0972624c 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 60.7.0
+current_version = 60.7.1
 commit = True
 tag = True
 

diff --git a/CHANGES.rst b/CHANGES.rst
index f396875d0f20fb3e47a78fbca4c12101e32bfc90..e43db159bd13cc02b62035ce4346f1baf70a9663 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v60.7.1
+-------
+
+
+Misc
+^^^^
+* #3072: Remove lorem_ipsum from jaraco.text when vendored.
+
+
 v60.7.0
 -------
 

diff --git a/pkg_resources/_vendor/jaraco/text/__init__.py b/pkg_resources/_vendor/jaraco/text/__init__.py
index f39f2d9333837a8a3baedec4963f112c31b23a54..c466378ceba69a335d2beb4d3af92703d52b3831 100644 (file)
--- 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):

diff --git a/setup.cfg b/setup.cfg
index f1a535e6e3af17f4e37c74bd8ac179e98fd904c4..7fee29b2a4ee3dff8204341180236158a3db0c6e 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = setuptools
-version = 60.7.0
+version = 60.7.1
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

diff --git a/setup.py b/setup.py
index 0b85f8e716ba07079b0c38a8e9cbe7e378180ea6..4cda3d38900800259bf56618cf489d686749d46f 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -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 a5f3b9f137eb4256dbcfbcd8df77c1680958931e..7159928ad317310ad2e6f46aff69e2d90d08a9db 100644 (file)
--- 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)