Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add tests/test*.py to sdist default inclusion list #2494

Closed
wants to merge 2 commits into from
Closed

Add tests/test*.py to sdist default inclusion list #2494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b80e11
add tests/test*.py to sdist default inclusion list
tomchen Dec 20, 2020
9093c45
Add changelog rst
tomchen Dec 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog.d/2494.change.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Add tests/test*.py to sdist default inclusion list.
-- by :user:`tomchen`
4 changes: 2 additions & 2 deletions setuptools/_distutils/command/sdist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def add_defaults(self):
"""Add all the default files to self.filelist:
- README or README.txt
- setup.py
- test/test*.py
- tests/test*.py and test/test*.py
- all pure Python modules mentioned in setup script
- all files pointed by package_data (build_py)
- all files defined in data_files.
Expand Down Expand Up @@ -268,7 +268,7 @@ def _add_defaults_standards(self):
self.warn("standard file '%s' not found" % fn)

def _add_defaults_optional(self):
optional = ['test/test*.py', 'setup.cfg']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, it's not allowed to make changes to distutils here. If you wish to make changes to distutils, they need to happen in the pypa/distutils project.

optional = ['tests/test*.py', 'test/test*.py', 'setup.cfg']
for pattern in optional:
files = filter(os.path.isfile, glob(pattern))
self.filelist.extend(files)
Expand Down
4 changes: 2 additions & 2 deletions setuptools/command/py36compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def add_defaults(self):
"""Add all the default files to self.filelist:
- README or README.txt
- setup.py
- test/test*.py
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a docstring in this code saying not to change this code.

- tests/test*.py and test/test*.py
- all pure Python modules mentioned in setup script
- all files pointed by package_data (build_py)
- all files defined in data_files.
Expand Down Expand Up @@ -74,7 +74,7 @@ def _add_defaults_standards(self):
self.warn("standard file '%s' not found" % fn)

def _add_defaults_optional(self):
optional = ['test/test*.py', 'setup.cfg']
optional = ['tests/test*.py', 'test/test*.py', 'setup.cfg']
for pattern in optional:
files = filter(os.path.isfile, glob(pattern))
self.filelist.extend(files)
Expand Down