From 01b61328827fea2f5474a2ab0e92436d911f07e9 Mon Sep 17 00:00:00 2001 From: JinWang An Date: Mon, 27 Mar 2023 17:02:45 +0900 Subject: [PATCH] Imported Upstream version 60.8.1 --- .bumpversion.cfg | 2 +- CHANGES.rst | 9 +++++++++ pkg_resources/_vendor/jaraco/__init__.py | 0 setup.cfg | 2 +- setuptools/_vendor/jaraco/__init__.py | 0 tools/vendored.py | 2 ++ 6 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 pkg_resources/_vendor/jaraco/__init__.py create mode 100644 setuptools/_vendor/jaraco/__init__.py diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9135611..77754fc 100644 --- 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 e6d359a..0183241 100644 --- 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 index 0000000..e69de29 diff --git a/setup.cfg b/setup.cfg index 753687f..d6f08ca 100644 --- 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 index 0000000..e69de29 diff --git a/tools/vendored.py b/tools/vendored.py index 9d832a0..57e28d5 100644 --- 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): -- 2.34.1