summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/py-unittest2/ALTERNATIVES1
-rw-r--r--devel/py-unittest2/DESCR9
-rw-r--r--devel/py-unittest2/Makefile19
-rw-r--r--devel/py-unittest2/PLIST7
-rw-r--r--devel/py-unittest2/distinfo8
5 files changed, 24 insertions, 20 deletions
diff --git a/devel/py-unittest2/ALTERNATIVES b/devel/py-unittest2/ALTERNATIVES
index 32c15d26a64..9f8e113a9c3 100644
--- a/devel/py-unittest2/ALTERNATIVES
+++ b/devel/py-unittest2/ALTERNATIVES
@@ -1,2 +1 @@
bin/unit2 @PREFIX@/bin/unit2-@PYVERSSUFFIX@
-bin/unit2.py @PREFIX@/bin/unit2-@PYVERSSUFFIX@.py
diff --git a/devel/py-unittest2/DESCR b/devel/py-unittest2/DESCR
index f38a24497c9..8cd797c19f8 100644
--- a/devel/py-unittest2/DESCR
+++ b/devel/py-unittest2/DESCR
@@ -1,7 +1,6 @@
Unittest2 is a backport of the new features added to the unittest testing
-framework in Python 2.7. It is tested to run on Python 2.4 - 2.7.
+framework in Python 2.7 and onwards. It is tested to run on Python 2.6, 2.7,
+3.2, 3.3, 3.4 and pypy.
-To use unittest2 instead of unittest simply replace import unittest with
-import unittest2.
-
-This is the version for Python 2.x.
+To use unittest2 instead of unittest simply replace ''import unittest'' with
+''import unittest2''.
diff --git a/devel/py-unittest2/Makefile b/devel/py-unittest2/Makefile
index b49345d83c4..32397eb69ed 100644
--- a/devel/py-unittest2/Makefile
+++ b/devel/py-unittest2/Makefile
@@ -1,27 +1,30 @@
-# $NetBSD: Makefile,v 1.7 2014/06/23 10:43:45 rodent Exp $
+# $NetBSD: Makefile,v 1.8 2014/12/13 08:36:03 obache Exp $
-DISTNAME= unittest2-0.5.1
+DISTNAME= unittest2-0.8.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://pypi.python.org/packages/source/u/unittest2/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://pypi.python.org/pypi/unittest2
-COMMENT= Unittest features for Python 2.7 (Python 2.x version)
+COMMENT= New features in unittest backported to Python 2.4+
LICENSE= original-bsd
+DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+DEPENDS+= ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
+
DOCDIR= share/doc/${PKGBASE}
INSTALLATION_DIRS+= ${DOCDIR}
PLIST_SUBST+= DOCDIR=${DOCDIR}
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # see versioned_dependencies.mk
+
+SUBST_CLASSES+= multi
+SUBST_STAGE.multi= pre-configure
+SUBST_FILES.multi= setup.py
+SUBST_SED.multi= -e 's,unit2,unit2-${PYVERSSUFFIX},'
post-install:
${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/${DOCDIR}
- ${RM} ${DESTDIR}${PREFIX}/bin/unit2
- ${MV} ${DESTDIR}${PREFIX}/bin/unit2.py \
- ${DESTDIR}${PREFIX}/bin/unit2-${PYVERSSUFFIX}.py
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-unittest2/PLIST b/devel/py-unittest2/PLIST
index 8a83432a7e7..514318a9cf6 100644
--- a/devel/py-unittest2/PLIST
+++ b/devel/py-unittest2/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2014/06/23 10:43:45 rodent Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/12/13 08:36:03 obache Exp $
bin/unit2-${PYVERSSUFFIX}
-bin/unit2-${PYVERSSUFFIX}.py
${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}/requires.txt
${PYSITELIB}/${EGG_INFODIR}/top_level.txt
${PYSITELIB}/unittest2/__init__.py
${PYSITELIB}/unittest2/__init__.pyc
@@ -42,6 +42,9 @@ ${PYSITELIB}/unittest2/suite.pyo
${PYSITELIB}/unittest2/test/__init__.py
${PYSITELIB}/unittest2/test/__init__.pyc
${PYSITELIB}/unittest2/test/__init__.pyo
+${PYSITELIB}/unittest2/test/_test_unittest2_with.py
+${PYSITELIB}/unittest2/test/_test_unittest2_with.pyc
+${PYSITELIB}/unittest2/test/_test_unittest2_with.pyo
${PYSITELIB}/unittest2/test/dummy.py
${PYSITELIB}/unittest2/test/dummy.pyc
${PYSITELIB}/unittest2/test/dummy.pyo
diff --git a/devel/py-unittest2/distinfo b/devel/py-unittest2/distinfo
index 4600226a6ba..be92361c1d4 100644
--- a/devel/py-unittest2/distinfo
+++ b/devel/py-unittest2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2013/07/08 04:52:48 richard Exp $
+$NetBSD: distinfo,v 1.2 2014/12/13 08:36:03 obache Exp $
-SHA1 (unittest2-0.5.1.tar.gz) = 2299652dc1c0155d67d6574d9f854de45d36a7ce
-RMD160 (unittest2-0.5.1.tar.gz) = aa83b1d6dedaa71a9e6d3bed4028e855bef04821
-Size (unittest2-0.5.1.tar.gz) = 62470 bytes
+SHA1 (unittest2-0.8.0.tar.gz) = 36a3700bde086890bab5aece6c78c8f770c7bb15
+RMD160 (unittest2-0.8.0.tar.gz) = 1e2bf086483d2eb9a74e7e89366d3a7712bf4aa3
+Size (unittest2-0.8.0.tar.gz) = 78312 bytes