Skip to content

Commit 5a59af4

Browse files
authored
Merge pull request #4485 from pypa/bugfix/4480-vendored-metadata
Include all vendored metadata
2 parents ea5ce1a + 65e00b6 commit 5a59af4

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ recursive-include setuptools *.py *.exe *.xml *.tmpl
22
recursive-include tests *.py
33
recursive-include setuptools/tests *.html
44
recursive-include docs *.py *.txt *.rst *.conf *.css *.css_t Makefile indexsidebar.html
5-
recursive-include setuptools/_vendor *.py *.txt
5+
recursive-include setuptools/_vendor *
66
recursive-include pkg_resources *.py *.txt
77
recursive-include pkg_resources/tests/data *
88
recursive-include tools *

newsfragments/4480.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Include all vendored files in the sdist.

setuptools/tests/test_setuptools.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""Tests for the 'setuptools' package"""
22

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

317318
assert any('cli-64.exe' in member for member in contents)
319+
320+
321+
def test_wheel_includes_vendored_metadata(setuptools_wheel):
322+
with ZipFile(setuptools_wheel) as zipfile:
323+
contents = [f.replace(os.sep, '/') for f in zipfile.namelist()]
324+
325+
assert any(
326+
re.search(r'_vendor/.*\.dist-info/METADATA', member) for member in contents
327+
)

0 commit comments

Comments
 (0)