Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
3910bbb8
Commit
3910bbb8
authored
Dec 21, 2019
by
Jason R. Coombs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extract methods to separate _safe_data_files behavior and _add_data_files.
parent
1d03fdc9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
8 deletions
+21
-8
setuptools/command/sdist.py
setuptools/command/sdist.py
+21
-8
No files found.
setuptools/command/sdist.py
View file @
3910bbb8
...
...
@@ -126,14 +126,27 @@ class sdist(sdist_add_defaults, orig.sdist):
if
self
.
distribution
.
has_pure_modules
():
build_py
=
self
.
get_finalized_command
(
'build_py'
)
self
.
filelist
.
extend
(
build_py
.
get_source_files
())
# This functionality is incompatible with include_package_data, and
# will in fact create an infinite recursion if include_package_data
# is True. Use of include_package_data will imply that
# distutils-style automatic handling of package_data is disabled
if
not
self
.
distribution
.
include_package_data
:
for
_
,
src_dir
,
_
,
filenames
in
build_py
.
data_files
:
self
.
filelist
.
extend
([
os
.
path
.
join
(
src_dir
,
filename
)
for
filename
in
filenames
])
self
.
_add_data_files
(
self
.
_safe_data_files
(
build_py
))
def
_safe_data_files
(
self
,
build_py
):
"""
Extracting data_files from build_py is known to cause
infinite recursion errors when `include_package_data`
is enabled, so suppress it in that case.
"""
if
self
.
distribution
.
include_package_data
:
return
()
return
build_py
.
data_files
def
_add_data_files
(
self
,
data_files
):
"""
Add data files as found in build_py.data_files.
"""
self
.
filelist
.
extend
(
os
.
path
.
join
(
src_dir
,
name
)
for
_
,
src_dir
,
_
,
filenames
in
data_files
for
name
in
filenames
)
def
_add_defaults_data_files
(
self
):
try
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment