diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2022-02-06 10:22:27 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2022-02-06 10:31:01 -0500 |
| commit | 8afd3a3a61949aba151c9dc0c9d7520d73ee8b9e (patch) | |
| tree | 95b61f0a37f9c6dd2cf448fbedf8e9f465e89619 | |
| parent | e5530cbbec3197cdd17b904563862a233c286c71 (diff) | |
| download | python-setuptools-git-8afd3a3a61949aba151c9dc0c9d7520d73ee8b9e.tar.gz | |
Ensure that _vendor/jaraco is available as a module. Fixes #3084.
| -rw-r--r-- | changelog.d/3084.misc.rst | 1 | ||||
| -rw-r--r-- | pkg_resources/_vendor/jaraco/__init__.py | 0 | ||||
| -rw-r--r-- | setuptools/_vendor/jaraco/__init__.py | 0 | ||||
| -rw-r--r-- | tools/vendored.py | 2 |
4 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/3084.misc.rst b/changelog.d/3084.misc.rst new file mode 100644 index 00000000..4e81fcaf --- /dev/null +++ b/changelog.d/3084.misc.rst @@ -0,0 +1 @@ +When vendoring jaraco packages, ensure the namespace package is converted to a simple package to support zip importer. diff --git a/pkg_resources/_vendor/jaraco/__init__.py b/pkg_resources/_vendor/jaraco/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/pkg_resources/_vendor/jaraco/__init__.py diff --git a/setuptools/_vendor/jaraco/__init__.py b/setuptools/_vendor/jaraco/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/setuptools/_vendor/jaraco/__init__.py diff --git a/tools/vendored.py b/tools/vendored.py index 9d832a08..57e28d53 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): |