CVS commit: pkgsrc/devel/py-nose

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 24 11:54:20 UTC 2021

Modified Files:
        pkgsrc/devel/py-nose: Makefile PLIST

Log Message:
py-nose: fix build with latest setuptools

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/py-nose/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-nose/PLIST

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

Modified files:

Index: pkgsrc/devel/py-nose/Makefile
diff -u pkgsrc/devel/py-nose/Makefile:1.17 pkgsrc/devel/py-nose/Makefile:1.18
--- pkgsrc/devel/py-nose/Makefile:1.17  Sat Oct  9 12:50:45 2021
+++ pkgsrc/devel/py-nose/Makefile       Wed Nov 24 11:54:20 2021
@@ -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 @@ COMMENT=    Unittest-based testing framewor
 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"

Index: pkgsrc/devel/py-nose/PLIST
diff -u pkgsrc/devel/py-nose/PLIST:1.4 pkgsrc/devel/py-nose/PLIST:1.5
--- pkgsrc/devel/py-nose/PLIST:1.4      Wed Sep 11 09:38:53 2013
+++ pkgsrc/devel/py-nose/PLIST  Wed Nov 24 11:54:20 2021
@@ -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