diff options
| author | root <root@alpha.trunkmasters.com> | 2026-06-12 19:09:37 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-06-12 19:09:37 -0500 |
| commit | b590c8d7572b727d565cc0b8ff660d43569845de (patch) | |
| tree | 06f7a4102ea4e845df8b66660f252920d52952f9 /dev-python/autobahn | |
| parent | 24f9cbfc4c34fdb6a6e03311674414e881ceab47 (diff) | |
| download | baldeagleos-repo-b590c8d7572b727d565cc0b8ff660d43569845de.tar.gz baldeagleos-repo-b590c8d7572b727d565cc0b8ff660d43569845de.tar.xz baldeagleos-repo-b590c8d7572b727d565cc0b8ff660d43569845de.zip | |
Adding metadata
Diffstat (limited to 'dev-python/autobahn')
| -rw-r--r-- | dev-python/autobahn/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/autobahn/autobahn-24.4.2.ebuild | 123 | ||||
| -rw-r--r-- | dev-python/autobahn/autobahn-25.10.2.ebuild | 125 | ||||
| -rw-r--r-- | dev-python/autobahn/autobahn-25.11.1.ebuild | 128 | ||||
| -rw-r--r-- | dev-python/autobahn/files/autobahn-24.4.2-pytest-asyncio-1.patch | 298 | ||||
| -rw-r--r-- | dev-python/autobahn/metadata.xml | 12 |
6 files changed, 689 insertions, 0 deletions
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest new file mode 100644 index 000000000000..6b323e4e5b44 --- /dev/null +++ b/dev-python/autobahn/Manifest @@ -0,0 +1,3 @@ +DIST autobahn-24.4.2.tar.gz 482700 BLAKE2B e94026e0cfbb3a3ba2a494ac50e851ed1c35a842dd6b5ce2ac437a19fa0d30061d16b0965831ce57067d6682df256e5140d67e0e9b4d71cc1dbcc16287ffbed1 SHA512 2caffa9a49e3661e665a4e2641b96ff48581264654cb35ebc2e8a67620ce81bd330895bb12a098488676ab74c8275e601f45357840ca074c3c6a3d7247e563e9 +DIST autobahn-25.10.2.tar.gz 375689 BLAKE2B 6017b902a776d1f912facc488b0186cd53029c2e223920b92e06bb011d56b42279d2225af73ae561b6c21fc9b9509231761753a42146529baa19d30a03932bc1 SHA512 134a484c16392fe58b0acfae247cd783a1278c0b818c110b68e20428bffcc804dc99d449b1567fed976cf69823ce9269243e2cd968357ae9a23689ad0d7032b7 +DIST autobahn-25.11.1.tar.gz 447019 BLAKE2B 05c8e7c5d3dc4de5db032030815af43531243f5c8b345474669a5ce9064f61ad44f3703a33df3600070952a786193bba748c6c372e0e86d9aea4ce4a425881d1 SHA512 8960a76558e51900cffda20c97c070a7bd26d0dc3c9d21f6db03ca152d526e52a4070b25fad313f1c5aeda5fb398af2447a2913cd842fede4d591111bb8cef60 diff --git a/dev-python/autobahn/autobahn-24.4.2.ebuild b/dev-python/autobahn/autobahn-24.4.2.ebuild new file mode 100644 index 000000000000..d89eb296ef4d --- /dev/null +++ b/dev-python/autobahn/autobahn-24.4.2.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{13..14} ) + +inherit distutils-r1 optfeature pypi + +DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio" +HOMEPAGE=" + https://github.com/crossbario/autobahn-python/ + https://pypi.org/project/autobahn/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86" +IUSE="test xbr" +RESTRICT="!test? ( test )" + +# The order of deps is based on their appearance in setup.py +# All extra deps should be included in test and in optfeature +RDEPEND=" + >=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}] + >=dev-python/twisted-24.3.0[${PYTHON_USEDEP}] + >=dev-python/attrs-20.3.0[${PYTHON_USEDEP}] + >=dev-python/txaio-21.2.1[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + >=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + ${RDEPEND} + >=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}] + >=dev-python/python-snappy-0.6.0[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}] + >=dev-python/ujson-4.0.2[${PYTHON_USEDEP}] + >=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}] + >=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}] + >=dev-python/flatbuffers-22.12.06[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}] + >=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}] + >=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}] + >=dev-python/pytrie-0.4[${PYTHON_USEDEP}] + >=dev-python/cffi-1.14.5[${PYTHON_USEDEP}] + >=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}] + >=dev-python/passlib-1.7.4[${PYTHON_USEDEP}] + + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-aiohttp[${PYTHON_USEDEP}] + ) +" + +python_prepare_all() { + local PATCHES=( + # https://github.com/crossbario/autobahn-python/pull/1661 + "${FILESDIR}/${P}-pytest-asyncio-1.patch" + ) + + if use xbr ; then + eerror "***************" + eerror "Required xbr dependencies are incomplete in Gentoo." + eerror "So this functionality will not yet work" + eerror "Please file a bug if this feature is needed" + eerror "***************" + else + # remove xbr components + export AUTOBAHN_STRIP_XBR="True" + fi + + distutils-r1_python_prepare_all + + # avoid useless rust dependency + sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die + + # remove twisted plugin cache regen in setup.py + # to fix tinderbox sandbox issue + sed -e '/import/s:reactor:__importmustfail__:' \ + -i setup.py || die +} + +python_test() { + rm -rf autobahn || die + + einfo "Testing all, cryptosign using twisted" + local -x USE_TWISTED=true + "${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}" + unset USE_TWISTED + + einfo "RE-testing cryptosign and component_aio using asyncio" + local EPYTEST_PLUGINS=( pytest-asyncio ) + local -x USE_ASYNCIO=true + epytest --pyargs \ + autobahn.asyncio.test.test_aio_{raw,web}socket \ + autobahn.wamp.test.test_wamp_{cryptosign,component_aio} + unset USE_ASYNCIO + + rm -f twisted/plugins/dropin.cache || die +} + +pkg_postinst() { + optfeature "C-based WebSocket acceleration" "dev-python/wsaccel" + optfeature "non-standard WebSocket compression support" \ + "dev-python/python-snappy" + optfeature "accelerated WAMP serialization support" \ + "dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson" + optfeature "TLS transport encryption" \ + "dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/qrcode dev-python/service-identity" + optfeature "WAMP-SCRAM authentication" \ + "dev-python/cffi dev-python/argon2-cffi dev-python/passlib" + optfeature "native SIMD acceleration" "dev-python/cffi" + + python_foreach_impl twisted-regen-cache +} + +pkg_postrm() { + python_foreach_impl twisted-regen-cache +} diff --git a/dev-python/autobahn/autobahn-25.10.2.ebuild b/dev-python/autobahn/autobahn-25.10.2.ebuild new file mode 100644 index 000000000000..d4579a09205c --- /dev/null +++ b/dev-python/autobahn/autobahn-25.10.2.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{13..14} ) + +inherit distutils-r1 optfeature pypi + +DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio" +HOMEPAGE=" + https://github.com/crossbario/autobahn-python/ + https://pypi.org/project/autobahn/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +IUSE="+native-extensions test xbr" +RESTRICT="!test? ( test )" + +# The order of deps is based on their appearance in pyproject.toml +# All extra deps should be included in test and in optfeature +RDEPEND=" + >=dev-python/txaio-25.9.2[${PYTHON_USEDEP}] + >=dev-python/cryptography-3.4.6[${PYTHON_USEDEP}] + >=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}] + + >=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}] + >=dev-python/twisted-24.3.0[${PYTHON_USEDEP}] + >=dev-python/attrs-20.3.0[${PYTHON_USEDEP}] + + native-extensions? ( + $(python_gen_cond_dep ' + >=dev-python/cffi-1.14.5[${PYTHON_USEDEP}] + ' 'python*') + ) +" +BDEPEND=" + native-extensions? ( + $(python_gen_cond_dep ' + >=dev-python/cffi-1.14.5[${PYTHON_USEDEP}] + ' 'python*') + ) + + test? ( + >=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}] + >=dev-python/python-snappy-0.6.0[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}] + >=dev-python/ujson-4.0.2[${PYTHON_USEDEP}] + >=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}] + >=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}] + >=dev-python/flatbuffers-22.12.06[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}] + >=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}] + >=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}] + >=dev-python/pytrie-0.4.0[${PYTHON_USEDEP}] + >=dev-python/qrcode-7.3.1[${PYTHON_USEDEP}] + >=dev-python/base58-2.1.1[${PYTHON_USEDEP}] + >=dev-python/ecdsa-0.19.1[${PYTHON_USEDEP}] + >=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}] + >=dev-python/passlib-1.7.4[${PYTHON_USEDEP}] + ) +" + +EPYTEST_PLUGINS=( pytest-{asyncio,aiohttp} ) +distutils_enable_tests pytest + +python_prepare_all() { + if use xbr ; then + eerror "***************" + eerror "Required xbr dependencies are incomplete in Gentoo." + eerror "So this functionality will not yet work" + eerror "Please file a bug if this feature is needed" + eerror "***************" + else + # remove xbr components + export AUTOBAHN_STRIP_XBR="True" + fi + + distutils-r1_python_prepare_all + + if ! use native-extensions; then + export AUTOBAHN_USE_NVX=0 + fi +} + +python_test() { + rm -rf autobahn || die + + einfo "Testing all, cryptosign using twisted" + local -x USE_TWISTED=true + "${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}" + unset USE_TWISTED + + einfo "RE-testing cryptosign and component_aio using asyncio" + local -x USE_ASYNCIO=true + epytest --pyargs \ + autobahn.asyncio.test.test_aio_{raw,web}socket \ + autobahn.wamp.test.test_wamp_{cryptosign,component_aio} + unset USE_ASYNCIO + + rm -f twisted/plugins/dropin.cache || die +} + +pkg_postinst() { + optfeature "C-based WebSocket acceleration" "dev-python/wsaccel" + optfeature "non-standard WebSocket compression support" \ + "dev-python/python-snappy" + optfeature "accelerated WAMP serialization support" \ + "dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson" + optfeature "TLS transport encryption" \ + "dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/qrcode dev-python/service-identity" + optfeature "WAMP-SCRAM authentication" \ + "dev-python/cffi dev-python/argon2-cffi dev-python/passlib" + optfeature "native SIMD acceleration" "dev-python/cffi" + + python_foreach_impl twisted-regen-cache +} + +pkg_postrm() { + python_foreach_impl twisted-regen-cache +} diff --git a/dev-python/autobahn/autobahn-25.11.1.ebuild b/dev-python/autobahn/autobahn-25.11.1.ebuild new file mode 100644 index 000000000000..74f0ccbfb389 --- /dev/null +++ b/dev-python/autobahn/autobahn-25.11.1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{13..14} ) + +inherit distutils-r1 optfeature pypi + +DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio" +HOMEPAGE=" + https://github.com/crossbario/autobahn-python/ + https://pypi.org/project/autobahn/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +IUSE="+native-extensions test xbr" +RESTRICT="!test? ( test )" + +# The order of deps is based on their appearance in pyproject.toml +# All extra deps should be included in test and in optfeature +RDEPEND=" + >=dev-python/txaio-25.9.2[${PYTHON_USEDEP}] + >=dev-python/cryptography-3.4.6[${PYTHON_USEDEP}] + >=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}] + >=dev-python/ujson-4.0.2[${PYTHON_USEDEP}] + >=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}] + >=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}] + + >=dev-python/flatbuffers-22.12.06[${PYTHON_USEDEP}] + + >=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}] + >=dev-python/twisted-24.3.0[${PYTHON_USEDEP}] + >=dev-python/attrs-20.3.0[${PYTHON_USEDEP}] + + native-extensions? ( + $(python_gen_cond_dep ' + >=dev-python/cffi-1.14.5[${PYTHON_USEDEP}] + ' 'python*') + ) +" +BDEPEND=" + native-extensions? ( + $(python_gen_cond_dep ' + >=dev-python/cffi-1.14.5[${PYTHON_USEDEP}] + ' 'python*') + ) + + test? ( + >=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}] + >=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}] + >=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}] + >=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}] + >=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}] + >=dev-python/pytrie-0.4.0[${PYTHON_USEDEP}] + >=dev-python/qrcode-7.3.1[${PYTHON_USEDEP}] + >=dev-python/base58-2.1.1[${PYTHON_USEDEP}] + >=dev-python/ecdsa-0.19.1[${PYTHON_USEDEP}] + >=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}] + >=dev-python/passlib-1.7.4[${PYTHON_USEDEP}] + ) +" + +EPYTEST_PLUGINS=( pytest-{asyncio,aiohttp} ) +distutils_enable_tests pytest + +python_prepare_all() { + if use xbr ; then + eerror "***************" + eerror "Required xbr dependencies are incomplete in Gentoo." + eerror "So this functionality will not yet work" + eerror "Please file a bug if this feature is needed" + eerror "***************" + else + # remove xbr components + export AUTOBAHN_STRIP_XBR="True" + fi + + distutils-r1_python_prepare_all + + # remove "vendored" flatbuffers that conflict with actual flatbuffers + # https://github.com/crossbario/autobahn-python/issues/1782 + rm -rf flatbuffers || die + + if ! use native-extensions; then + export AUTOBAHN_USE_NVX=0 + fi +} + +python_test() { + rm -rf autobahn || die + + einfo "Testing all, cryptosign using twisted" + local -x USE_TWISTED=true + "${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}" + unset USE_TWISTED + + einfo "RE-testing cryptosign and component_aio using asyncio" + local -x USE_ASYNCIO=true + epytest --pyargs \ + autobahn.asyncio.test.test_aio_{raw,web}socket \ + autobahn.wamp.test.test_wamp_{cryptosign,component_aio} + unset USE_ASYNCIO + + rm -f twisted/plugins/dropin.cache || die +} + +pkg_postinst() { + optfeature "C-based WebSocket acceleration" "dev-python/wsaccel" + optfeature "non-standard WebSocket compression support" \ + "dev-python/python-snappy" + optfeature "TLS transport encryption" \ + "dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/qrcode dev-python/service-identity" + optfeature "WAMP-SCRAM authentication" \ + "dev-python/cffi dev-python/argon2-cffi dev-python/passlib" + optfeature "native SIMD acceleration" "dev-python/cffi" + + python_foreach_impl twisted-regen-cache +} + +pkg_postrm() { + python_foreach_impl twisted-regen-cache +} diff --git a/dev-python/autobahn/files/autobahn-24.4.2-pytest-asyncio-1.patch b/dev-python/autobahn/files/autobahn-24.4.2-pytest-asyncio-1.patch new file mode 100644 index 000000000000..df35281e4121 --- /dev/null +++ b/dev-python/autobahn/files/autobahn-24.4.2-pytest-asyncio-1.patch @@ -0,0 +1,298 @@ +From 9a14ae7739524f376d94e075c5a8f2f26e79c674 Mon Sep 17 00:00:00 2001 +From: meejah <meejah@meejah.ca> +Date: Sat, 21 Jun 2025 22:35:41 -0600 +Subject: [PATCH] Plain twisted utilities are sufficient (#1661) + +* Plain twisted utilities are sufficient + +* CI fixups +--- + autobahn/asyncio/test/test_aio_rawsocket.py | 18 +++++------ + autobahn/asyncio/test/test_aio_websocket.py | 10 +++--- + .../twisted/test/test_tx_websocket_agent.py | 5 +-- + autobahn/twisted/testing/__init__.py | 31 +++---------------- + autobahn/wamp/test/test_wamp_component_aio.py | 29 ++++++++--------- + 5 files changed, 36 insertions(+), 57 deletions(-) + +diff --git a/autobahn/asyncio/test/test_aio_rawsocket.py b/autobahn/asyncio/test/test_aio_rawsocket.py +index 726a6242..42c00c30 100644 +--- a/autobahn/asyncio/test/test_aio_rawsocket.py ++++ b/autobahn/asyncio/test/test_aio_rawsocket.py +@@ -11,7 +11,7 @@ from autobahn.wamp.types import TransportDetails + + + @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only') +-def test_sers(event_loop): ++def test_sers(): + serializers = get_serializers() + assert len(serializers) > 0 + m = serializers[0]().serialize(message.Abort('close')) +@@ -19,7 +19,7 @@ def test_sers(event_loop): + + + @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only') +-def test_prefix(event_loop): ++def test_prefix(): + p = PrefixProtocol() + transport = Mock() + receiver = Mock() +@@ -62,7 +62,7 @@ def test_prefix(event_loop): + + + @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only') +-def test_is_closed(event_loop): ++def test_is_closed(): + class CP(RawSocketClientProtocol): + @property + def serializer_id(self): +@@ -83,7 +83,7 @@ def test_is_closed(event_loop): + + + @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only') +-def test_raw_socket_server1(event_loop): ++def test_raw_socket_server1(): + + server = RawSocketServerProtocol() + ser = Mock(return_value=True) +@@ -108,7 +108,7 @@ def test_raw_socket_server1(event_loop): + + + @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only') +-def test_raw_socket_server_errors(event_loop): ++def test_raw_socket_server_errors(): + + server = RawSocketServerProtocol() + ser = Mock(return_value=True) +@@ -139,7 +139,7 @@ def test_raw_socket_server_errors(event_loop): + + + @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only') +-def test_raw_socket_client1(event_loop): ++def test_raw_socket_client1(): + class CP(RawSocketClientProtocol): + @property + def serializer_id(self): +@@ -162,7 +162,7 @@ def test_raw_socket_client1(event_loop): + + + @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only') +-def test_raw_socket_client_error(event_loop): ++def test_raw_socket_client_error(): + class CP(RawSocketClientProtocol): + @property + def serializer_id(self): +@@ -181,7 +181,7 @@ def test_raw_socket_client_error(event_loop): + + + @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only') +-def test_wamp_server(event_loop): ++def test_wamp_server(): + transport = Mock(spec_set=('abort', 'close', 'write', 'get_extra_info')) + transport.write = Mock(side_effect=lambda m: messages.append(m)) + server = Mock(spec=['onOpen', 'onMessage']) +@@ -209,7 +209,7 @@ def test_wamp_server(event_loop): + + + @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only') +-def test_wamp_client(event_loop): ++def test_wamp_client(): + transport = Mock(spec_set=('abort', 'close', 'write', 'get_extra_info')) + transport.write = Mock(side_effect=lambda m: messages.append(m)) + client = Mock(spec=['onOpen', 'onMessage']) +diff --git a/autobahn/asyncio/test/test_aio_websocket.py b/autobahn/asyncio/test/test_aio_websocket.py +index f80cc249..c2299991 100644 +--- a/autobahn/asyncio/test/test_aio_websocket.py ++++ b/autobahn/asyncio/test/test_aio_websocket.py +@@ -23,16 +23,15 @@ async def test_echo_async(): + + # @pytest.mark.asyncio(forbid_global_loop=True) + @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only') +-def test_websocket_custom_loop(event_loop): +- factory = WebSocketServerFactory(loop=event_loop) ++def test_websocket_custom_loop(): ++ factory = WebSocketServerFactory(loop=asyncio.new_event_loop()) + server = factory() + transport = Mock() + server.connection_made(transport) + + + @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only') +-@pytest.mark.asyncio +-async def test_async_on_connect_server(event_loop): ++def test_async_on_connect_server(): + + num = 42 + done = txaio.create_future() +@@ -65,7 +64,8 @@ async def test_async_on_connect_server(event_loop): + b'\r\n', # last string doesn't get a \r\n from join() + ]) + server.processHandshake() +- await done ++ ++ asyncio.get_event_loop().run_until_complete(done) + + assert len(values) == 1 + assert values[0] == num * num +diff --git a/autobahn/twisted/test/test_tx_websocket_agent.py b/autobahn/twisted/test/test_tx_websocket_agent.py +index c926cbef..d65c3ca8 100644 +--- a/autobahn/twisted/test/test_tx_websocket_agent.py ++++ b/autobahn/twisted/test/test_tx_websocket_agent.py +@@ -1,12 +1,13 @@ + from twisted.trial import unittest + + try: +- from autobahn.twisted.testing import create_memory_agent, MemoryReactorClockResolver, create_pumper ++ from autobahn.twisted.testing import create_memory_agent, create_pumper + HAVE_TESTING = True + except ImportError: + HAVE_TESTING = False + + from twisted.internet.defer import inlineCallbacks ++from twisted.internet.testing import MemoryReactorClock + from autobahn.twisted.websocket import WebSocketServerProtocol + + +@@ -16,7 +17,7 @@ class TestAgent(unittest.TestCase): + + def setUp(self): + self.pumper = create_pumper() +- self.reactor = MemoryReactorClockResolver() ++ self.reactor = MemoryReactorClock() + return self.pumper.start() + + def tearDown(self): +diff --git a/autobahn/twisted/testing/__init__.py b/autobahn/twisted/testing/__init__.py +index 53d5f2d4..e014d350 100644 +--- a/autobahn/twisted/testing/__init__.py ++++ b/autobahn/twisted/testing/__init__.py +@@ -37,7 +37,7 @@ except ImportError: + from twisted.internet.defer import Deferred + from twisted.internet.address import IPv4Address + from twisted.internet._resolver import HostResolution # "internal" class, but it's simple +-from twisted.internet.interfaces import ISSLTransport, IReactorPluggableNameResolver ++from twisted.internet.interfaces import ISSLTransport + try: + from twisted.internet.testing import MemoryReactorClock + except ImportError: +@@ -73,32 +73,9 @@ class _StaticTestResolver(object): + receiver.resolutionComplete() + + +-@implementer(IReactorPluggableNameResolver) +-class _TestNameResolver(object): +- """ +- A test version of IReactorPluggableNameResolver +- """ +- +- _resolver = None +- +- @property +- def nameResolver(self): +- if self._resolver is None: +- self._resolver = _StaticTestResolver() +- return self._resolver +- +- def installNameResolver(self, resolver): +- old = self._resolver +- self._resolver = resolver +- return old +- +- +-class MemoryReactorClockResolver(MemoryReactorClock, _TestNameResolver): +- """ +- Combine MemoryReactor, Clock and an IReactorPluggableNameResolver +- together. +- """ +- pass ++# in previous revisions, we exported MemoryReactorClockResolver so ++# this maintains compatibility with any downstream code ++MemoryReactorClockResolver = MemoryReactorClock + + + class _TwistedWebMemoryAgent(IWebSocketClientAgent): +diff --git a/autobahn/wamp/test/test_wamp_component_aio.py b/autobahn/wamp/test/test_wamp_component_aio.py +index 2de9bf35..971f8ddd 100644 +--- a/autobahn/wamp/test/test_wamp_component_aio.py ++++ b/autobahn/wamp/test/test_wamp_component_aio.py +@@ -29,15 +29,15 @@ import sys + import unittest.mock as mock + import pytest + import txaio ++import asyncio + + if os.environ.get('USE_ASYNCIO', False): + from autobahn.asyncio.component import Component + + @pytest.mark.skipif(sys.version_info < (3, 5), reason="requires Python 3.5+") +- @pytest.mark.asyncio(forbid_global_loop=True) +- async def test_asyncio_component(event_loop): ++ def test_asyncio_component(): + orig_loop = txaio.config.loop +- txaio.config.loop = event_loop ++ txaio.config.loop = asyncio.get_event_loop() + + comp = Component( + transports=[ +@@ -52,8 +52,8 @@ if os.environ.get('USE_ASYNCIO', False): + # if having trouble, try starting some logging (and use + # "py.test -s" to get real-time output) + # txaio.start_logging(level="debug") +- f = comp.start(loop=event_loop) +- txaio.config.loop = event_loop ++ f = comp.start(loop=asyncio.get_event_loop()) ++ txaio.config.loop = asyncio.get_event_loop() + finished = txaio.create_future() + + def fail(): +@@ -72,18 +72,18 @@ if os.environ.get('USE_ASYNCIO', False): + txaio.config.loop = orig_loop + assert comp._done_f is None + f.add_done_callback(done) +- await finished ++ ++ asyncio.get_event_loop().run_until_complete(finished) + + @pytest.mark.skipif(sys.version_info < (3, 5), reason="requires Python 3.5+") +- @pytest.mark.asyncio(forbid_global_loop=True) +- async def test_asyncio_component_404(event_loop): ++ def test_asyncio_component_404(): + """ + If something connects but then gets aborted, it should still try + to re-connect (in real cases this could be e.g. wrong path, + TLS failure, WebSocket handshake failure, etc) + """ + orig_loop = txaio.config.loop +- txaio.config.loop = event_loop ++ txaio.config.loop = asyncio.get_event_loop() + + class FakeTransport(object): + def close(self): +@@ -104,8 +104,8 @@ if os.environ.get('USE_ASYNCIO', False): + else: + return txaio.create_future_error(RuntimeError("second connection fails completely")) + +- with mock.patch.object(event_loop, 'create_connection', create_connection): +- event_loop.create_connection = create_connection ++ with mock.patch.object(txaio.config.loop, 'create_connection', create_connection): ++ txaio.config.loop.create_connection = create_connection + + comp = Component( + transports=[ +@@ -120,8 +120,8 @@ if os.environ.get('USE_ASYNCIO', False): + # if having trouble, try starting some logging (and use + # "py.test -s" to get real-time output) + # txaio.start_logging(level="debug") +- f = comp.start(loop=event_loop) +- txaio.config.loop = event_loop ++ f = comp.start(loop=asyncio.get_event_loop()) ++ txaio.config.loop = asyncio.get_event_loop() + + # now that we've started connecting, we *should* be able + # to connetion_lost our transport .. but we do a +@@ -151,4 +151,5 @@ if os.environ.get('USE_ASYNCIO', False): + finished.set_result(None) + txaio.config.loop = orig_loop + f.add_done_callback(done) +- await finished ++ ++ asyncio.get_event_loop().run_until_complete(finished) diff --git a/dev-python/autobahn/metadata.xml b/dev-python/autobahn/metadata.xml new file mode 100644 index 000000000000..7c903a33653d --- /dev/null +++ b/dev-python/autobahn/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>python@gentoo.org</email> + <name>Python</name> + </maintainer> + <use> + <flag name="xbr">Add support for XBR decentralized data markets and etherium blockchain</flag> + </use> + <origin>baldeagleos-repo</origin> +</pkgmetadata> |
