diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-18 04:54:42 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-18 04:54:42 +0000 |
commit | 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (patch) | |
tree | c968fff3108e2b4d88e4e564a56bfd066f170573 /dev-python/autobahn | |
parent | 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 (diff) |
gentoo resync : 18.03.2018
Diffstat (limited to 'dev-python/autobahn')
-rw-r--r-- | dev-python/autobahn/Manifest | 3 | ||||
-rw-r--r-- | dev-python/autobahn/autobahn-18.3.1.ebuild | 74 | ||||
-rw-r--r-- | dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch | 81 |
3 files changed, 158 insertions, 0 deletions
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest index 55081ec76424..c95b676d5285 100644 --- a/dev-python/autobahn/Manifest +++ b/dev-python/autobahn/Manifest @@ -1,9 +1,12 @@ +AUX autobahn-18.3.1-Fix-cs-test-955.patch 3526 BLAKE2B 0391759dfdbbdde4ce73c7fbdaffed0464d66ab92abc3f43f429d7583e07ecb9b31430b2f7b36f0d6405a466ecd19a3b54433c1f0643c66bee6472d193380e7f SHA512 a58e5d550efa15ba91d84a2bc4deaec4282aa8f890f45de8047a6ad330abaef7a61b0d8bbd5dd3ddac4566c248bc1b0a8c6f5908d5fe7c96befda9ee844be549 DIST autobahn-17.10.1.tar.gz 212093 BLAKE2B 1505097dee07025c5433645397bb52807dbd67559b628ee80735a49f8e085e9c8433fbd453a4d001996dd5aee715c9278b9932e8fbb65ecd6458b6b4bd4a804d SHA512 f26c1c88bea325136f640420ada0fc70e82397ed660056c18f68a2193f069c5fb5771ac620db1583f8c7938e804726d8885d237c925c4bd38d1a613a6aabc219 DIST autobahn-17.5.1.tar.gz 205144 BLAKE2B a026381330d062059f23bd0fe20de12bf227fec45c816ce41a05d81951a2cb263e70ec3a5cee265ea3cc1f6910975903b493a767dce64c5bbb13be077561cabd SHA512 904f8f4c527a6c1c7840ea8634d0c0a47141458500c6d29f4aa1f05ff51f91c65a451b7c447201cbdf5e255c4c2d07509efa106790217b09398e7d50c1d85382 DIST autobahn-17.9.1.tar.gz 209230 BLAKE2B 4e637ee22fe84c51b294faa853034b65e5bc7b230d1d80eea022a2e3809a7ff0c9ffee7c13886f154efffdcdedf5c790e5891466107670c3221a5c7b5de846ea SHA512 036508c1170f53b01be360083bbf9f569fbaf216d984b34e10ad18e5f5e156e74bd4c8979bdd977a8e23deff0332e16d3d606716d32f3987ff37c7707eac0f86 DIST autobahn-17.9.2.tar.gz 209442 BLAKE2B 66d31a575d980d81ecd50d9511ed49b947a568ce5457db2de7fd67a85ae06016bacff10f65b74f43c2b72b21543ddb8c0d527f6b9ece706c67adb96860435232 SHA512 de73a4cc99616802d280887ef8a9971c532f974dd43cda933da953d7bcc45da3fd9d0c91763c6a80371f582f0acc9741134b1ba1b98035ef0f63e4971aaff79f +DIST autobahn-18.3.1.tar.gz 213042 BLAKE2B 2f5eb92212f57d2301dbac1108a81cbbd339da4cb5527e3eb55f1ae7dcb951fed3cb7c643e76beaa0a83d623fe96f9eebcf7945e10efb0773e102d0234ebc479 SHA512 3d122cfb54eff0697cf60cd155a07699c6f6b39e573616c247ea79e65e6fa0a86d505ea8bc4f4755dbf266fb8bc7fadabb4338aeb1b9e6a2f0503e1b4d25e2e6 EBUILD autobahn-17.10.1.ebuild 1862 BLAKE2B c29491055685c54d9f836b12584455636ef1d06c3cbba5d0aa1acb7986cc445951eb8d056dea381413ae14ede8ef3a555d6de588ef7f4335fd1149d645a4c2f7 SHA512 c70fb571bd79e288f3a52b1c05f7ee79eba395bae75412b6c0bcb8617fe6f125b24dc520155a26add54942a6dad86dfde6d9d90f5950c05b8366e8029a01bd46 EBUILD autobahn-17.5.1-r2.ebuild 1855 BLAKE2B d15732d36a5f8c7d8620a4192f301cf07f92e257b70d0ba228de8bf459ad15ee1892c1c610cd52d22c801c3192903e6708a89432c99d6248d9dc4ebd919752de SHA512 370231757473b8bca2df5598e8d741b52dc4f20268eb1497da7e96073519a6d92890aaaedd822741deffb2b562cea8e5c766a41d80d51b350e9edc5655427ccc EBUILD autobahn-17.9.1.ebuild 1862 BLAKE2B c80874fc962bc4a5fd7d109fef0ac589a008bc9124f3c573953be267508338f216e09bef1fcef3efff2248e3daa7a268fbf2936394da1a4645fe7fdf0d1a1331 SHA512 6fe74281a793e5ae17ca66c9ecd453fa143d82de9639cfa43525beee8953038322dde5e5ef29b9f66b885cf7a81857ce3a91ef05ee4a561fd71efadc9f066191 EBUILD autobahn-17.9.2.ebuild 1862 BLAKE2B c80874fc962bc4a5fd7d109fef0ac589a008bc9124f3c573953be267508338f216e09bef1fcef3efff2248e3daa7a268fbf2936394da1a4645fe7fdf0d1a1331 SHA512 6fe74281a793e5ae17ca66c9ecd453fa143d82de9639cfa43525beee8953038322dde5e5ef29b9f66b885cf7a81857ce3a91ef05ee4a561fd71efadc9f066191 +EBUILD autobahn-18.3.1.ebuild 2123 BLAKE2B f17609fcc0043bccccbe510d2c7be2e0c6c646a82fe90ef9abb2bf6918044061c621660769fc3bb9e71d2080bb26e982114a5c1fcf69f17cf3882c4823dc4c59 SHA512 7e33351dc862412869730db30025cb49f34563c760ec08ab87780ba37ed9221f293f7e80b4ab4069a5eec906d73a7b9f2fc3b36e5e65b3ee54cc706fa25aeaa2 MISC metadata.xml 321 BLAKE2B 2a222ee5e7e6a2a90a44b834a4b7d430938813786c7179fe3fe273456b501feba4c20da2fe3b9671092085a991fd35c736a5b64c179a08f54fddd029ac5bd731 SHA512 fd00829f66750d3d54b7bfb472179639fbe453840e7c3056b406af546acb952d3fb8d4552973a68ff0966f25bead8dfd4501888cbd68721e54207b5a7628ac36 diff --git a/dev-python/autobahn/autobahn-18.3.1.ebuild b/dev-python/autobahn/autobahn-18.3.1.ebuild new file mode 100644 index 000000000000..d9e0fc18cb5f --- /dev/null +++ b/dev-python/autobahn/autobahn-18.3.1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit distutils-r1 versionator + +MY_P="${PN}-$(replace_version_separator 3 -)" + +DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio" +HOMEPAGE="https://pypi.python.org/pypi/autobahn http://autobahn.ws/python/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="crypt test" + +RDEPEND=" + $(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' 'python2_7') + $(python_gen_cond_dep '>=dev-python/futures-3.0.4[${PYTHON_USEDEP}]' 'python2_7') + >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] + >=dev-python/lz4-0.7.0[${PYTHON_USEDEP}] + >=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + >=dev-python/snappy-0.5[${PYTHON_USEDEP}] + >=dev-python/twisted-16.6.0-r2[${PYTHON_USEDEP}] + >=dev-python/txaio-2.7.0[${PYTHON_USEDEP}] + >=dev-python/u-msgpack-2.1[${PYTHON_USEDEP}] + >=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}] + >=dev-python/zope-interface-3.6[${PYTHON_USEDEP}] + crypt? ( + >=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}] + >=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}] + >=dev-python/pytrie-0.2[${PYTHON_USEDEP}] + >=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}] + >=dev-python/service_identity-16.0.0 + ) + " +DEPEND="${RDEPEND} + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + >=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}] + >=dev-python/pytrie-0.2[${PYTHON_USEDEP}] + >=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}/${P}-Fix-cs-test-955.patch" +) + +S="${WORKDIR}"/${MY_P} + +python_test() { + echo "Testing all, cryptosign using twisted" + export USE_TWISTED=true + cd "${BUILD_DIR}"/lib || die + py.test -v || die + echo "RE-testing cryptosign using asyncio" + export USE_TWISTED=false + export USE_ASYNCIO=true + py.test -v autobahn/wamp/test/test_cryptosign.py || die +} + +pkg_postinst() { + python_foreach_impl twisted-regen-cache || die +} + +pkg_postrm() { + python_foreach_impl twisted-regen-cache || die +} diff --git a/dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch b/dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch new file mode 100644 index 000000000000..07c5a0a20e2c --- /dev/null +++ b/dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch @@ -0,0 +1,81 @@ +From 604bc53a3beec173020c944ce9cb38afca2a9126 Mon Sep 17 00:00:00 2001 +From: <°?¡> +Date: Fri, 9 Mar 2018 10:37:31 +0100 +Subject: [PATCH] Fix cs test (#955) + +--- + .travis.yml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- + Makefile | 3 +++ + autobahn/asyncio/rawsocket.py | 2 +- + autobahn/wamp/test/test_cryptosign.py | 18 +++++++++++++++--- + tox.ini | 32 +++++++++++++++++--------------- + 5 files changed, 89 insertions(+), 24 deletions(-) + +diff --git a/autobahn/asyncio/rawsocket.py b/autobahn/asyncio/rawsocket.py +index 130a8e4..bbb8333 100644 +--- a/autobahn/asyncio/rawsocket.py ++++ b/autobahn/asyncio/rawsocket.py +@@ -408,7 +408,7 @@ class WampRawSocketClientProtocol(WampRawSocketMixinGeneral, WampRawSocketMixinA + @property + def serializer_id(self): + if not hasattr(self, '_serializer'): +- self._serializer = self.factory._serializer() ++ self._serializer = self.factory._serializer + return self._serializer.RAWSOCKET_SERIALIZER_ID + + def get_channel_id(self, channel_id_type=u'tls-unique'): +diff --git a/autobahn/wamp/test/test_cryptosign.py b/autobahn/wamp/test/test_cryptosign.py +index 700ca3c..78f8d55 100644 +--- a/autobahn/wamp/test/test_cryptosign.py ++++ b/autobahn/wamp/test/test_cryptosign.py +@@ -25,9 +25,21 @@ + ############################################################################### + + from __future__ import absolute_import ++ + import hashlib ++import os ++ + from mock import Mock + ++import txaio ++ ++if os.environ.get('USE_TWISTED', False): ++ txaio.use_twisted() ++elif os.environ.get('USE_ASYNCIO', False): ++ txaio.use_asyncio() ++else: ++ raise Exception('no networking framework selected') ++ + from autobahn.wamp.cryptosign import _makepad, HAS_CRYPTOSIGN + from autobahn.wamp import types + from autobahn.wamp.auth import create_authenticator +@@ -59,14 +71,14 @@ class TestAuth(unittest.TestCase): + self.key = SigningKey.from_ssh_data(keybody) + self.privkey_hex = self.key._key.encode(encoder=HexEncoder) + m = hashlib.sha256() +- m.update("some TLS message") ++ m.update("some TLS message".encode()) + self.channel_id = m.digest() + + def test_valid(self): + session = Mock() + session._transport.get_channel_id = Mock(return_value=self.channel_id) + challenge = types.Challenge(u"ticket", dict(challenge="ff" * 32)) +- signed = self.key.sign_challenge(session, challenge) ++ signed = yield self.key.sign_challenge(session, challenge) + self.assertEqual( + u'9b6f41540c9b95b4b7b281c3042fa9c54cef43c842d62ea3fd6030fcb66e70b3e80d49d44c29d1635da9348d02ec93f3ed1ef227dfb59a07b580095c2b82f80f9d16ca518aa0c2b707f2b2a609edeca73bca8dd59817a633f35574ac6fd80d00', + signed.result, +@@ -81,7 +93,7 @@ class TestAuth(unittest.TestCase): + session = Mock() + session._transport.get_channel_id = Mock(return_value=self.channel_id) + challenge = types.Challenge(u"cryptosign", dict(challenge="ff" * 32)) +- reply = authenticator.on_challenge(session, challenge) ++ reply = yield authenticator.on_challenge(session, challenge) + self.assertEqual( + reply.result, + u'9b6f41540c9b95b4b7b281c3042fa9c54cef43c842d62ea3fd6030fcb66e70b3e80d49d44c29d1635da9348d02ec93f3ed1ef227dfb59a07b580095c2b82f80f9d16ca518aa0c2b707f2b2a609edeca73bca8dd59817a633f35574ac6fd80d00', +-- +libgit2 0.24.6 + |