Date: Thu, 15 Mar 2018 19:54:36 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464627 - in head/devel/py-cov-core: . files Message-ID: <201803151954.w2FJsaj4080049@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Mar 15 19:54:36 2018 New Revision: 464627 URL: https://svnweb.freebsd.org/changeset/ports/464627 Log: Fix installation of init_cov_core.pth to be in the package rather than the build host. Added: head/devel/py-cov-core/files/ head/devel/py-cov-core/files/patch-setup.py (contents, props changed) Modified: head/devel/py-cov-core/Makefile Modified: head/devel/py-cov-core/Makefile ============================================================================== --- head/devel/py-cov-core/Makefile Thu Mar 15 19:47:38 2018 (r464626) +++ head/devel/py-cov-core/Makefile Thu Mar 15 19:54:36 2018 (r464627) @@ -3,6 +3,7 @@ PORTNAME= cov-core PORTVERSION= 1.15.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,5 +18,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.6:deve USES= python USE_PYTHON= autoplist distutils + +PLIST_FILES+= ${PYTHON_SITELIBDIR}/init_cov_core.pth +post-install: + ${INSTALL_DATA} ${WRKSRC}/init_cov_core.pth \ + ${STAGEDIR}${PYTHON_SITELIBDIR}/ .include <bsd.port.mk> Added: head/devel/py-cov-core/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-cov-core/files/patch-setup.py Thu Mar 15 19:54:36 2018 (r464627) @@ -0,0 +1,44 @@ +Based on debian patch: + +Author: Barry Warsaw <barry@debian.org> +Patch-Name: pth-installation-path +Subject: Calculate the correct .pth path + + cov-core wants to install the file init_cov_core.pth so that cov_core_init + will be imported and initialized automatically for subprocess coverage, if + the environment variable COV_CORE_SOURCE is set (which e.g. nose does + automatically). However the upstream setup.py tries to install this file + directly into /usr/lib/pythonX.Y/{site,dist}-packages, which clearly doesn't + work when building the package. This patch hard codes the .pth path for a + location within the build directory. dh_python{2,3} does the rest. +Forwarded: not-needed + +--- setup.py ++++ setup.py +@@ -48,23 +48,6 @@ + 'Topic :: Software Development :: Testing']) + + if sys.argv[1] in ('install', 'develop'): +- for path in sys.path: +- if (path.endswith('site-packages')) or (path.endswith('dist-packages') +- and 'local' in path): +- path = os.path.join(path, PTH_FILE_NAME) +- try: +- pth_file = open(path, 'w') +- pth_file.write(PTH_FILE) +- pth_file.close() +- sys.stdout.write('\nWrote pth file for subprocess ' +- 'measurement to %s\n' % path) +- break +- except Exception: +- sys.stdout.write('\nFailed to write pth file for subprocess ' +- 'measurement to %s\n' % path) +- sys.stdout.write(PTH_FILE_FAILURE) +- break +- else: +- sys.stdout.write('\nFailed to find site-packages or dist-packages ' +- 'dir to put pth file in.\n') +- sys.stdout.write(PTH_FILE_FAILURE) ++ pth_path = PTH_FILE_NAME ++ with open(pth_path, 'w') as fp: ++ fp.write(PTH_FILE)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803151954.w2FJsaj4080049>