Skip to content

Commit

Permalink
Merge pull request #4485 from pypa/bugfix/4480-vendored-metadata
Browse files Browse the repository at this point in the history
Include all vendored metadata
  • Loading branch information
jaraco authored Jul 18, 2024
2 parents ea5ce1a + 65e00b6 commit 5a59af4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ recursive-include setuptools *.py *.exe *.xml *.tmpl
recursive-include tests *.py
recursive-include setuptools/tests *.html
recursive-include docs *.py *.txt *.rst *.conf *.css *.css_t Makefile indexsidebar.html
recursive-include setuptools/_vendor *.py *.txt
recursive-include setuptools/_vendor *
recursive-include pkg_resources *.py *.txt
recursive-include pkg_resources/tests/data *
recursive-include tools *
Expand Down
1 change: 1 addition & 0 deletions newsfragments/4480.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Include all vendored files in the sdist.
10 changes: 10 additions & 0 deletions setuptools/tests/test_setuptools.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Tests for the 'setuptools' package"""

import re
import sys
import os
import distutils.core
Expand Down Expand Up @@ -315,3 +316,12 @@ def test_wheel_includes_cli_scripts(setuptools_wheel):
contents = [f.replace(os.sep, '/') for f in zipfile.namelist()]

assert any('cli-64.exe' in member for member in contents)


def test_wheel_includes_vendored_metadata(setuptools_wheel):
with ZipFile(setuptools_wheel) as zipfile:
contents = [f.replace(os.sep, '/') for f in zipfile.namelist()]

assert any(
re.search(r'_vendor/.*\.dist-info/METADATA', member) for member in contents
)

0 comments on commit 5a59af4

Please sign in to comment.