From owner-svn-ports-head@FreeBSD.ORG Mon Jan 19 13:25:05 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 75D17DC1; Mon, 19 Jan 2015 13:25:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 61ACFC2F; Mon, 19 Jan 2015 13:25:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0JDP5wt022000; Mon, 19 Jan 2015 13:25:05 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0JDP4Ga021997; Mon, 19 Jan 2015 13:25:04 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201501191325.t0JDP4Ga021997@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 19 Jan 2015 13:25:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377419 - in head/devel/py-setuptools: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2015 13:25:05 -0000 Author: koobs Date: Mon Jan 19 13:25:04 2015 New Revision: 377419 URL: https://svnweb.freebsd.org/changeset/ports/377419 QAT: https://qat.redports.org/buildarchive/r377419/ Log: devel/py-setuptools: Backport fix for namespace_packages Backport an upstream commit [1] that fixes namespace_packages for python 3.2+ While I'm here, update TEST_DEPENDS comment and regression-test invocation. [1] https://bitbucket.org/pypa/setuptools/pull-request/72 PR: 191637 Submitted by: Melvyn Sopacua Approved by: python@ Added: head/devel/py-setuptools/files/patch-setuptools_command_install_lib.py (contents, props changed) Modified: head/devel/py-setuptools/Makefile Modified: head/devel/py-setuptools/Makefile ============================================================================== --- head/devel/py-setuptools/Makefile Mon Jan 19 13:21:34 2015 (r377418) +++ head/devel/py-setuptools/Makefile Mon Jan 19 13:25:04 2015 (r377419) @@ -2,6 +2,7 @@ PORTNAME= setuptools PORTVERSION= 5.5.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +13,7 @@ COMMENT= Python packages installer LICENSE= PSFL -# This creates a dependency loop +# This creates a dependency loop in Redports (tinderbox) #TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}distribute-[0-9]* @@ -22,6 +23,7 @@ PLIST_SUB= PYVER=${PYTHON_VER} VERSION=$ USES= python USE_PYTHON= autoplist distutils + PYDISTUTILS_SETUP= ${PYSETUP} SUB_LIST= IF_DEFAULT=${IF_DEFAULT} @@ -45,6 +47,6 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/ #regression-test: build -# @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test +# @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test .include Added: head/devel/py-setuptools/files/patch-setuptools_command_install_lib.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-setuptools/files/patch-setuptools_command_install_lib.py Mon Jan 19 13:25:04 2015 (r377419) @@ -0,0 +1,35 @@ +--- setuptools/command/install_lib.py.orig 2014-07-05 18:05:55.000000000 +0200 ++++ setuptools/command/install_lib.py 2014-07-20 21:06:16.000000000 +0200 +@@ -1,5 +1,5 @@ + import distutils.command.install_lib as orig +-import os ++import os, imp + + + class install_lib(orig.install_lib): +@@ -17,12 +17,24 @@ + nsp = self.distribution.namespace_packages + svem = (nsp and self.get_finalized_command('install') + .single_version_externally_managed) ++ exclude_names = ['__init__.py', '__init__.pyc', '__init__.pyo'] ++ if hasattr(imp, 'get_tag') : ++ exclude_names.extend(( ++ os.path.join( ++ '__pycache__', ++ '__init__.' + imp.get_tag() + '.pyc' ++ ), ++ os.path.join( ++ '__pycache__', ++ '__init__.' + imp.get_tag() + '.pyo' ++ ), ++ )) + if svem: + for pkg in nsp: + parts = pkg.split('.') + while parts: + pkgdir = os.path.join(self.install_dir, *parts) +- for f in '__init__.py', '__init__.pyc', '__init__.pyo': ++ for f in exclude_names : + exclude[os.path.join(pkgdir, f)] = 1 + parts.pop() + return exclude