Re: Update: devel/py-py 1.5.3 -> 1.8.0
OK mariani@ On Sun, Feb 24, 2019 at 2:10 AM Kurt Mosiejczuk wrote: > > The update on this one was pretty easy. While in there I made the > test use TEST_ENV and set up the test environment properly based on > what I learned from semarie while updating py-dateutil. > > The testing of the dependencies took a while. > > I tested the following that have py-py as a TEST_DEPENDS: > devel/py-six, devel/py-cheetah, devel/py-prompt-toolkit, > devel/py-cffi (no actual tests), devel/pudb, devel/py-nbconvert, > www/py-pylons, www/py-paste, www/pelican, www/py-httpie, www/py-weberror, > www/py-repoze-profile, security/py-paramiko, and shells/py-qtconsole. > Every one had the same results with the updated 1.8.0 as the original 1.5.3. > > The following two had tests that wouldn't run: > devel/py-tox and www/py-paste-script > The original was the same. > > devel/spyder takes forever, pulls in lots of dependencies, and then > complains that HOME isn't set. Although it does that for the old > version too. > > The following had py-py as BUILD_DEPENDS: > security/letsencrypt/py-acme, databases/py-psycopg2, and textproc/py-sphinx > All three built fine with the updated py-py. > > --Kurt > > Index: Makefile > === > RCS file: /cvs/ports/devel/py-py/Makefile,v > retrieving revision 1.31 > diff -u -p -r1.31 Makefile > --- Makefile28 Apr 2018 10:41:04 - 1.31 > +++ Makefile24 Feb 2019 05:01:56 - > @@ -2,7 +2,7 @@ > > COMMENT= cross-python path, ini-parsing, io, code, log > facilities > > -MODPY_EGG_VERSION =1.5.3 > +MODPY_EGG_VERSION =1.8.0 > DISTNAME= py-${MODPY_EGG_VERSION} > PKGNAME= py-${DISTNAME} > > @@ -21,7 +21,10 @@ FLAVOR?= > > TEST_DEPENDS +=devel/py-test${MODPY_FLAVOR} > > +TEST_ENV +=LC_CTYPE=C.UTF-8 > + > do-test: > - cd ${WRKSRC} && LC_CTYPE=C.UTF-8 ${MODPY_BIN} -m pytest > + cd ${WRKSRC} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \ > + ${MODPY_BIN} -m pytest > > .include > Index: distinfo > === > RCS file: /cvs/ports/devel/py-py/distinfo,v > retrieving revision 1.10 > diff -u -p -r1.10 distinfo > --- distinfo28 Apr 2018 10:41:04 - 1.10 > +++ distinfo24 Feb 2019 05:01:56 - > @@ -1,2 +1,2 @@ > -SHA256 (py-1.5.3.tar.gz) = Kcn6tJXXUo6Auh40O5WGhPSs5ocyfm94mpS/PRkV+IE= > -SIZE (py-1.5.3.tar.gz) = 202335 > +SHA256 (py-1.8.0.tar.gz) = 3GObBGpuLP9bvkAZStZZNta6NgtSs8P+HQioLdULXlM= > +SIZE (py-1.8.0.tar.gz) = 205096 > Index: pkg/PLIST > === > RCS file: /cvs/ports/devel/py-py/pkg/PLIST,v > retrieving revision 1.11 > diff -u -p -r1.11 PLIST > --- pkg/PLIST 28 Apr 2018 10:41:04 - 1.11 > +++ pkg/PLIST 24 Feb 2019 05:01:56 - > @@ -14,6 +14,7 @@ lib/python${MODPY_VERSION}/site-packages > > lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_std.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_xmlgen.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/py/_builtin.py > @@ -85,5 +86,6 @@ lib/python${MODPY_VERSION}/site-packages > > lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/${MODPY_PYCACHE}iniconfig.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/apipkg.py > lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/iniconfig.py > +lib/python${MODPY_VERSION}/site-packages/py/_version.py > lib/python${MODPY_VERSION}/site-packages/py/_xmlgen.py > lib/python${MODPY_VERSION}/site-packages/py/test.py >
Re: UPDATE: devel/py-py 1.4.31
Alexandr Shadchinwrites: > Hi, Hi, > This diff updates py-py to the latest release. > Tested on amd64. > > Comments ? OK ? ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update devel/py-py
On Wed, 2 Dec 2015 20:55:27 +0100, Daniel Jakotswrote: ping > > Index: Makefile > === > RCS file: /cvs/ports/devel/py-py/Makefile,v > retrieving revision 1.26 > diff -u -p -r1.26 Makefile > --- Makefile 29 Sep 2015 10:52:11 - 1.26 > +++ Makefile 2 Dec 2015 19:43:27 - > @@ -2,14 +2,13 @@ > > COMMENT= cross-python path, ini-parsing, io, code, > log facilities > -MODPY_EGG_VERSION = 1.4.23 > +MODPY_EGG_VERSION = 1.4.30 > DISTNAME=py-${MODPY_EGG_VERSION} > PKGNAME= py-${DISTNAME} > -REVISION = 1 > > CATEGORIES= devel > > -HOMEPAGE=http://doc.pylib.org/en/latest/ > +HOMEPAGE=https://pylib.readthedocs.org/en/latest > > MAINTAINER= Eric Faurot > > Index: distinfo > === > RCS file: /cvs/ports/devel/py-py/distinfo,v > retrieving revision 1.6 > diff -u -p -r1.6 distinfo > --- distinfo 15 Sep 2014 19:41:03 - 1.6 > +++ distinfo 2 Dec 2015 19:43:27 - > @@ -1,2 +1,2 @@ > -SHA256 (py-1.4.23.tar.gz) = > uo8qOJTK8RIXmaKyOdZ4c6Vr0N+iThZz2SmQqK5zcMo= -SIZE (py-1.4.23.tar.gz) > = 189520 +SHA256 (py-1.4.30.tar.gz) = > twPldoXtfCgLGlHElqSYTYPYne8qkwtenl2lpsoVFRQ= +SIZE (py-1.4.30.tar.gz) > = 191796 >
Re: update devel/py-py
Daniel Jakotswrites: > On Wed, 2 Dec 2015 20:55:27 +0100, Daniel Jakots > wrote: > > ping Committed, thanks. >> >> Index: Makefile >> === >> RCS file: /cvs/ports/devel/py-py/Makefile,v >> retrieving revision 1.26 >> diff -u -p -r1.26 Makefile >> --- Makefile 29 Sep 2015 10:52:11 - 1.26 >> +++ Makefile 2 Dec 2015 19:43:27 - >> @@ -2,14 +2,13 @@ >> >> COMMENT=cross-python path, ini-parsing, io, code, >> log facilities >> -MODPY_EGG_VERSION = 1.4.23 >> +MODPY_EGG_VERSION = 1.4.30 >> DISTNAME= py-${MODPY_EGG_VERSION} >> PKGNAME=py-${DISTNAME} >> -REVISION = 1 >> >> CATEGORIES= devel >> >> -HOMEPAGE= http://doc.pylib.org/en/latest/ >> +HOMEPAGE= https://pylib.readthedocs.org/en/latest >> >> MAINTAINER= Eric Faurot >> >> Index: distinfo >> === >> RCS file: /cvs/ports/devel/py-py/distinfo,v >> retrieving revision 1.6 >> diff -u -p -r1.6 distinfo >> --- distinfo 15 Sep 2014 19:41:03 - 1.6 >> +++ distinfo 2 Dec 2015 19:43:27 - >> @@ -1,2 +1,2 @@ >> -SHA256 (py-1.4.23.tar.gz) = >> uo8qOJTK8RIXmaKyOdZ4c6Vr0N+iThZz2SmQqK5zcMo= -SIZE (py-1.4.23.tar.gz) >> = 189520 +SHA256 (py-1.4.30.tar.gz) = >> twPldoXtfCgLGlHElqSYTYPYne8qkwtenl2lpsoVFRQ= +SIZE (py-1.4.30.tar.gz) >> = 191796 >> > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update devel/py-py
On 2015/12/02 20:55, Daniel Jakots wrote: > On Tue, 1 Dec 2015 22:51:21 +0100, Landry Breuil >wrote: > > > On Tue, Dec 01, 2015 at 10:17:46PM +0100, Daniel Jakots wrote: > > > Hi Eric, > > > > > > I tried to update devel/py-py. I didn't want to spend too much time > > > on it because I thought you might already have worked on it. > > > > Dont remove the ${MODPY_COMMENT} lines from PLIST as they're used for > > py3 FLAVOR. > > Ok, I'm still trying to figure out when to trust make update-plist and > when to not to :) For python ports that have a python3 flavour, use 'FLAVOR=python3 make REVISION=999 plist', reinstate MODPY_COMMENTs on the ${MODPY_PYCACHE}/ *directory* entries in plist (not file entries within that directory), and check for any other unintended changes. (Also make sure that both the normal and python3 flavours can be installed at the same time, i.e. no conflicting files). For python 2-only python ports, just 'make REVISION=999 plist' and check. (REVISION=999 is a hack to avoid getting FULLPKGNAME subst'ed in place of portname-${MODPY_EGG_VERSION} - if it has a pkg-readme file it will need special treatment but this avoids extra work with the majority of python ports). > > Also, your mailer mangles diffs, see below : > > Sorry, I'll try to be more careful > > > Index: Makefile > === > RCS file: /cvs/ports/devel/py-py/Makefile,v > retrieving revision 1.26 > diff -u -p -r1.26 Makefile > --- Makefile 29 Sep 2015 10:52:11 - 1.26 > +++ Makefile 2 Dec 2015 19:43:27 - > @@ -2,14 +2,13 @@ > > COMMENT= cross-python path, ini-parsing, io, code, log facilities > > -MODPY_EGG_VERSION = 1.4.23 > +MODPY_EGG_VERSION = 1.4.30 > DISTNAME=py-${MODPY_EGG_VERSION} > PKGNAME= py-${DISTNAME} > -REVISION = 1 > > CATEGORIES= devel > > -HOMEPAGE=http://doc.pylib.org/en/latest/ > +HOMEPAGE=https://pylib.readthedocs.org/en/latest > > MAINTAINER= Eric Faurot > > Index: distinfo > === > RCS file: /cvs/ports/devel/py-py/distinfo,v > retrieving revision 1.6 > diff -u -p -r1.6 distinfo > --- distinfo 15 Sep 2014 19:41:03 - 1.6 > +++ distinfo 2 Dec 2015 19:43:27 - > @@ -1,2 +1,2 @@ > -SHA256 (py-1.4.23.tar.gz) = uo8qOJTK8RIXmaKyOdZ4c6Vr0N+iThZz2SmQqK5zcMo= > -SIZE (py-1.4.23.tar.gz) = 189520 > +SHA256 (py-1.4.30.tar.gz) = twPldoXtfCgLGlHElqSYTYPYne8qkwtenl2lpsoVFRQ= > +SIZE (py-1.4.30.tar.gz) = 191796 > That's ok with me.
Re: update devel/py-py
On Tue, 1 Dec 2015 22:51:21 +0100, Landry Breuilwrote: > On Tue, Dec 01, 2015 at 10:17:46PM +0100, Daniel Jakots wrote: > > Hi Eric, > > > > I tried to update devel/py-py. I didn't want to spend too much time > > on it because I thought you might already have worked on it. > > Dont remove the ${MODPY_COMMENT} lines from PLIST as they're used for > py3 FLAVOR. Ok, I'm still trying to figure out when to trust make update-plist and when to not to :) > Also, your mailer mangles diffs, see below : Sorry, I'll try to be more careful Index: Makefile === RCS file: /cvs/ports/devel/py-py/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- Makefile29 Sep 2015 10:52:11 - 1.26 +++ Makefile2 Dec 2015 19:43:27 - @@ -2,14 +2,13 @@ COMMENT= cross-python path, ini-parsing, io, code, log facilities -MODPY_EGG_VERSION =1.4.23 +MODPY_EGG_VERSION =1.4.30 DISTNAME= py-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} -REVISION = 1 CATEGORIES=devel -HOMEPAGE= http://doc.pylib.org/en/latest/ +HOMEPAGE= https://pylib.readthedocs.org/en/latest MAINTAINER=Eric Faurot Index: distinfo === RCS file: /cvs/ports/devel/py-py/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo15 Sep 2014 19:41:03 - 1.6 +++ distinfo2 Dec 2015 19:43:27 - @@ -1,2 +1,2 @@ -SHA256 (py-1.4.23.tar.gz) = uo8qOJTK8RIXmaKyOdZ4c6Vr0N+iThZz2SmQqK5zcMo= -SIZE (py-1.4.23.tar.gz) = 189520 +SHA256 (py-1.4.30.tar.gz) = twPldoXtfCgLGlHElqSYTYPYne8qkwtenl2lpsoVFRQ= +SIZE (py-1.4.30.tar.gz) = 191796
Re: update devel/py-py
On Wed, 2 Dec 2015 20:15:06 +, Stuart Hendersonwrote: > > > Dont remove the ${MODPY_COMMENT} lines from PLIST as they're used > > > for py3 FLAVOR. > > > > Ok, I'm still trying to figure out when to trust make update-plist > > and when to not to :) > > For python ports that have a python3 flavour, use 'FLAVOR=python3 make > REVISION=999 plist', reinstate MODPY_COMMENTs on the ${MODPY_PYCACHE}/ > *directory* entries in plist (not file entries within that directory), > and check for any other unintended changes. (Also make sure that both > the normal and python3 flavours can be installed at the same time, > i.e. no conflicting files). > > For python 2-only python ports, just 'make REVISION=999 plist' and > check. > > (REVISION=999 is a hack to avoid getting FULLPKGNAME subst'ed in place > of portname-${MODPY_EGG_VERSION} - if it has a pkg-readme file it will > need special treatment but this avoids extra work with the majority > of python ports). Thanks for the advice!
Re: update devel/py-py
On Tue, Dec 01, 2015 at 10:17:46PM +0100, Daniel Jakots wrote: > Hi Eric, > > I tried to update devel/py-py. I didn't want to spend too much time on > it because I thought you might already have worked on it. Dont remove the ${MODPY_COMMENT} lines from PLIST as they're used for py3 FLAVOR. Also, your mailer mangles diffs, see below : > @@ -1,2 +1,2 @@ > -SHA256 (py-1.4.23.tar.gz) = > uo8qOJTK8RIXmaKyOdZ4c6Vr0N+iThZz2SmQqK5zcMo= -SIZE (py-1.4.23.tar.gz) = > 189520 +SHA256 (py-1.4.30.tar.gz) = > twPldoXtfCgLGlHElqSYTYPYne8qkwtenl2lpsoVFRQ= +SIZE (py-1.4.30.tar.gz) = > 191796 Index: pkg/PLIST Landry
Re: UPDATE: devel/py-py
On Sat, Aug 30, 2014 at 6:48 PM, Edd Barrett vex...@gmail.com wrote: On Sat, Aug 30, 2014 at 05:09:07PM +0100, Edd Barrett wrote: OK to commit the following now? Then I will regenerate the update diff. So the updated diff is now: ok Index: Makefile === RCS file: /cvs/ports/devel/py-py/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile30 Aug 2014 16:34:33 - 1.22 +++ Makefile30 Aug 2014 16:45:24 - @@ -2,8 +2,7 @@ COMMENT= cross-python path, ini-parsing, io, code, log facilities -MODPY_EGG_VERSION =1.4.15 -REVISION = 2 +MODPY_EGG_VERSION =1.4.23 DISTNAME= py-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} @@ -25,6 +24,9 @@ MODPY_SETUPTOOLS= Yes FLAVORS= python3 FLAVOR?= -NO_TEST= Yes +TEST_DEPENDS +=devel/py-test${MODPY_FLAVOR} + +do-test: + cd ${WRKBUILD} ${LOCALBASE}/bin/py.test testing .include bsd.port.mk Index: distinfo === RCS file: /cvs/ports/devel/py-py/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo18 Sep 2013 20:04:17 - 1.5 +++ distinfo30 Aug 2014 16:45:24 - @@ -1,2 +1,2 @@ -SHA256 (py-1.4.15.tar.gz) = ZWY04YRtVo7SLIcrXhWKTV7vF03VskUYbni5SgJYwEI= -SIZE (py-1.4.15.tar.gz) = 189237 +SHA256 (py-1.4.23.tar.gz) = uo8qOJTK8RIXmaKyOdZ4c6Vr0N+iThZz2SmQqK5zcMo= +SIZE (py-1.4.23.tar.gz) = 189520 Index: pkg/PLIST === RCS file: /cvs/ports/devel/py-py/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- pkg/PLIST 30 Aug 2014 16:34:33 - 1.8 +++ pkg/PLIST 30 Aug 2014 16:45:24 - @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.8 2014/08/30 16:34:33 edd Exp $ lib/python${MODPY_VERSION}/site-packages/py/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt @@ -7,77 +8,78 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/py/__init__.py -lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__metainfo.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_iniconfig.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_std.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_xmlgen.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_apipkg.py +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_builtin.py +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_code/ -lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionnew.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionold.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}assertion.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}code.${MODPY_PYC_MAGIC_TAG}pyc
Re: UPDATE: devel/py-py
On Sat, Aug 30, 2014 at 04:23:25PM +0100, Edd Barrett wrote: An update to py-1.4.23. Needed for tests of upcoming py-test update. Also turn on unit tests. I will run this for a week or so to check nothing obvious Python related breaks. You're sure you need a space after ${MODPY_COMMENT} ? Index: Makefile === RCS file: /home/edd/cvsync/ports/devel/py-py/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile 3 Jun 2014 11:34:24 - 1.21 +++ Makefile 30 Aug 2014 15:21:28 - @@ -2,8 +2,7 @@ COMMENT= cross-python path, ini-parsing, io, code, log facilities -MODPY_EGG_VERSION = 1.4.15 -REVISION = 1 +MODPY_EGG_VERSION = 1.4.23 DISTNAME=py-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} @@ -25,6 +24,9 @@ MODPY_SETUPTOOLS= Yes FLAVORS= python3 FLAVOR?= -NO_TEST= Yes +TEST_DEPENDS += devel/py-test${MODPY_FLAVOR} + +do-test: + cd ${WRKBUILD} ${LOCALBASE}/bin/py.test testing .include bsd.port.mk Index: distinfo === RCS file: /home/edd/cvsync/ports/devel/py-py/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 18 Sep 2013 20:04:17 - 1.5 +++ distinfo 30 Aug 2014 15:13:02 - @@ -1,2 +1,2 @@ -SHA256 (py-1.4.15.tar.gz) = ZWY04YRtVo7SLIcrXhWKTV7vF03VskUYbni5SgJYwEI= -SIZE (py-1.4.15.tar.gz) = 189237 +SHA256 (py-1.4.23.tar.gz) = uo8qOJTK8RIXmaKyOdZ4c6Vr0N+iThZz2SmQqK5zcMo= +SIZE (py-1.4.23.tar.gz) = 189520 Index: pkg/PLIST === RCS file: /home/edd/cvsync/ports/devel/py-py/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 18 Sep 2013 20:53:15 - 1.7 +++ pkg/PLIST 30 Aug 2014 15:13:02 - @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.7 2013/09/18 20:53:15 edd Exp $ lib/python${MODPY_VERSION}/site-packages/py/ +${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt @@ -7,77 +8,78 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/py/__init__.py -lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py -${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__metainfo.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_iniconfig.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_std.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_xmlgen.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_apipkg.py +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_builtin.py +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_code/ -lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py ${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionnew.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionold.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}assertion.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}code.${MODPY_PYC_MAGIC_TAG}pyc
Re: UPDATE: devel/py-py
On Sat, Aug 30, 2014 at 05:33:23PM +0200, Antoine Jacoutot wrote: You're sure you need a space after ${MODPY_COMMENT} ? Looking at other ports in-tree it seems we tend to omit the space. Updated diff: Index: Makefile === RCS file: /home/edd/cvsync/ports/devel/py-py/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile3 Jun 2014 11:34:24 - 1.21 +++ Makefile30 Aug 2014 15:21:28 - @@ -2,8 +2,7 @@ COMMENT= cross-python path, ini-parsing, io, code, log facilities -MODPY_EGG_VERSION =1.4.15 -REVISION = 1 +MODPY_EGG_VERSION =1.4.23 DISTNAME= py-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} @@ -25,6 +24,9 @@ MODPY_SETUPTOOLS= Yes FLAVORS= python3 FLAVOR?= -NO_TEST= Yes +TEST_DEPENDS +=devel/py-test${MODPY_FLAVOR} + +do-test: + cd ${WRKBUILD} ${LOCALBASE}/bin/py.test testing .include bsd.port.mk Index: distinfo === RCS file: /home/edd/cvsync/ports/devel/py-py/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo18 Sep 2013 20:04:17 - 1.5 +++ distinfo30 Aug 2014 15:13:02 - @@ -1,2 +1,2 @@ -SHA256 (py-1.4.15.tar.gz) = ZWY04YRtVo7SLIcrXhWKTV7vF03VskUYbni5SgJYwEI= -SIZE (py-1.4.15.tar.gz) = 189237 +SHA256 (py-1.4.23.tar.gz) = uo8qOJTK8RIXmaKyOdZ4c6Vr0N+iThZz2SmQqK5zcMo= +SIZE (py-1.4.23.tar.gz) = 189520 Index: pkg/PLIST === RCS file: /home/edd/cvsync/ports/devel/py-py/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 18 Sep 2013 20:53:15 - 1.7 +++ pkg/PLIST 30 Aug 2014 15:42:08 - @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.7 2013/09/18 20:53:15 edd Exp $ lib/python${MODPY_VERSION}/site-packages/py/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt @@ -7,77 +8,78 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/py/__init__.py -lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py -${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__metainfo.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_iniconfig.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_std.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_xmlgen.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_apipkg.py +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_builtin.py +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_code/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py -${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionnew.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionold.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}assertion.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}code.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
Re: UPDATE: devel/py-py
On Sat, Aug 30, 2014 at 05:33:23PM +0200, Antoine Jacoutot wrote: On Sat, Aug 30, 2014 at 04:23:25PM +0100, Edd Barrett wrote: An update to py-1.4.23. Needed for tests of upcoming py-test update. Also turn on unit tests. I will run this for a week or so to check nothing obvious Python related breaks. You're sure you need a space after ${MODPY_COMMENT} ? Actually you *must* remove those spaces. py3-py is borked: /usr/local/\ lib/python3.4/site-packages/ Index: Makefile === RCS file: /home/edd/cvsync/ports/devel/py-py/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile3 Jun 2014 11:34:24 - 1.21 +++ Makefile30 Aug 2014 15:21:28 - @@ -2,8 +2,7 @@ COMMENT= cross-python path, ini-parsing, io, code, log facilities -MODPY_EGG_VERSION =1.4.15 -REVISION = 1 +MODPY_EGG_VERSION =1.4.23 DISTNAME= py-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} @@ -25,6 +24,9 @@ MODPY_SETUPTOOLS= Yes FLAVORS= python3 FLAVOR?= -NO_TEST= Yes +TEST_DEPENDS +=devel/py-test${MODPY_FLAVOR} + +do-test: + cd ${WRKBUILD} ${LOCALBASE}/bin/py.test testing .include bsd.port.mk Index: distinfo === RCS file: /home/edd/cvsync/ports/devel/py-py/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo18 Sep 2013 20:04:17 - 1.5 +++ distinfo30 Aug 2014 15:13:02 - @@ -1,2 +1,2 @@ -SHA256 (py-1.4.15.tar.gz) = ZWY04YRtVo7SLIcrXhWKTV7vF03VskUYbni5SgJYwEI= -SIZE (py-1.4.15.tar.gz) = 189237 +SHA256 (py-1.4.23.tar.gz) = uo8qOJTK8RIXmaKyOdZ4c6Vr0N+iThZz2SmQqK5zcMo= +SIZE (py-1.4.23.tar.gz) = 189520 Index: pkg/PLIST === RCS file: /home/edd/cvsync/ports/devel/py-py/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 18 Sep 2013 20:53:15 - 1.7 +++ pkg/PLIST 30 Aug 2014 15:13:02 - @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.7 2013/09/18 20:53:15 edd Exp $ lib/python${MODPY_VERSION}/site-packages/py/ +${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt @@ -7,77 +8,78 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/py/__init__.py -lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py -${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__metainfo.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_iniconfig.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_std.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_xmlgen.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_apipkg.py +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_builtin.py +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_code/ -lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py ${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionnew.${MODPY_PYC_MAGIC_TAG}pyc
Re: UPDATE: devel/py-py
On Sat, Aug 30, 2014 at 04:44:46PM +0100, Edd Barrett wrote: On Sat, Aug 30, 2014 at 05:33:23PM +0200, Antoine Jacoutot wrote: You're sure you need a space after ${MODPY_COMMENT} ? Looking at other ports in-tree it seems we tend to omit the space. Yes for a good reason, see my previous mail :-) Otherwise you introduce a directory name that starts with a space. Updated diff: Index: Makefile === RCS file: /home/edd/cvsync/ports/devel/py-py/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile 3 Jun 2014 11:34:24 - 1.21 +++ Makefile 30 Aug 2014 15:21:28 - @@ -2,8 +2,7 @@ COMMENT= cross-python path, ini-parsing, io, code, log facilities -MODPY_EGG_VERSION = 1.4.15 -REVISION = 1 +MODPY_EGG_VERSION = 1.4.23 DISTNAME=py-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} @@ -25,6 +24,9 @@ MODPY_SETUPTOOLS= Yes FLAVORS= python3 FLAVOR?= -NO_TEST= Yes +TEST_DEPENDS += devel/py-test${MODPY_FLAVOR} + +do-test: + cd ${WRKBUILD} ${LOCALBASE}/bin/py.test testing .include bsd.port.mk Index: distinfo === RCS file: /home/edd/cvsync/ports/devel/py-py/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 18 Sep 2013 20:04:17 - 1.5 +++ distinfo 30 Aug 2014 15:13:02 - @@ -1,2 +1,2 @@ -SHA256 (py-1.4.15.tar.gz) = ZWY04YRtVo7SLIcrXhWKTV7vF03VskUYbni5SgJYwEI= -SIZE (py-1.4.15.tar.gz) = 189237 +SHA256 (py-1.4.23.tar.gz) = uo8qOJTK8RIXmaKyOdZ4c6Vr0N+iThZz2SmQqK5zcMo= +SIZE (py-1.4.23.tar.gz) = 189520 Index: pkg/PLIST === RCS file: /home/edd/cvsync/ports/devel/py-py/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 18 Sep 2013 20:53:15 - 1.7 +++ pkg/PLIST 30 Aug 2014 15:42:08 - @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.7 2013/09/18 20:53:15 edd Exp $ lib/python${MODPY_VERSION}/site-packages/py/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt @@ -7,77 +8,78 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/py/__init__.py -lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py -${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__metainfo.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_iniconfig.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_std.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_xmlgen.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_apipkg.py +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_builtin.py +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_code/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py -${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionnew.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionold.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}assertion.${MODPY_PYC_MAGIC_TAG}pyc
Re: UPDATE: devel/py-py
On Sat, Aug 30, 2014 at 05:45:24PM +0200, Antoine Jacoutot wrote: Actually you *must* remove those spaces. py3-py is borked: /usr/local/\ lib/python3.4/site-packages/ Doh! Let's start with fixing what we already have in tree. OK to commit the following now? Then I will regenerate the update diff. Index: Makefile === RCS file: /home/edd/cvsync/ports/devel/py-py/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile3 Jun 2014 11:34:24 - 1.21 +++ Makefile30 Aug 2014 16:04:37 - @@ -3,7 +3,7 @@ COMMENT= cross-python path, ini-parsing, io, code, log facilities MODPY_EGG_VERSION =1.4.15 -REVISION = 1 +REVISION = 2 DISTNAME= py-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} Index: pkg/PLIST === RCS file: /home/edd/cvsync/ports/devel/py-py/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 18 Sep 2013 20:53:15 - 1.7 +++ pkg/PLIST 30 Aug 2014 16:04:29 - @@ -8,7 +8,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/py/__init__.py lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py -${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__metainfo.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc @@ -22,7 +22,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/py/_builtin.py lib/python${MODPY_VERSION}/site-packages/py/_code/ lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py -${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionnew.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionold.${MODPY_PYC_MAGIC_TAG}pyc @@ -38,7 +38,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/py/_iniconfig.py lib/python${MODPY_VERSION}/site-packages/py/_io/ lib/python${MODPY_VERSION}/site-packages/py/_io/__init__.py -${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}capture.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}saferepr.${MODPY_PYC_MAGIC_TAG}pyc @@ -48,7 +48,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/py/_io/terminalwriter.py lib/python${MODPY_VERSION}/site-packages/py/_log/ lib/python${MODPY_VERSION}/site-packages/py/_log/__init__.py -${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}warning.${MODPY_PYC_MAGIC_TAG}pyc @@ -56,7 +56,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/py/_log/warning.py lib/python${MODPY_VERSION}/site-packages/py/_path/ lib/python${MODPY_VERSION}/site-packages/py/_path/__init__.py -${MODPY_COMMENT} lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}cacheutil.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc @@ -70,7 +70,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/py/_path/svnwc.py lib/python${MODPY_VERSION}/site-packages/py/_process/ lib/python${MODPY_VERSION}/site-packages/py/_process/__init__.py -${MODPY_COMMENT}
Re: UPDATE: devel/py-py
On Sat, Aug 30, 2014 at 05:09:07PM +0100, Edd Barrett wrote: OK to commit the following now? Then I will regenerate the update diff. So the updated diff is now: Index: Makefile === RCS file: /cvs/ports/devel/py-py/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile30 Aug 2014 16:34:33 - 1.22 +++ Makefile30 Aug 2014 16:45:24 - @@ -2,8 +2,7 @@ COMMENT= cross-python path, ini-parsing, io, code, log facilities -MODPY_EGG_VERSION =1.4.15 -REVISION = 2 +MODPY_EGG_VERSION =1.4.23 DISTNAME= py-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} @@ -25,6 +24,9 @@ MODPY_SETUPTOOLS= Yes FLAVORS= python3 FLAVOR?= -NO_TEST= Yes +TEST_DEPENDS +=devel/py-test${MODPY_FLAVOR} + +do-test: + cd ${WRKBUILD} ${LOCALBASE}/bin/py.test testing .include bsd.port.mk Index: distinfo === RCS file: /cvs/ports/devel/py-py/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo18 Sep 2013 20:04:17 - 1.5 +++ distinfo30 Aug 2014 16:45:24 - @@ -1,2 +1,2 @@ -SHA256 (py-1.4.15.tar.gz) = ZWY04YRtVo7SLIcrXhWKTV7vF03VskUYbni5SgJYwEI= -SIZE (py-1.4.15.tar.gz) = 189237 +SHA256 (py-1.4.23.tar.gz) = uo8qOJTK8RIXmaKyOdZ4c6Vr0N+iThZz2SmQqK5zcMo= +SIZE (py-1.4.23.tar.gz) = 189520 Index: pkg/PLIST === RCS file: /cvs/ports/devel/py-py/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- pkg/PLIST 30 Aug 2014 16:34:33 - 1.8 +++ pkg/PLIST 30 Aug 2014 16:45:24 - @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.8 2014/08/30 16:34:33 edd Exp $ lib/python${MODPY_VERSION}/site-packages/py/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt @@ -7,77 +8,78 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/py/__init__.py -lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__metainfo.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_iniconfig.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_std.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_xmlgen.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_apipkg.py +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_builtin.py +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_code/ -lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionnew.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionold.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}assertion.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}code.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/py/_code/_assertionnew.py