Imported Upstream version 60.8.1

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 913561197a9eacab8cad076a139725f1a90d6b5f..77754fc02185e53a3978b2ad4c7dee0d944bbe69 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 60.8.0
+current_version = 60.8.1
 commit = True
 tag = True
 

diff --git a/CHANGES.rst b/CHANGES.rst
index e6d359a8a36636959fa9f44c40484b03f4eb2dd8..0183241bb7f591b112070c9594e81b67b7211126 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v60.8.1
+-------
+
+
+Misc
+^^^^
+* #3084: When vendoring jaraco packages, ensure the namespace package is converted to a simple package to support zip importer.
+
+
 v60.8.0
 -------
 

diff --git a/pkg_resources/_vendor/jaraco/__init__.py b/pkg_resources/_vendor/jaraco/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

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

diff --git a/setuptools/_vendor/jaraco/__init__.py b/setuptools/_vendor/jaraco/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tools/vendored.py b/tools/vendored.py
index 9d832a08503e3775270af2a67dec927187df7bd7..57e28d53c40375c04ab41dc3c5ec177864d56306 100644 (file)
--- a/tools/vendored.py
+++ b/tools/vendored.py
@@ -50,6 +50,8 @@ def rewrite_jaraco(pkg_files, new_root):
         text = file.read_text()
         text = re.sub(r' (more_itertools)', rf' {new_root}.\1', text)
         file.write_text(text)
+    # required for zip-packaged setuptools #3084
+    pkg_files.joinpath('__init__.py').write_text('')
 
 
 def rewrite_importlib_resources(pkg_files, new_root):