Attachment 181190 Details for Bug 216953 – devel/py27-setuptools: Backport graft glob support from 34.0.1

[patch] devel/py27-setuptools: Backport graft glob support from 34.0.1

patch-devel_py27-setuptools-32.1.0_2.txt (text/plain), 3.56 KB, created by John W. O'Brien on 2017-03-25 15:45:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John W. O'Brien

Created: 2017-03-25 15:45:34 UTC

Size: 3.56 KB

patch

obsolete

>Index: devel/py27-setuptools/Makefile
>===================================================================
>--- devel/py27-setuptools/Makefile	(revision 436864)
>+++ devel/py27-setuptools/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	setuptools
> PORTVERSION=	32.1.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>Index: devel/py27-setuptools/files/patch-setuptools_command_egg__info.py
>===================================================================
>--- devel/py27-setuptools/files/patch-setuptools_command_egg__info.py	(nonexistent)
>+++ devel/py27-setuptools/files/patch-setuptools_command_egg__info.py	(working copy)
>@@ -0,0 +1,18 @@
>+Description: Backport graft glob support to resolve PR 216953
>+Issue ID: https://github.com/pypa/setuptools/issues/935
>+Changeset: https://github.com/pypa/setuptools/commit/56274b32724933cd2016488c4e667e86d30572ef
>+TODO: Upgrade devel/py27-setuptools to 34.0.1 or later
>+
>+--- setuptools/command/egg_info.py.orig	2017-02-12 20:12:06 UTC
>++++ setuptools/command/egg_info.py
>+@@ -441,7 +441,9 @@ class FileList(_FileList):
>+ 
>+     def graft(self, 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)
>+         return bool(found)
>+ 
>
>Property changes on: devel/py27-setuptools/files/patch-setuptools_command_egg__info.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/py27-setuptools/files/patch-setuptools_tests_test__manifest.py
>===================================================================
>--- devel/py27-setuptools/files/patch-setuptools_tests_test__manifest.py	(nonexistent)
>+++ devel/py27-setuptools/files/patch-setuptools_tests_test__manifest.py	(working copy)
>@@ -0,0 +1,23 @@
>+Description: Backport graft glob support to resolve PR 216953
>+Issue ID: https://github.com/pypa/setuptools/issues/935
>+Changeset: https://github.com/pypa/setuptools/commit/56274b32724933cd2016488c4e667e86d30572ef
>+TODO: Upgrade devel/py27-setuptools to 34.0.1 or later
>+
>+--- setuptools/tests/test_manifest.py.orig	2017-02-12 20:13:57 UTC
>++++ setuptools/tests/test_manifest.py
>+@@ -206,6 +206,15 @@ class TestManifestTest(TempDirTestCase):
>+             l('app/static/app.css'), l('app/static/app.css.map')])
>+         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):
>+         """Exclude all *.map files in the project."""
>+         l = make_local_path
>
>Property changes on: devel/py27-setuptools/files/patch-setuptools_tests_test__manifest.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

john: maintainer-approval?

Actions: View | Diff

Attachments on bug 216953: 179814 | 179918 | 181190