From d0ddaa551876edb6eb8abb8e76859fa51a18e488 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Wed, 5 Jun 2019 20:33:21 -0400 Subject: [PATCH] update `version` docstring, add `torba_version` --- lbrynet/extras/daemon/Daemon.py | 14 ++++++-------- lbrynet/extras/system_info.py | 2 ++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lbrynet/extras/daemon/Daemon.py b/lbrynet/extras/daemon/Daemon.py index 1111baae3..258c45788 100644 --- a/lbrynet/extras/daemon/Daemon.py +++ b/lbrynet/extras/daemon/Daemon.py @@ -807,16 +807,14 @@ class Daemon(metaclass=JSONRPCServerType): Returns: (dict) Dictionary of lbry version information { - 'build': (str) build type (e.g. "dev", "rc", "release"), - 'ip': (str) remote ip, if available, - 'lbrynet_version': (str) lbrynet_version, - 'lbryum_version': (str) lbryum_version, - 'lbryschema_version': (str) lbryschema_version, - 'os_release': (str) os release string - 'os_system': (str) os name - 'platform': (str) platform string 'processor': (str) processor type, 'python_version': (str) python version, + 'platform': (str) platform string, + 'os_release': (str) os release string, + 'os_system': (str) os name, + 'lbrynet_version': (str) lbrynet version, + 'torba_version': (str) torba version, + 'build': (str) "dev" | "qa" | "rc" | "release", } """ platform_info = system_info.get_platform() diff --git a/lbrynet/extras/system_info.py b/lbrynet/extras/system_info.py index d5b4897ab..9c651f491 100644 --- a/lbrynet/extras/system_info.py +++ b/lbrynet/extras/system_info.py @@ -3,6 +3,7 @@ import os import logging.handlers from lbrynet import build_type, __version__ as lbrynet_version +from torba import __version__ as torba_version log = logging.getLogger(__name__) @@ -18,6 +19,7 @@ def get_platform() -> dict: "os_release": platform.release(), "os_system": os_system, "lbrynet_version": lbrynet_version, + "torba_version": torba_version, "build": build_type.BUILD, # CI server sets this during build step } if p["os_system"] == "Linux":