[arch-commits] Commit in python-autobahn/trunk (PKGBUILD issue1579.patch)

[Chih-Hsuan Yen]

    Date: Wednesday, July 6, 2022 @ 11:49:59
  Author: yan12125
Revision: 1246708

upgpkg: python-autobahn 22.6.1-1

Modified:
  python-autobahn/trunk/PKGBUILD
Deleted:
  python-autobahn/trunk/issue1579.patch

-----------------+
 PKGBUILD        |   12 +++------
 issue1579.patch |   72 ------------------------------------------------------
 2 files changed, 4 insertions(+), 80 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-06 10:53:02 UTC (rev 1246707)
+++ PKGBUILD	2022-07-06 11:49:59 UTC (rev 1246708)
@@ -4,7 +4,7 @@
 
 pkgname=python-autobahn
 # https://github.com/crossbario/autobahn-python/blob/master/docs/changelog.rst
-pkgver=22.5.1
+pkgver=22.6.1
 pkgrel=1
 pkgdesc='Real-time framework for Web, Mobile & Internet of Things'
 arch=(x86_64)
@@ -33,11 +33,9 @@
 )
 
 source=(https://files.pythonhosted.org/packages/source/a/autobahn/autobahn-$pkgver.tar.gz
-        judge-sse-header.patch
-        issue1579.patch)
-sha256sums=('34aa5569b0b4419f8c277792c600dc2518c4930928c74e2279ef8b88d8b8a3ea'
-            'a6505b22363d7b1bbd6c9b4d503118e16129abf91e65885b7ee7f47f74ed9d00'
-            '99d92676d4b45e56eb55f8b0d0d65eeb223cf280f9da1ab65ccd01fe9ed265e7')
+        judge-sse-header.patch)
+sha256sums=('fb63e946d5c2dd0df680851e84e65624a494ce87c999f2a4944e4f2d81bf4498'
+            'a6505b22363d7b1bbd6c9b4d503118e16129abf91e65885b7ee7f47f74ed9d00')
 
 prepare() {
   cd "$srcdir/autobahn-$pkgver"
@@ -47,8 +45,6 @@
   # [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() {

Deleted: issue1579.patch
===================================================================
--- issue1579.patch	2022-07-06 10:53:02 UTC (rev 1246707)
+++ issue1579.patch	2022-07-06 11:49:59 UTC (rev 1246708)
@@ -1,72 +0,0 @@
-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
-