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
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
lib/python${MODPY_VERSION}/site-packages/nbxmpp/dispatcher.py
lib/python${MODPY_VERSION}/site-packages/nbxmpp/errors.py
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/client.py
lib/python${MODPY_VERSION}/site-packages/nbxmpp/exceptions.py
lib/python${MODPY_VERSION}/site-packages/nbxmpp/idlequeue.py
lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/
@@ -178,10 +185,13 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/protoc
lib/python${MODPY_VERSION}/site-packages/nbxmpp/namespaces.py
lib/python${MODPY_VERSION}/site-packages/nbxmpp/old_dispatcher.py
lib/python${MODPY_VERSION}/site-packages/nbxmpp/plugin.py
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/precis.py
lib/python${MODPY_VERSION}/site-packages/nbxmpp/protocol.py
lib/python${MODPY_VERSION}/site-packages/nbxmpp/py.typed
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/sasl.py
lib/python${MODPY_VERSION}/site-packages/nbxmpp/simplexml.py
lib/python${MODPY_VERSION}/site-packages/nbxmpp/smacks.py
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/stringprep.py
lib/python${MODPY_VERSION}/site-packages/nbxmpp/structs.py
lib/python${MODPY_VERSION}/site-packages/nbxmpp/task.py
lib/python${MODPY_VERSION}/site-packages/nbxmpp/tcp.py
blob - /dev/null
blob + 639ad884418b990c680a4cf276b8bc423cd49614 (mode 644)
--- /dev/null
+++ net/py-nbxmpp/patches/patch-setup_cfg
@@ -0,0 +1,13 @@
+Avoid unittest loading the nbxmpp/examples folder
+
+Index: setup.cfg
+--- setup.cfg.orig
++++ setup.cfg
+@@ -15,6 +15,7 @@ classifiers =
+
+ [options]
+ python_requires = >=3.9
++test_suite = test
+ packages = find:
+ install_requires =
+ precis-i18n>=1.0.0
--
Paco Esteban.
0x5818130B8A6DBC03
No comments:
Post a Comment