Commit eabe1b53 authored by Jason R. Coombs's avatar Jason R. Coombs Committed by GitHub

Merge pull request #890 from timheap/revert-849

Revert #853 implicit wildcards in MANIFEST.in
parents 5c5d40c3 b92763bc
In development
--------------
* #890: Revert #849. ``global-exclude .foo`` will not match all
``*.foo`` files any more. Package authors must add an explicit
wildcard, such as ``global-exclude *.foo``, to match all
``.foo`` files. See #886, #849.
v31.0.1 v31.0.1
------- -------
...@@ -132,7 +140,11 @@ v28.5.0 ...@@ -132,7 +140,11 @@ v28.5.0
* #810: Tests are now invoked with tox and not setup.py test. * #810: Tests are now invoked with tox and not setup.py test.
* #249 and #450 via #764: Avoid scanning the whole tree * #249 and #450 via #764: Avoid scanning the whole tree
when building the manifest. when building the manifest. Also fixes a long-standing bug
where patterns in ``MANIFEST.in`` had implicit wildcard
matching. This caused ``global-exclude .foo`` to exclude
all ``*.foo`` files, but also ``global-exclude bar.py`` to
exclude ``foo_bar.py``.
v28.4.0 v28.4.0
------- -------
......
...@@ -457,7 +457,7 @@ class FileList(_FileList): ...@@ -457,7 +457,7 @@ class FileList(_FileList):
""" """
if self.allfiles is None: if self.allfiles is None:
self.findall() 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)] found = [f for f in self.allfiles if match.match(f)]
self.extend(found) self.extend(found)
return bool(found) return bool(found)
...@@ -466,7 +466,7 @@ class FileList(_FileList): ...@@ -466,7 +466,7 @@ class FileList(_FileList):
""" """
Exclude all files anywhere that match the 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) return self._remove_files(match.match)
def append(self, item): def append(self, item):
......
...@@ -449,11 +449,6 @@ class TestFileListTest(TempDirTestCase): ...@@ -449,11 +449,6 @@ class TestFileListTest(TempDirTestCase):
assert file_list.files == ['a.py', l('d/c.py')] assert file_list.files == ['a.py', l('d/c.py')]
self.assertWarnings() 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): def test_global_exclude(self):
l = make_local_path l = make_local_path
# global-exclude # global-exclude
...@@ -470,13 +465,6 @@ class TestFileListTest(TempDirTestCase): ...@@ -470,13 +465,6 @@ class TestFileListTest(TempDirTestCase):
assert file_list.files == ['b.txt'] assert file_list.files == ['b.txt']
self.assertWarnings() 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): def test_recursive_include(self):
l = make_local_path l = make_local_path
# recursive-include # recursive-include
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment