Re: maintainer update net/py-nbxmpp --> 3.2.4

[Stuart Henderson]

On 2022/10/19 11:22, Paco Esteban wrote:
> By telling setup.py explicitly where the test suite is we avoid this.

No need to patch, just set MODPY_PYTEST_ARGS=test. OK with that.
(I would also do MODPY_PYBUILD=setuptools and regen PLIST)

Re: maintainer update net/py-nbxmpp --> 3.2.4

[Paco Esteban]

On Tue, 18 Oct 2022, Paco Esteban wrote:

> Hi ports@,
> 
> This is an update for net/py-nbxmpp to its latest version.  It's needed
> for an update on net/gajim sent on a separate thread.
> 
> Here's the changelog: 
> https://dev.gajim.org/gajim/python-nbxmpp/-/blob/master/ChangeLog
> 
> On the port itself, I had to force the do-test target to use pytest, is
> the only way I found to make tests pass.  Let me know if there's
> a better way to do this.

sthen@ pointed me in the right direction.
The problem was that unittest was loading all the modules on the source
folder.  Upstream recently made the examples folder a module by adding
__init__.py, which tried to launch an app invoking Gtk.

By telling setup.py explicitly where the test suite is we avoid this.

New diff at the end.

> All tests pass and works for me on amd64.
> Ok to commit ?

diff refs/heads/master refs/heads/gajim-1.5.2
commit - 01fc26361d27dfcf739435434eaf1042d824c95b
commit + 6596f6b0a016d92ff5f3efe29b1299a32ffb1673
blob - c0b5b8d540727ef07a0c1cca4b577ea77b7f64c2
blob + 15c266ba186d9f036201f83abb325c9c0e69f911
--- net/py-nbxmpp/Makefile
+++ net/py-nbxmpp/Makefile
@@ -1,6 +1,6 @@
 COMMENT =  Python XMPP and Jabber implementation
 
-MODPY_EGG_VERSION =3.1.1
+MODPY_EGG_VERSION =3.2.4
 DISTNAME = nbxmpp-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   net devel
@@ -16,12 +16,13 @@ MODPY_PYTEST =  Yes 
 
 MODULES =  lang/python
 MODPY_SETUPTOOLS = Yes
-MODPY_PYTEST = Yes 
+MODPY_PYTEST = Yes
 
-RUN_DEPENDS=   devel/glib2>=2.6.0 \
+RUN_DEPENDS =  devel/glib2>=2.6.0 \
devel/libsoup \
devel/py-gobject3${MODPY_FLAVOR} \
net/py-idna${MODPY_FLAVOR} \
+   sysutils/py-packaging${MODPY_FLAVOR} \
textproc/py-precis_i18n${MODPY_FLAVOR}
 
 FLAVORS =  python3
blob - f41414382d59afb121a3f66a47c6b8186b28a5d7
blob + d7ad69572af4ab366b3c8905877c70805d0972a3
--- net/py-nbxmpp/distinfo
+++ net/py-nbxmpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nbxmpp-3.1.1.tar.gz) = BLMqR592FdFjpJHMEcYLTBT9dFKB1GVWTMcQB87WyDk=
-SIZE (nbxmpp-3.1.1.tar.gz) = 158035
+SHA256 (nbxmpp-3.2.4.tar.gz) = dN7/T8IGAyVVcffgtM1oFX5E4edpNB5j0y3YRqKRphU=
+SIZE (nbxmpp-3.2.4.tar.gz) = 161470
blob - 107d2a579b45dba7aeeb89f396474a5f16bab4f4
blob + 1082fe0858176ab0c63a68efa971611e60c17169
--- net/py-nbxmpp/pkg/PLIST
+++ net/py-nbxmpp/pkg/PLIST
@@ -10,7 +10,6 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODP
 
