From c7d3b6871dab9ae561096b694a9c5d2533e1efaf Mon Sep 17 00:00:00 2001 From: Stepan Snigirev Date: Thu, 9 Jul 2020 18:56:07 +0200 Subject: [PATCH 1/2] ignore version info if can't get it --- src/cryptoadvance/specter/helpers.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/cryptoadvance/specter/helpers.py b/src/cryptoadvance/specter/helpers.py index b95a473191..b52421ede1 100644 --- a/src/cryptoadvance/specter/helpers.py +++ b/src/cryptoadvance/specter/helpers.py @@ -168,16 +168,22 @@ def get_version_info(): the latest version and whether you should upgrade ''' name="cryptoadvance.specter" - latest_version = str(subprocess.run([sys.executable, '-m', 'pip', 'install', '{}==random'.format(name)], capture_output=True, text=True)) - latest_version = latest_version[latest_version.find('(from versions:')+15:] - latest_version = latest_version[:latest_version.find(')')] - latest_version = latest_version.replace(' ','').split(',')[-1] + try: + raise RuntimeError("asd") + latest_version = str(subprocess.run([sys.executable, '-m', 'pip', 'install', '{}==random'.format(name)], capture_output=True, text=True)) + latest_version = latest_version[latest_version.find('(from versions:')+15:] + latest_version = latest_version[:latest_version.find(')')] + latest_version = latest_version.replace(' ','').split(',')[-1] - current_version = str(subprocess.run([sys.executable, '-m', 'pip', 'show', '{}'.format(name)], capture_output=True, text=True)) - current_version = current_version[current_version.find('Version:')+8:] - current_version = current_version[:current_version.find('\\n')].replace(' ','') + current_version = str(subprocess.run([sys.executable, '-m', 'pip', 'show', '{}'.format(name)], capture_output=True, text=True)) + current_version = current_version[current_version.find('Version:')+8:] + current_version = current_version[:current_version.find('\\n')].replace(' ','') - return current_version, latest_version, latest_version != current_version + return current_version, latest_version, latest_version != current_version + except: + # if pip is not installed or we are using python3.6 or below + # we just don't show the version + return "Unknown version", "Unknown version", False def get_users_json(specter): users = [ From 0c904e685480869c34ba91878354c6cd7262a010 Mon Sep 17 00:00:00 2001 From: Stepan Snigirev Date: Thu, 9 Jul 2020 18:58:51 +0200 Subject: [PATCH 2/2] remove test raise --- src/cryptoadvance/specter/helpers.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cryptoadvance/specter/helpers.py b/src/cryptoadvance/specter/helpers.py index b52421ede1..613269c340 100644 --- a/src/cryptoadvance/specter/helpers.py +++ b/src/cryptoadvance/specter/helpers.py @@ -169,7 +169,6 @@ def get_version_info(): ''' name="cryptoadvance.specter" try: - raise RuntimeError("asd") latest_version = str(subprocess.run([sys.executable, '-m', 'pip', 'install', '{}==random'.format(name)], capture_output=True, text=True)) latest_version = latest_version[latest_version.find('(from versions:')+15:] latest_version = latest_version[:latest_version.find(')')]