CVS commit: pkgsrc/net/py-magic-wormhole

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Apr  8 13:37:47 UTC 2025

Modified Files:
        pkgsrc/net/py-magic-wormhole: Makefile

Log Message:
net/py-magic-wormhole: Also needs py-qrcode and py-test.

Resolves:

ImportError while importing test module '/home/riastradh/pkgsrc/current/work/net/py-magic-wormhole/work/magic-wormhole-0.18.0/src/wormhole/test/test_cli.py'.
Hint: make sure your test modules/packages have valid Python names.
Traceback:
../../../../../pkg/lib/python3.12/importlib/__init__.py:90: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
src/wormhole/test/test_cli.py:25: in <module>
    from ..cli import cli, cmd_receive, cmd_send, welcome
src/wormhole/cli/cmd_send.py:9: in <module>
    from qrcode import QRCode
E   ModuleNotFoundError: No module named 'qrcode'

(py-test may have been implicitly imported by some transitive
dependency but let's make it explicit in case we ever hide implicit
transitive dependencies in Python.)

PR pkg/59258: net/py-magic-wormhole: borken between 0.13 and 0.15


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/py-magic-wormhole/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/py-magic-wormhole/Makefile
diff -u pkgsrc/net/py-magic-wormhole/Makefile:1.13 pkgsrc/net/py-magic-wormhole/Makefile:1.14
--- pkgsrc/net/py-magic-wormhole/Makefile:1.13  Mon Apr  7 19:47:23 2025
+++ pkgsrc/net/py-magic-wormhole/Makefile       Tue Apr  8 13:37:47 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2025/04/07 19:47:23 gdt Exp $
+# $NetBSD: Makefile,v 1.14 2025/04/08 13:37:47 riastradh Exp $
 
 DISTNAME=      magic-wormhole-0.18.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/magic-wormhole/}
 
@@ -27,8 +27,7 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-versioneer
 # setup.py install_requires
 DEPENDS+=      ${PYPKGPREFIX}-spake2>=0.9:../../security/py-spake2
 DEPENDS+=      ${PYPKGPREFIX}-nacl-[0-9]*:../../security/py-nacl
-DEPENDS+=      ${PYPKGPREFIX}-iterable-io>=1.0.0:../../devel/py-iterable-io
-DEPENDS+=      ${PYPKGPREFIX}-attrs>=16.3.0:../../devel/py-attrs
+DEPENDS+=      ${PYPKGPREFIX}-attrs>=19.2.0:../../devel/py-attrs
 DEPENDS+=      ${PYPKGPREFIX}-twisted>=17.5.0:../../net/py-twisted
 DEPENDS+=      ${PYPKGPREFIX}-autobahn>=0.14.1:../../www/py-autobahn
 DEPENDS+=      ${PYPKGPREFIX}-automat-[0-9]*:../../devel/py-automat
@@ -38,12 +37,17 @@ DEPENDS+=   ${PYPKGPREFIX}-click-[0-9]*:..
 DEPENDS+=      ${PYPKGPREFIX}-humanize-[0-9]*:../../textproc/py-humanize
 DEPENDS+=      ${PYPKGPREFIX}-txtorcon>=18.0.2:../../net/py-txtorcon
 DEPENDS+=      ${PYPKGPREFIX}-zipstream-ng>=1.7.1:../../archivers/py-zipstream-ng
+DEPENDS+=      ${PYPKGPREFIX}-iterable-io>=1.0.0:../../devel/py-iterable-io
+DEPENDS+=      ${PYPKGPREFIX}-qrcode>=8.0:../../graphics/py-qrcode
 
 # setup.py install_requires dev
 TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
 TEST_DEPENDS+= ${PYPKGPREFIX}-flakes>=1.2.3:../../devel/py-flakes
-TEST_DEPENDS+= ${PYPKGPREFIX}-magic-wormhole-transit-relay-[0-9]*:../../net/py-magic-wormhole-transit-relay
-TEST_DEPENDS+= ${PYPKGPREFIX}-magic-wormhole-mailbox-server-[0-9]*:../../net/py-magic-wormhole-mailbox-server
+TEST_DEPENDS+= ${PYPKGPREFIX}-magic-wormhole-mailbox-server>=0.3.1:../../net/py-magic-wormhole-mailbox-server # XXX setup.py says ==0.3.1 but 0.4.0 seems OK
+TEST_DEPENDS+= ${PYPKGPREFIX}-magic-wormhole-transit-relay>=0.3.1:../../net/py-magic-wormhole-transit-relay # XXX setup.py says ==0.3.1 but 0.4.0 seems OK
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+# XXX pytest_twisted?  (Either I already have it by accident or it's
+# not needed.)
 
 USE_LANGUAGES= # none