${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}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.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
@@ -22,9 +21,12 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODP
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}namespaces.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}old_dispatcher.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}precis.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}protocol.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}sasl.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}simplexml.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}smacks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}stringprep.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}structs.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}task.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}tcp.${MODPY_PYC_MAGIC_TAG}pyc
@@ -32,13 +34,18 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/auth.p
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/addresses.py
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/auth.py
 

maintainer update net/py-nbxmpp --> 3.2.4

[Paco Esteban]

Hi ports@,

This is an update for net/py-nbxmpp to its latest version.  It's needed
for an update on net/gajim sent on a separate thread.

Here's the changelog: 
https://dev.gajim.org/gajim/python-nbxmpp/-/blob/master/ChangeLog

On the port itself, I had to force the do-test target to use pytest, is
the only way I found to make tests pass.  Let me know if there's
a better way to do this.

All tests pass and works for me on amd64.
Ok to commit ?

diff refs/heads/master refs/heads/gajim-1.5.2
commit - 01fc26361d27dfcf739435434eaf1042d824c95b
commit + be8671867727f508358d7cc98edee9267905c930
blob - c0b5b8d540727ef07a0c1cca4b577ea77b7f64c2
blob + 9a3bb0c33ddf4dfb673c472f638cffe5db26bcc4
--- net/py-nbxmpp/Makefile
+++ net/py-nbxmpp/Makefile
@@ -1,6 +1,6 @@
 COMMENT =  Python XMPP and Jabber implementation
 
-MODPY_EGG_VERSION =3.1.1
+MODPY_EGG_VERSION =3.2.4
 DISTNAME = nbxmpp-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   net devel
@@ -18,13 +18,20 @@ RUN_DEPENDS=devel/glib2>=2.6.0 \
 MODPY_SETUPTOOLS = Yes
 MODPY_PYTEST = Yes 
 
-RUN_DEPENDS=   devel/glib2>=2.6.0 \
+RUN_DEPENDS =  devel/glib2>=2.6.0 \
devel/libsoup \
devel/py-gobject3${MODPY_FLAVOR} \
net/py-idna${MODPY_FLAVOR} \
+   sysutils/py-packaging${MODPY_FLAVOR} \
textproc/py-precis_i18n${MODPY_FLAVOR}
 
+TEST_DEPENDS = ${RUN_DEPENDS} \
+   devel/py-test${MODPY_FLAVOR}
+
 FLAVORS =  python3
 FLAVOR =   python3
 
+do-test:
+   cd ${MODPY_TEST_DIR} && ${SETENV} ${ALL_TEST_ENV} py.test test
+
 .include 
blob - f41414382d59afb121a3f66a47c6b8186b28a5d7
blob + d7ad69572af4ab366b3c8905877c70805d0972a3
--- net/py-nbxmpp/distinfo
+++ net/py-nbxmpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nbxmpp-3.1.1.tar.gz) = BLMqR592FdFjpJHMEcYLTBT9dFKB1GVWTMcQB87WyDk=
-SIZE (nbxmpp-3.1.1.tar.gz) = 158035
+SHA256 (nbxmpp-3.2.4.tar.gz) = dN7/T8IGAyVVcffgtM1oFX5E4edpNB5j0y3YRqKRphU=
+SIZE (nbxmpp-3.2.4.tar.gz) = 161470
blob - 107d2a579b45dba7aeeb89f396474a5f16bab4f4
blob + 1082fe0858176ab0c63a68efa971611e60c17169
--- net/py-nbxmpp/pkg/PLIST
+++ net/py-nbxmpp/pkg/PLIST
@@ -10,7 +10,6 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODP
 
${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}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.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
@@ -22,9 +21,12 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODP
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}namespaces.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}old_dispatcher.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}precis.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}protocol.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}sasl.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}simplexml.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}smacks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}stringprep.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}structs.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}task.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}tcp.${MODPY_PYC_MAGIC_TAG}pyc
@@ -32,13 +34,18 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/auth.p
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/addresses.py
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/auth.py
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/c14n.py
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/client.py
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/connection.py
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/const.py