pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Apply an upstreamable fix for "don't install test/ files".



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Mon Jun 19 20:42:09 2017 +0200
Changeset:	62952d68d2f9a6b2c901eff6db99373c38b94f34

Modified Files:
	py-napalm-iosxr/Makefile
	py-napalm-iosxr/distinfo
Added Files:
	py-napalm-iosxr/patches/patch-setup.py

Log Message:
Apply an upstreamable fix for "don't install test/ files".

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=62952d68d2f9a6b2c901eff6db99373c38b94f34

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-napalm-iosxr/Makefile               |  4 ----
 py-napalm-iosxr/distinfo               |  1 +
 py-napalm-iosxr/patches/patch-setup.py | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diffs:
diff --git a/py-napalm-iosxr/Makefile b/py-napalm-iosxr/Makefile
index aab86c557b..105e891f05 100644
--- a/py-napalm-iosxr/Makefile
+++ b/py-napalm-iosxr/Makefile
@@ -15,9 +15,5 @@ DEPENDS+=	${PYPKGPREFIX}-napalm-base>=0.18.0:../../wip/py-napalm-base
 DEPENDS+=	${PYPKGPREFIX}-IOSXR>=0.20:../../wip/py-IOSXR
 DEPENDS+=	${PYPKGPREFIX}-netaddr-[0-9]*:../../net/py-netaddr
 
-# Mistakenly installed, prone to name conflicts (e.g. with napalm-base)
-post-install:
-	rm -rf ${DESTDIR}/${PREFIX}/${PYSITELIB}/test/
-
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-napalm-iosxr/distinfo b/py-napalm-iosxr/distinfo
index 0ba1451324..57b4c15183 100644
--- a/py-napalm-iosxr/distinfo
+++ b/py-napalm-iosxr/distinfo
@@ -4,3 +4,4 @@ SHA1 (napalm-iosxr-0.4.8.tar.gz) = fd974e7a6522151a6645029d1093d0fcf0a773a8
 RMD160 (napalm-iosxr-0.4.8.tar.gz) = f2507c1a93d5bae12ef93c02eca09c35217f6361
 SHA512 (napalm-iosxr-0.4.8.tar.gz) = 33463b31705cf15e0055d54d9386bc02185708339a0534075a41d1bb8a34f91d5ee78d9d71364cc50b06b8457863e3efb64b0407704c19913da661a366a31071
 Size (napalm-iosxr-0.4.8.tar.gz) = 418447 bytes
+SHA1 (patch-setup.py) = 4561d22e20ce65d642d9ac96752469d5b60c3e2b
diff --git a/py-napalm-iosxr/patches/patch-setup.py b/py-napalm-iosxr/patches/patch-setup.py
new file mode 100644
index 0000000000..90faa764a2
--- /dev/null
+++ b/py-napalm-iosxr/patches/patch-setup.py
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Don't install test directory.
+
+--- setup.py.orig	2017-02-08 20:16:47.000000000 +0000
++++ setup.py
+@@ -13,7 +13,7 @@ reqs = [str(ir.req) for ir in install_re
+ setup(
+     name="napalm-iosxr",
+     version="0.4.8",
+-    packages=find_packages(),
++    packages=find_packages(exclude=["test", "test.*"]),
+     author="David Barroso, Mircea Ulinic",
+     author_email="dbarrosop%dravetech.com@localhost, mircea%cloudflare.com@localhost",
+     description="Network Automation and Programmability Abstraction Layer with Multivendor support",


Home | Main Index | Thread Index | Old Index