pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/py-nose py-nose: fix build with latest setuptools



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd7027552333
branches:  trunk
changeset: 770072:bd7027552333
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Nov 24 11:54:20 2021 +0000

description:
py-nose: fix build with latest setuptools

Bump PKGREVISION.

diffstat:

 devel/py-nose/Makefile |  20 ++++++++++++--------
 devel/py-nose/PLIST    |   6 +++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diffs (63 lines):

diff -r ff7756800c1b -r bd7027552333 devel/py-nose/Makefile
--- a/devel/py-nose/Makefile    Wed Nov 24 11:48:22 2021 +0000
+++ b/devel/py-nose/Makefile    Wed Nov 24 11:54:20 2021 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2021/10/09 12:50:45 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2021/11/24 11:54:20 wiz Exp $
 
 DISTNAME=      nose-1.3.7
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/nose/}
 
@@ -11,22 +12,25 @@
 LICENSE=       gnu-lgpl-v2.1
 
 # only needed for a plugin
-#DEPENDS+=     ${PYPKGPREFIX}-coverage>=3.0:../../devel/py-coverage
+TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=3.0:../../devel/py-coverage
 
 USE_LANGUAGES= # none
 
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
-pre-test:
-       ${RUN} cd ${WRKSRC} && \
-       ${PYTHONBIN} setup.py build_tests
-
 post-install:
-       ${RM} ${DESTDIR}${PREFIX}/bin/nosetests
+       ${MV} ${DESTDIR}${PREFIX}/bin/nosetests ${DESTDIR}${PREFIX}/bin/nosetests-${PYVERSSUFFIX} || ${TRUE}
        ${MV} ${DESTDIR}${PREFIX}/man/man1/nosetests.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nosetests${PYVERSSUFFIX}.1
 
+.include "../../lang/python/egg.mk"
+
+.if ${PYPKGPREFIX} == "py27"
+# only work with python 2.x
 do-test:
        ${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHONBIN} selftest.py
+.else
+pre-build:
+       cd ${WRKSRC} && 2to3-${PYVERSSUFFIX} -w --no-diffs nose
+.endif
 
-.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ff7756800c1b -r bd7027552333 devel/py-nose/PLIST
--- a/devel/py-nose/PLIST       Wed Nov 24 11:48:22 2021 +0000
+++ b/devel/py-nose/PLIST       Wed Nov 24 11:54:20 2021 +0000
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2013/09/11 09:38:53 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/11/24 11:54:20 wiz Exp $
 bin/nosetests-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PLIST.py2x}${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PLIST.py2x}${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/nose/__init__.py
 ${PYSITELIB}/nose/__init__.pyc



Home | Main Index | Thread Index | Old Index