From 5787938d049f1d36978ffb6c03529c85744f65a0 Mon Sep 17 00:00:00 2001
From: Roger Taylor <32600614+rt121212121@users.noreply.github.com>
Date: Tue, 29 May 2018 19:28:34 +1200
Subject: [PATCH] Minimum python version of 3.5.2 in all checks. Include
Python version 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)
---
electron-cash | 4 ++--
gui/qt/exception_window.py | 2 ++
setup-release.py | 4 ++--
setup.py | 4 ++--
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/electron-cash b/electron-cash
index a111a7e380f8..ea2ea1b117b1 100755
--- a/electron-cash
+++ b/electron-cash
@@ -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
diff --git a/gui/qt/exception_window.py b/gui/qt/exception_window.py
index f836e9da9215..dbb42d6619ea 100644
--- a/gui/qt/exception_window.py
+++ b/gui/qt/exception_window.py
@@ -47,6 +47,7 @@
Additional information
- Electron Cash version: {app_version}
+ - Python version: {python_version}
- Operating system: {os}
- Wallet type: {wallet_type}
- Locale: {locale}
@@ -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],
diff --git a/setup-release.py b/setup-release.py
index d9631a80d299..8e35844542c5 100644
--- a/setup-release.py
+++ b/setup-release.py
@@ -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':
diff --git a/setup.py b/setup.py
index bf9fe66af76d..89fe6484121d 100755
--- a/setup.py
+++ b/setup.py
@@ -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 = []