split out UI deps into separate dist flavor - fixes #1532 (#1539)

split out UI deps into separate dist flavor - fixes #1532
crossbario · Mar 26, 2022 · ece9247 · ece9247
1 parent b0f4deb
commit ece9247
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 7 deletions.
diff --git a/autobahn/_version.py b/autobahn/_version.py
@@ -24,6 +24,6 @@
 #
 ###############################################################################
 
-__version__ = '22.3.1'
+__version__ = '22.3.2.dev1'
 
 __build__ = '00000000-0000000'
diff --git a/autobahn/xbr/_config.py b/autobahn/xbr/_config.py
@@ -64,7 +64,28 @@
 
 class Profile(object):
     """
-    User profile, stored as named section in ``${HOME}/.xbrnetwork/config.ini``.
+    User profile, stored as named section in ``${HOME}/.xbrnetwork/config.ini``:
+
+    .. code-block:: INI
+
+        [default]
+        # username used with this profile
+        username=joedoe
+
+        # user email used with the profile (e.g. for verification emails)
+        email=joe.doe@example.com
+
+        # XBR network node used as a directory server and gateway to XBR smart contracts
+        network_url=ws://localhost:8090/ws
+
+        # WAMP realm on network node, usually "xbrnetwork"
+        network_realm=xbrnetwork
+
+        # user private WAMP-cryptosign key (for client authentication)
+        cskey=0xb18bbe88ca0e189689e99f87b19addfb179d46aab3d59ec5d93a15286b949eb6
+
+        # user private Ethereum key (for signing transactions and e2e data encryption)
+        ethkey=0xfbada363e724d4db2faa2eeaa7d7aca37637b1076dd8cf6fefde13983abaa2ef
     """
 
     def __init__(self,

diff --git a/autobahn/xbr/_gui.py b/autobahn/xbr/_gui.py
@@ -182,7 +182,7 @@ def start(self):
             profile.cskey = None
             profile.username = None
             profile.email = None
-            profile.network_url = 'ws://thingcloud-box-aws.sthngs.crossbario.com:8090/ws'
+            profile.network_url = 'ws://localhost:8090/ws'
             profile.network_realm = 'xbrnetwork'
             profile.member_oid = None
             profile.vaction_oid = None

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -5,6 +5,11 @@
 Changelog
 =========
 
+master
+------
+
+* fix: split out UI deps into separate dist flavor (#1532)
+
 22.3.1
 ------
 

diff --git a/setup.py b/setup.py
@@ -141,15 +141,18 @@
     # the following is needed for XBR account synch and device pairing
     'spake2>=0.8',              # MIT license (https://github.com/warner/python-spake2/blob/master/LICENSE)
     'hkdf>=0.0.3',              # BSD 2-Clause "Simplified" License
+]
 
+# required for UI based tools, e.g. xbrnetwork-ui (autobahn.xbr._gui:_main)
+extras_require_ui = [
     # the following is needed for the graphical XBR onboarding UI
     'PyGObject>=3.40.0',        # GNU Lesser General Public License v2 or later (LGPLv2+) (GNU LGPL)
 ]
 
 # everything
 extras_require_all = extras_require_twisted + extras_require_accelerate + extras_require_compress + \
                      extras_require_serialization + extras_require_encryption + extras_require_scram + \
-                     extras_require_nvx
+                     extras_require_nvx + extras_require_xbr + extras_require_ui
 
 packages = [
     'autobahn',
@@ -284,6 +287,7 @@ def run_tests(self):
         'nvx': extras_require_nvx,
         'dev': extras_require_dev,
         'xbr': extras_require_xbr,
+        'ui': extras_require_ui,
     },
     tests_require=test_requirements,
     cmdclass={

diff --git a/tox.ini b/tox.ini
@@ -7,12 +7,12 @@ envlist =
 
     # CPython
     py37-{tw1910,tw203,tw221,twtrunk,asyncio}
-    # py38-{tw1910,tw203,tw221,twtrunk,asyncio}
-    # py39-{tw1910,tw203,tw221,twtrunk,asyncio}
+    py38-{tw1910,tw203,tw221,twtrunk,asyncio}
+    py39-{tw1910,tw203,tw221,twtrunk,asyncio}
     py310-{tw1910,tw203,tw221,twtrunk,asyncio}
 
     # PyPy
-    # pypy37-{tw1910,tw203,tw221,twtrunk,asyncio}
+    pypy37-{tw1910,tw203,tw221,twtrunk,asyncio}
     pypy38-{tw1910,tw203,tw221,twtrunk,asyncio}