On Wed, Dec 17, 2014 at 10:05:55AM +0100, Antoine Jacoutot wrote:
> On Wed, Dec 17, 2014 at 05:08:56AM +0500, Alexandr Shadchin wrote:
> > Hi,
> >
> > * add python3 flavor
> > * fix regress
> > * uniform MASTER_SITES
> >
> > Comments ? OK ?
> >
> > --
> > Alexandr Shadchin
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/py-six/Makefile,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 Makefile
> > --- Makefile 12 Sep 2014 20:41:53 -0000 1.8
> > +++ Makefile 16 Dec 2014 23:31:52 -0000
> > @@ -13,7 +13,7 @@ MAINTAINER = Brian Callahan <bcallah@ope
> > # MIT
> > PERMIT_PACKAGE_CDROM = Yes
> >
> > -MASTER_SITES = https://pypi.python.org/packages/source/s/six/
> > +MASTER_SITES = ${MASTER_SITE_PYPI:=s/six/}
> >
> > MODULES = lang/python
> > MODPY_SETUPTOOLS = Yes
> > @@ -21,7 +21,10 @@ MODPY_SETUPTOOLS = Yes
> > TEST_DEPENDS = devel/py-py \
> > devel/py-test
>
> Don't these DEPENDS need modification as well?
>
>
Thanks - good catch. Update diff.
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-six/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 12 Sep 2014 20:41:53 -0000 1.8
+++ Makefile 17 Dec 2014 09:08:36 -0000
@@ -4,6 +4,7 @@ COMMENT = Python 2 and 3 compatibility l
MODPY_EGG_VERSION = 1.8.0
DISTNAME = six-${MODPY_EGG_VERSION}
PKGNAME = py-six-${MODPY_EGG_VERSION}
+REVISION = 0
CATEGORIES = devel
HOMEPAGE = http://pythonhosted.org/six/
@@ -13,15 +14,18 @@ MAINTAINER = Brian Callahan <bcallah@ope
# MIT
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = https://pypi.python.org/packages/source/s/six/
+MASTER_SITES = ${MASTER_SITE_PYPI:=s/six/}
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
-TEST_DEPENDS = devel/py-py \
- devel/py-test
+TEST_DEPENDS = devel/py-py${MODPY_FLAVOR} \
+ devel/py-test${MODPY_FLAVOR}
+
+FLAVORS= python3
+FLAVOR?=
do-test:
- ${MODPY_BIN} ${WRKSRC}/test_six.py
+ cd ${WRKSRC} && ${MODPY_BIN} -m pytest -v
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-six/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 22 Jan 2014 18:59:58 -0000 1.2
+++ pkg/PLIST 17 Dec 2014 09:08:36 -0000
@@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.2 2014/01/22 18:59:58 bcallah Exp $
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/six-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/six-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/six-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/six-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/six-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/six.py
-lib/python${MODPY_VERSION}/site-packages/six.pyc
