[arch-commits] Commit in python-autobahn/repos/community-x86_64 (5 files)
Chih-Hsuan Yen
yan12125 at gemini.archlinux.org
Fri Jun 17 12:30:42 UTC 2022
Date: Friday, June 17, 2022 @ 12:30:41
Author: yan12125
Revision: 1238294
archrelease: copy trunk to community-x86_64
Added:
python-autobahn/repos/community-x86_64/PKGBUILD
(from rev 1238293, python-autobahn/trunk/PKGBUILD)
python-autobahn/repos/community-x86_64/issue1579.patch
(from rev 1238293, python-autobahn/trunk/issue1579.patch)
python-autobahn/repos/community-x86_64/judge-sse-header.patch
(from rev 1238293, python-autobahn/trunk/judge-sse-header.patch)
Deleted:
python-autobahn/repos/community-x86_64/PKGBUILD
python-autobahn/repos/community-x86_64/judge-sse-header.patch
------------------------+
PKGBUILD | 139 ++++++++++++++++++++++++-----------------------
issue1579.patch | 72 ++++++++++++++++++++++++
judge-sse-header.patch | 28 ++++-----
3 files changed, 158 insertions(+), 81 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-17 12:30:18 UTC (rev 1238293)
+++ PKGBUILD 2022-06-17 12:30:41 UTC (rev 1238294)
@@ -1,67 +0,0 @@
-# Maintainer: Morten Linderud <foxboron at archlinux.org>
-# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
-# Maintainer: Anatol Pomozov
-
-pkgname=python-autobahn
-# https://github.com/crossbario/autobahn-python/blob/master/docs/changelog.rst
-pkgver=22.4.2
-pkgrel=1
-pkgdesc='Real-time framework for Web, Mobile & Internet of Things'
-arch=(x86_64)
-url='https://crossbar.io/autobahn/'
-license=(MIT)
-depends=(python-cffi python-twisted python-txaio python-wsaccel
- python-cryptography)
-makedepends=(python-argon2_cffi python-cbor2 python-flatbuffers
- python-msgpack python-passlib python-pynacl python-pytrie
- python-setuptools python-ubjson)
-checkdepends=(python-pytest python-pytest-asyncio)
-optdepends=(
- 'python-cbor2: CBOR serializer support'
- 'python-flatbuffers: FlatBuffers serializer support'
- 'python-msgpack: MsgPack serializer support'
- 'python-u-msgpack: pure-python alternative to python-msgpack for MsgPack serializer support'
- 'python-ubjson: UBJSON serializer support'
- 'python-ujson: accelerated JSON serializer support'
- 'python-argon2_cffi: WAMP-SCRAM authentication support'
- 'python-passlib: WAMP-SCRAM authentication support'
- 'python-pynacl: WAMP-cryptosign and WAMP-cryptobox support'
- 'python-pytrie: WAMP-cryptobox support'
- 'python-pyopenssl: SSL/TLS support'
- 'python-snappy: snappy compression suppport for WebSocket messages'
-)
-
-source=(https://files.pythonhosted.org/packages/source/a/autobahn/autobahn-$pkgver.tar.gz
- judge-sse-header.patch)
-sha256sums=('57b7acf228d50d83cf327372b889e2a168a869275b26e17917ed0b4cf4d823a6'
- 'a6505b22363d7b1bbd6c9b4d503118e16129abf91e65885b7ee7f47f74ed9d00')
-
-prepare() {
- cd "$srcdir/autobahn-$pkgver"
- # For reproducibility
- # If Arch decides to increase CPU requirements [1], -march=native can be
- # replaced with -march=nehalem so that the SSE 4.1 implementation is built
- # [1] https://gitlab.archlinux.org/archlinux/rfcs/-/blob/master/rfcs/0002-march.rst
- sed -i "s#, '-march=native'##" autobahn/nvx/_utf8validator.py
- patch -Np1 -i "${srcdir}/judge-sse-header.patch"
-}
-
-build() {
- cd "$srcdir/autobahn-$pkgver"
- python setup.py build
-}
-
-check() {
- cd "$srcdir/autobahn-$pkgver"
- pyver=$(python -c "import sys; print('{}.{}'.format(*sys.version_info[:2]))")
- # "autobahn on asyncio is tested using pytest, while for twisted we are using twisted trial"
- # https://github.com/crossbario/autobahn-python/issues/1235#issuecomment-522440810
- USE_TWISTED=1 PYTHONPATH=.:build/lib.linux-$CARCH-$pyver trial autobahn
- USE_ASYNCIO=1 PYTHONPATH=.:build/lib.linux-$CARCH-$pyver pytest autobahn
-}
-
-package() {
- cd "$srcdir/autobahn-$pkgver"
- python setup.py install --root="$pkgdir" --optimize=1 --skip-build
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
Copied: python-autobahn/repos/community-x86_64/PKGBUILD (from rev 1238293, python-autobahn/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-06-17 12:30:41 UTC (rev 1238294)
@@ -0,0 +1,72 @@
+# Maintainer: Morten Linderud <foxboron at archlinux.org>
+# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
+# Maintainer: Anatol Pomozov
+
+pkgname=python-autobahn
+# https://github.com/crossbario/autobahn-python/blob/master/docs/changelog.rst
+pkgver=22.5.1
+pkgrel=1
+pkgdesc='Real-time framework for Web, Mobile & Internet of Things'
+arch=(x86_64)
+url='https://crossbar.io/autobahn/'
+license=(MIT)
+depends=(python-cffi python-twisted python-txaio python-wsaccel
+ python-cryptography)
+makedepends=(python-argon2_cffi python-cbor2 python-flatbuffers
+ python-msgpack python-passlib python-pynacl python-pytrie
+ python-setuptools python-ubjson)
+checkdepends=(python-pytest python-pytest-asyncio)
+optdepends=(
+ 'python-cbor2: CBOR serializer support'
+ 'python-flatbuffers: FlatBuffers serializer support'
+ 'python-msgpack: MsgPack serializer support'
+ 'python-u-msgpack: pure-python alternative to python-msgpack for MsgPack serializer support'
+ 'python-ubjson: UBJSON serializer support'
+ 'python-ujson: accelerated JSON serializer support'
+ 'python-argon2_cffi: WAMP-SCRAM authentication support'
+ 'python-passlib: WAMP-SCRAM authentication support'
+ 'python-pynacl: WAMP-cryptosign and WAMP-cryptobox support'
+ 'python-pytrie: WAMP-cryptobox support'
+ 'python-qrcode: support QR codes in WAMP'
+ 'python-pyopenssl: SSL/TLS support'
+ 'python-snappy: snappy compression suppport for WebSocket messages'
+)
+
+source=(https://files.pythonhosted.org/packages/source/a/autobahn/autobahn-$pkgver.tar.gz
+ judge-sse-header.patch
+ issue1579.patch)
+sha256sums=('34aa5569b0b4419f8c277792c600dc2518c4930928c74e2279ef8b88d8b8a3ea'
+ 'a6505b22363d7b1bbd6c9b4d503118e16129abf91e65885b7ee7f47f74ed9d00'
+ '99d92676d4b45e56eb55f8b0d0d65eeb223cf280f9da1ab65ccd01fe9ed265e7')
+
+prepare() {
+ cd "$srcdir/autobahn-$pkgver"
+ # For reproducibility
+ # If Arch decides to increase CPU requirements [1], -march=native can be
+ # replaced with -march=nehalem so that the SSE 4.1 implementation is built
+ # [1] https://gitlab.archlinux.org/archlinux/rfcs/-/blob/master/rfcs/0002-march.rst
+ sed -i "s#, '-march=native'##" autobahn/nvx/_utf8validator.py
+ patch -Np1 -i "${srcdir}/judge-sse-header.patch"
+ # Manual backport of https://github.com/crossbario/autobahn-python/pull/1580
+ patch -Np1 -i "${srcdir}/issue1579.patch"
+}
+
+build() {
+ cd "$srcdir/autobahn-$pkgver"
+ python setup.py build
+}
+
+check() {
+ cd "$srcdir/autobahn-$pkgver"
+ pyver=$(python -c "import sys; print('{}.{}'.format(*sys.version_info[:2]))")
+ # "autobahn on asyncio is tested using pytest, while for twisted we are using twisted trial"
+ # https://github.com/crossbario/autobahn-python/issues/1235#issuecomment-522440810
+ USE_TWISTED=1 PYTHONPATH=.:build/lib.linux-$CARCH-$pyver trial autobahn
+ USE_ASYNCIO=1 PYTHONPATH=.:build/lib.linux-$CARCH-$pyver pytest autobahn
+}
+
+package() {
+ cd "$srcdir/autobahn-$pkgver"
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
Copied: python-autobahn/repos/community-x86_64/issue1579.patch (from rev 1238293, python-autobahn/trunk/issue1579.patch)
===================================================================
--- issue1579.patch (rev 0)
+++ issue1579.patch 2022-06-17 12:30:41 UTC (rev 1238294)
@@ -0,0 +1,72 @@
+From 3fe75d92883d43a2a0663745faaacb80eaecfa5d Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125 at gmail.com>
+Date: Fri, 17 Jun 2022 19:56:02 +0800
+Subject: [PATCH] Allow tests to pass without XBR dependencies (#1580)
+
+* Allow tests to pass without XBR dependencies - fixes #1579
+* Address review comments
+* Fix test skipping notes
+---
+ autobahn/xbr/test/test_xbr_frealm.py | 11 ++++++-----
+ autobahn/xbr/test/test_xbr_schema_demo.py | 7 ++++++-
+ autobahn/xbr/test/test_xbr_schema_wamp.py | 12 +++++++++---
+ autobahn/xbr/test/test_xbr_schema_wamp_control.py | 7 ++++++-
+ autobahn/xbr/test/test_xbr_secmod.py | 10 +++++-----
+ 5 files changed, 32 insertions(+), 15 deletions(-)
+
+diff --git a/autobahn/xbr/test/test_xbr_frealm.py b/autobahn/xbr/test/test_xbr_frealm.py
+index 5e511a9d..d85a78ef 100644
+--- a/autobahn/xbr/test/test_xbr_frealm.py
++++ b/autobahn/xbr/test/test_xbr_frealm.py
+@@ -7,11 +7,12 @@ from twisted.trial.unittest import TestCase
+ from twisted.internet.defer import inlineCallbacks
+
+ from autobahn.xbr import HAS_XBR
+-if HAS_XBR:
+- from autobahn.xbr._frealm import Seeder, FederatedRealm
++from autobahn.wamp.cryptosign import HAS_CRYPTOSIGN
+
+-from autobahn.xbr._secmod import SecurityModuleMemory, EthereumKey
+-from autobahn.wamp.cryptosign import CryptosignKey
++if HAS_XBR and HAS_CRYPTOSIGN:
++ from autobahn.xbr._frealm import Seeder, FederatedRealm
++ from autobahn.xbr._secmod import SecurityModuleMemory, EthereumKey
++ from autobahn.wamp.cryptosign import CryptosignKey
+
+ # https://web3py.readthedocs.io/en/stable/providers.html#infura-mainnet
+ HAS_INFURA = 'WEB3_INFURA_PROJECT_ID' in os.environ and len(os.environ['WEB3_INFURA_PROJECT_ID']) > 0
+@@ -22,7 +23,7 @@ IS_CPY_310 = sys.version_info.minor == 10
+
+ @skipIf(not os.environ.get('USE_TWISTED', False), 'only for Twisted')
+ @skipIf(not HAS_INFURA, 'env var WEB3_INFURA_PROJECT_ID not defined')
+- at skipIf(not HAS_XBR, 'package autobahn[xbr] not installed')
++ at skipIf(not (HAS_XBR and HAS_CRYPTOSIGN), 'package autobahn[encryption,xbr] not installed')
+ class TestFederatedRealm(TestCase):
+
+ gw_config = {
+--- a/autobahn/xbr/test/test_xbr_secmod.py
++++ b/autobahn/xbr/test/test_xbr_secmod.py
+@@ -34,15 +34,15 @@ from unittest import skipIf
+ from twisted.internet.defer import inlineCallbacks
+ from twisted.trial.unittest import TestCase
+
+-from py_eth_sig_utils.eip712 import encode_typed_data
+-from py_eth_sig_utils.utils import ecsign, ecrecover_to_pub, checksum_encode, sha3
+-from py_eth_sig_utils.signing import v_r_s_to_signature, signature_to_v_r_s
+-from py_eth_sig_utils.signing import sign_typed_data, recover_typed_data
+-
+ from autobahn.wamp.cryptosign import HAS_CRYPTOSIGN
+ from autobahn.xbr import HAS_XBR
+
+ if HAS_XBR and HAS_CRYPTOSIGN:
++ from py_eth_sig_utils.eip712 import encode_typed_data
++ from py_eth_sig_utils.utils import ecsign, ecrecover_to_pub, checksum_encode, sha3
++ from py_eth_sig_utils.signing import v_r_s_to_signature, signature_to_v_r_s
++ from py_eth_sig_utils.signing import sign_typed_data, recover_typed_data
++
+ from autobahn.xbr import make_w3, EthereumKey, mnemonic_to_private_key
+ from autobahn.xbr._eip712_member_register import _create_eip712_member_register
+ from autobahn.xbr._eip712_market_create import _create_eip712_market_create
+--
+2.36.1
+
Deleted: judge-sse-header.patch
===================================================================
--- judge-sse-header.patch 2022-06-17 12:30:18 UTC (rev 1238293)
+++ judge-sse-header.patch 2022-06-17 12:30:41 UTC (rev 1238294)
@@ -1,14 +0,0 @@
-diff --git a/autobahn/nvx/_utf8validator.c b/autobahn/nvx/_utf8validator.c
-index 5e632ac..cb0440d 100644
---- a/autobahn/nvx/_utf8validator.c
-+++ b/autobahn/nvx/_utf8validator.c
-@@ -28,7 +28,9 @@
- #include <stdint.h>
-
- // http://stackoverflow.com/questions/11228855/header-files-for-simd-intrinsics
-+#if defined(__SSE2__) || defined(__SSE4_1__)
- #include <x86intrin.h>
-+#endif
-
-
- #define UTF8_ACCEPT 0
Copied: python-autobahn/repos/community-x86_64/judge-sse-header.patch (from rev 1238293, python-autobahn/trunk/judge-sse-header.patch)
===================================================================
--- judge-sse-header.patch (rev 0)
+++ judge-sse-header.patch 2022-06-17 12:30:41 UTC (rev 1238294)
@@ -0,0 +1,14 @@
+diff --git a/autobahn/nvx/_utf8validator.c b/autobahn/nvx/_utf8validator.c
+index 5e632ac..cb0440d 100644
+--- a/autobahn/nvx/_utf8validator.c
++++ b/autobahn/nvx/_utf8validator.c
+@@ -28,7 +28,9 @@
+ #include <stdint.h>
+
+ // http://stackoverflow.com/questions/11228855/header-files-for-simd-intrinsics
++#if defined(__SSE2__) || defined(__SSE4_1__)
+ #include <x86intrin.h>
++#endif
+
+
+ #define UTF8_ACCEPT 0
More information about the arch-commits
mailing list