Re: update net/py-nbxmpp to 1.0.0
On Tue, 11 Aug 2020 09:08:32 +0200 Solene Rapenne wrote: > On Mon, 6 Jul 2020 20:52:11 +0200 > 3un0s <3u...@dismail.de>: > > > On Mon, 6 Jul 2020 11:38:42 -0400 > > Kurt Mosiejczuk wrote: > > > > > On Mon, Jul 06, 2020 at 05:30:43PM +0200, 3un0s wrote: > > > > On Mon, 6 Jul 2020 15:32:05 +0100 > > > > Stuart Henderson wrote: > > > > > > > > I guess it does not work with the existing gajim version? So > > > > > committing must be done together. > > > > > > > I should write a new mail with both of those diffs together and > > > > subject representing that two packages are updated then? > > > > > > Separate is fine, but make a note in each about the dependency. > > > "X requires newer version of Y I sent earlier." > > > "Newer Y won't work with current version of X, this is intended > > > for the update I'm about to send." > > > > > > --Kurt > > > > > > > This update breaks current version of gajim and requires an updated > > one I've sent earlier. > > > > Also new diff with @pkgpath in pkg/PLIST > > ok solene@ but the MODPY_SETUPTOOLS value should be > aligned with the others values. > Excuse me but what exactly should I do with the MODPY_SETUPTOOLS value? Move the whole thing somewhere else or just add another tab before the value itself?
Re: update net/py-nbxmpp to 1.0.0
On Mon, 6 Jul 2020 20:52:11 +0200 3un0s <3u...@dismail.de>: > On Mon, 6 Jul 2020 11:38:42 -0400 > Kurt Mosiejczuk wrote: > > > On Mon, Jul 06, 2020 at 05:30:43PM +0200, 3un0s wrote: > > > On Mon, 6 Jul 2020 15:32:05 +0100 > > > Stuart Henderson wrote: > > > > > > I guess it does not work with the existing gajim version? So > > > > committing must be done together. > > > > > I should write a new mail with both of those diffs together and > > > subject representing that two packages are updated then? > > > > Separate is fine, but make a note in each about the dependency. > > "X requires newer version of Y I sent earlier." > > "Newer Y won't work with current version of X, this is intended for > > the update I'm about to send." > > > > --Kurt > > > > This update breaks current version of gajim and requires an updated > one I've sent earlier. > > Also new diff with @pkgpath in pkg/PLIST ok solene@ but the MODPY_SETUPTOOLS value should be aligned with the others values.
Re: update net/py-nbxmpp to 1.0.0
On Mon, 6 Jul 2020 11:38:42 -0400 Kurt Mosiejczuk wrote: > On Mon, Jul 06, 2020 at 05:30:43PM +0200, 3un0s wrote: > > On Mon, 6 Jul 2020 15:32:05 +0100 > > Stuart Henderson wrote: > > > > I guess it does not work with the existing gajim version? So > > > committing must be done together. > > > I should write a new mail with both of those diffs together and > > subject representing that two packages are updated then? > > Separate is fine, but make a note in each about the dependency. > "X requires newer version of Y I sent earlier." > "Newer Y won't work with current version of X, this is intended for > the update I'm about to send." > > --Kurt > This update breaks current version of gajim and requires an updated one I've sent earlier. Also new diff with @pkgpath in pkg/PLIST Index: Makefile === RCS file: /cvs/ports/net/py-nbxmpp/Makefile,v retrieving revision 1.8 diff -u -p -u -r1.8 Makefile --- Makefile 3 Jul 2020 21:13:01 - 1.8 +++ Makefile 6 Jul 2020 18:40:38 - @@ -2,11 +2,10 @@ COMMENT = Python XMPP and Jabber implementation -MODPY_EGG_VERSION = 0.6.10 +MODPY_EGG_VERSION = 1.0.0 DISTNAME = nbxmpp-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} CATEGORIES = net devel -REVISION = 0 HOMEPAGE = https://python-nbxmpp.gajim.org/ @@ -18,9 +17,10 @@ PERMIT_PACKAGE = Yes MASTER_SITES = ${MASTER_SITE_PYPI:=n/nbxmpp/} MODULES = lang/python +MODPY_SETUPTOOLS = Yes NO_TEST = Yes FLAVORS = python3 -FLAVOR ?= +FLAVOR = python3 .include Index: distinfo === RCS file: /cvs/ports/net/py-nbxmpp/distinfo,v retrieving revision 1.6 diff -u -p -u -r1.6 distinfo --- distinfo 16 Jun 2019 06:00:57 - 1.6 +++ distinfo 6 Jul 2020 18:40:43 - @@ -1,2 +1,2 @@ -SHA256 (nbxmpp-0.6.10.tar.gz) = zXNBd3fkhH/djQ2Wx8r8YGlS7b0rnVKipyuyqqBNCO8= -SIZE (nbxmpp-0.6.10.tar.gz) = 1516456 +SHA256 (nbxmpp-1.0.0.tar.gz) = i36We8HQ8aH3zzOVtvXXAAmuVgetmvuN4y/5K2YWk60= +SIZE (nbxmpp-1.0.0.tar.gz) = 126523 Index: pkg/PLIST === RCS file: /cvs/ports/net/py-nbxmpp/pkg/PLIST,v retrieving revision 1.4 diff -u -p -u -r1.4 PLIST --- pkg/PLIST 30 Jan 2019 17:05:36 - 1.4 +++ pkg/PLIST 6 Jul 2020 18:40:52 - @@ -1,38 +1,152 @@ @comment $OpenBSD: PLIST,v 1.4 2019/01/30 17:05:36 feinerer Exp $ +@pkgpath net/py-nbxmpp lib/python${MODPY_VERSION}/site-packages/nbxmpp/ -lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/nbxmpp/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}auth_nb.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}bosh.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}addresses.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}c14n.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}client_nb.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}dispatcher_nb.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}features_nb.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}const.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}dispatcher.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}idlequeue.${MODPY_PYC_MAGIC_TAG}pyc
Re: update net/py-nbxmpp to 1.0.0
On Mon, 6 Jul 2020 15:32:05 +0100 Stuart Henderson wrote: > I guess it does not work with the existing gajim version? So > committing must be done together. I should write a new mail with both of those diffs together and subject representing that two packages are updated then?
Re: update net/py-nbxmpp to 1.0.0
On Mon, Jul 06, 2020 at 05:30:43PM +0200, 3un0s wrote: > On Mon, 6 Jul 2020 15:32:05 +0100 > Stuart Henderson wrote: > > I guess it does not work with the existing gajim version? So > > committing must be done together. > I should write a new mail with both of those diffs together and subject > representing that two packages are updated then? Separate is fine, but make a note in each about the dependency. "X requires newer version of Y I sent earlier." "Newer Y won't work with current version of X, this is intended for the update I'm about to send." --Kurt
Re: update net/py-nbxmpp to 1.0.0
On 2020/07/06 16:16, 3un0s wrote: > Hi, > > As stated in my previous message I'm trying to get gajim 1.2 to work, > and to do that py-nbxmpp had to be updated. > I've actually tested it already with gajim 1.2 on amd64 and it works. > > Comments or OK ? I guess it does not work with the existing gajim version? So committing must be done together. > Index: Makefile > === > RCS file: /cvs/ports/net/py-nbxmpp/Makefile,v > retrieving revision 1.8 > diff -u -p -u -r1.8 Makefile > --- Makefile 3 Jul 2020 21:13:01 - 1.8 > +++ Makefile 6 Jul 2020 14:03:17 - > @@ -2,11 +2,10 @@ > > COMMENT =Python XMPP and Jabber implementation > > -MODPY_EGG_VERSION = 0.6.10 > +MODPY_EGG_VERSION = 1.0.0 > DISTNAME = nbxmpp-${MODPY_EGG_VERSION} > PKGNAME =py-${DISTNAME} > CATEGORIES = net devel > -REVISION = 0 > > HOMEPAGE = https://python-nbxmpp.gajim.org/ > > @@ -18,9 +17,10 @@ PERMIT_PACKAGE = Yes > MASTER_SITES = ${MASTER_SITE_PYPI:=n/nbxmpp/} > > MODULES =lang/python > +MODPY_SETUPTOOLS=Yes > NO_TEST =Yes > > FLAVORS =python3 > -FLAVOR ?= > +FLAVOR = python3 > > .include > Index: distinfo > === > RCS file: /cvs/ports/net/py-nbxmpp/distinfo,v > retrieving revision 1.6 > diff -u -p -u -r1.6 distinfo > --- distinfo 16 Jun 2019 06:00:57 - 1.6 > +++ distinfo 6 Jul 2020 14:03:56 - > @@ -1,2 +1,2 @@ > -SHA256 (nbxmpp-0.6.10.tar.gz) = zXNBd3fkhH/djQ2Wx8r8YGlS7b0rnVKipyuyqqBNCO8= > -SIZE (nbxmpp-0.6.10.tar.gz) = 1516456 > +SHA256 (nbxmpp-1.0.0.tar.gz) = i36We8HQ8aH3zzOVtvXXAAmuVgetmvuN4y/5K2YWk60= > +SIZE (nbxmpp-1.0.0.tar.gz) = 126523 > Index: pkg/PLIST > === > RCS file: /cvs/ports/net/py-nbxmpp/pkg/PLIST,v > retrieving revision 1.4 > diff -u -p -u -r1.4 PLIST > --- pkg/PLIST 30 Jan 2019 17:05:36 - 1.4 > +++ pkg/PLIST 6 Jul 2020 14:04:32 - > @@ -1,38 +1,151 @@ > @comment $OpenBSD: PLIST,v 1.4 2019/01/30 17:05:36 feinerer Exp $ Because this moves from py2+3 to 3-only, to have updates work seamlessly you need @pkgpath net/py-nbxmpp > lib/python${MODPY_VERSION}/site-packages/nbxmpp/ > -lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info > +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ > +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO > +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt > +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt > +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt > +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt > lib/python${MODPY_VERSION}/site-packages/nbxmpp/__init__.py > > ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}/ > > lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}auth_nb.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}bosh.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}addresses.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}c14n.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}client_nb.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}dispatcher_nb.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}features_nb.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}const.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}dispatcher.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}idlequeue.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}namespaces.${MODPY_PYC_MAGIC_TAG}pyc >