View | Details | Raw Unified | Return to bug 216953 | Differences between
and this patch

Collapse All | Expand All

(-)devel/py27-setuptools/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	setuptools
3
PORTNAME=	setuptools
4
PORTVERSION=	32.1.0
4
PORTVERSION=	32.1.0
5
PORTREVISION=	1
5
PORTREVISION=	2
6
CATEGORIES=	devel python
6
CATEGORIES=	devel python
7
MASTER_SITES=	CHEESESHOP
7
MASTER_SITES=	CHEESESHOP
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
(-)devel/py27-setuptools/files/patch-setuptools_command_egg__info.py (+18 lines)
Line 0 Link Here
1
Description: Backport graft glob support to resolve PR 216953
2
Issue ID: https://github.com/pypa/setuptools/issues/935
3
Changeset: https://github.com/pypa/setuptools/commit/56274b32724933cd2016488c4e667e86d30572ef
4
TODO: Upgrade devel/py27-setuptools to 34.0.1 or later
5
6
--- setuptools/command/egg_info.py.orig	2017-02-12 20:12:06 UTC
7
+++ setuptools/command/egg_info.py
8
@@ -441,7 +441,9 @@ class FileList(_FileList):
9
 
10
     def graft(self, dir):
11
         """Include all files from 'dir/'."""
12
-        found = distutils.filelist.findall(dir)
13
+        found = []
14
+        for match_dir in glob(dir):
15
+            found += distutils.filelist.findall(match_dir)
16
         self.extend(found)
17
         return bool(found)
18
 
(-)devel/py27-setuptools/files/patch-setuptools_tests_test__manifest.py (+23 lines)
Line 0 Link Here
1
Description: Backport graft glob support to resolve PR 216953
2
Issue ID: https://github.com/pypa/setuptools/issues/935
3
Changeset: https://github.com/pypa/setuptools/commit/56274b32724933cd2016488c4e667e86d30572ef
4
TODO: Upgrade devel/py27-setuptools to 34.0.1 or later
5
6
--- setuptools/tests/test_manifest.py.orig	2017-02-12 20:13:57 UTC
7
+++ setuptools/tests/test_manifest.py
8
@@ -206,6 +206,15 @@ class TestManifestTest(TempDirTestCase):
9
             l('app/static/app.css'), l('app/static/app.css.map')])
10
         assert files == self.get_files()
11
 
12
+    def test_graft_glob_syntax(self):
13
+        """Include the whole app/static/ directory."""
14
+        l = make_local_path
15
+        self.make_manifest("graft */static")
16
+        files = default_files | set([
17
+            l('app/static/app.js'), l('app/static/app.js.map'),
18
+            l('app/static/app.css'), l('app/static/app.css.map')])
19
+        assert files == self.get_files()
20
+
21
     def test_graft_global_exclude(self):
22
         """Exclude all *.map files in the project."""
23
         l = make_local_path

Return to bug 216953