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
56274b32
Commit
56274b32
authored
Jan 23, 2017
by
Hatem Nassrat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes #935 - allows for glob syntax in graft
parent
094862cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
setuptools/command/egg_info.py
setuptools/command/egg_info.py
+3
-1
setuptools/tests/test_manifest.py
setuptools/tests/test_manifest.py
+9
-0
No files found.
setuptools/command/egg_info.py
View file @
56274b32
...
@@ -429,7 +429,9 @@ class FileList(_FileList):
...
@@ -429,7 +429,9 @@ class FileList(_FileList):
def
graft
(
self
,
dir
):
def
graft
(
self
,
dir
):
"""Include all files from 'dir/'."""
"""Include all files from 'dir/'."""
found
=
distutils
.
filelist
.
findall
(
dir
)
found
=
[]
for
match_dir
in
glob
(
dir
):
found
+=
distutils
.
filelist
.
findall
(
match_dir
)
self
.
extend
(
found
)
self
.
extend
(
found
)
return
bool
(
found
)
return
bool
(
found
)
...
...
setuptools/tests/test_manifest.py
View file @
56274b32
...
@@ -206,6 +206,15 @@ class TestManifestTest(TempDirTestCase):
...
@@ -206,6 +206,15 @@ class TestManifestTest(TempDirTestCase):
l('
app
/
static
/
app
.
css
'), l('
app
/
static
/
app
.
css
.
map
')])
l('
app
/
static
/
app
.
css
'), l('
app
/
static
/
app
.
css
.
map
')])
assert files == self.get_files()
assert files == self.get_files()
def test_graft_glob_syntax(self):
"""Include the whole app/static/ directory."""
l = make_local_path
self.make_manifest("graft */static")
files = default_files | set([
l('
app
/
static
/
app
.
js
'), l('
app
/
static
/
app
.
js
.
map
'),
l('
app
/
static
/
app
.
css
'), l('
app
/
static
/
app
.
css
.
map
')])
assert files == self.get_files()
def test_graft_global_exclude(self):
def test_graft_global_exclude(self):
"""Exclude all *.map files in the project."""
"""Exclude all *.map files in the project."""
l = make_local_path
l = make_local_path
...
...
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