Skip to content

Commit

Permalink
Minimum python version of 3.5.2 in all checks. Include Python version…
Browse files Browse the repository at this point in the history
… string in exceptions reported to the crash server (reports still make it to the issues list, despite no changes to the crash server to handle the extra data). (#708)
  • Loading branch information
rt121212121 authored and Neil committed May 29, 2018
1 parent fe303c9 commit 5787938
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions electron-cash
Expand Up @@ -30,8 +30,8 @@ import os

import sys

if sys.version_info < (3, 5):
sys.exit("Error: Must be using Python 3.5 or higher")
if sys.version_info < (3, 5, 2):
sys.exit("Error: Must be using Python 3.5.2 or higher")

# from https://gist.github.com/tito/09c42fb4767721dc323d
import threading
Expand Down
2 changes: 2 additions & 0 deletions gui/qt/exception_window.py
Expand Up @@ -47,6 +47,7 @@
<h2>Additional information</h2>
<ul>
<li>Electron Cash version: {app_version}</li>
<li>Python version: {python_version}</li>
<li>Operating system: {os}</li>
<li>Wallet type: {wallet_type}</li>
<li>Locale: {locale}</li>
Expand Down Expand Up @@ -146,6 +147,7 @@ def get_traceback_info(self):
def get_additional_info(self):
args = {
"app_version": PACKAGE_VERSION,
"python_version": sys.version,
"os": platform.platform(),
"wallet_type": "unknown",
"locale": locale.getdefaultlocale()[0],
Expand Down
4 changes: 2 additions & 2 deletions setup-release.py
Expand Up @@ -21,8 +21,8 @@
name = "Electron-Cash"
mainscript = 'electron-cash'

if sys.version_info[:3] < (3, 0, 0):
print_error("Error: " + name + " requires Python version >= 3.0.0...")
if sys.version_info[:3] < (3, 5, 2):
print_error("Error: " + name + " requires Python version >= 3.5.2...")
sys.exit(1)

if sys.platform == 'darwin':
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -17,8 +17,8 @@

version = imp.load_source('version', 'lib/version.py')

if sys.version_info[:3] < (3, 5, 0):
sys.exit("Error: Electron Cash requires Python version >= 3.5.0...")
if sys.version_info[:3] < (3, 5, 2):
sys.exit("Error: Electron Cash requires Python version >= 3.5.2...")

data_files = []

Expand Down

0 comments on commit 5787938

Please sign in to comment.