Skip to content

Fix #849 global-exclude globbing #853

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

Merged
merged 1 commit into from
Dec 3, 2016
Merged

Fix #849 global-exclude globbing #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions setuptools/command/egg_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ def global_include(self, pattern):
"""
if self.allfiles is None:
self.findall()
match = translate_pattern(os.path.join('**', pattern))
match = translate_pattern(os.path.join('**', '*' + pattern))
found = [f for f in self.allfiles if match.match(f)]
self.extend(found)
return bool(found)
Expand All @@ -466,7 +466,7 @@ def global_exclude(self, pattern):
"""
Exclude all files anywhere that match the pattern.
"""
match = translate_pattern(os.path.join('**', pattern))
match = translate_pattern(os.path.join('**', '*' + pattern))
return self._remove_files(match.match)

def append(self, item):
Expand Down
12 changes: 12 additions & 0 deletions setuptools/tests/test_manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,11 @@ def test_global_include(self):
assert file_list.files == ['a.py', l('d/c.py')]
self.assertWarnings()

file_list.process_template_line('global-include .txt')
file_list.sort()
assert file_list.files == ['a.py', 'b.txt', l('d/c.py')]
self.assertNoWarnings()

def test_global_exclude(self):
l = make_local_path
# global-exclude
Expand All @@ -465,6 +470,13 @@ def test_global_exclude(self):
assert file_list.files == ['b.txt']
self.assertWarnings()

file_list = FileList()
file_list.files = ['a.py', 'b.txt', l('d/c.pyc'), 'e.pyo']
file_list.process_template_line('global-exclude .py[co]')
file_list.sort()
assert file_list.files == ['a.py', 'b.txt']
self.assertNoWarnings()

def test_recursive_include(self):
l = make_local_path
# recursive-include
Expand Down