electrum

commit c86140a6082b60ea8addd0a4d5a5617e38e8ab4d
parent 21101386a2754d52f4273247fdeb234abc810f28
Author: Dmitry Sorokin <asfins@gmail.com>
Date:   Sun,  5 Feb 2017 14:31:17 +0300

py3 in setup.py and tox config

Diffstat:
M
electrum
 | 
14
+-------------
M
setup.py
 | 
8
++++----
M
tox.ini
 | 
2
+-

3 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/electrum b/electrum
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- mode: python -*-
 #
 # Electrum - lightweight Bitcoin client
@@ -23,11 +23,6 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import os
 import sys
 import six
@@ -47,13 +42,6 @@ if jnius:
             jnius.detach()
     threading.Thread.run = thread_check_run
 
-# monkeypatch unicode constructor for py3
-# if six.PY3:
-#     import builtins
-    # builtins.unicode = str
-    # builtins.QString = str
-    # builtins.long = int
-
 script_dir = os.path.dirname(os.path.realpath(__file__))
 is_bundle = getattr(sys, 'frozen', False)
 is_local = not is_bundle and os.path.exists(os.path.join(script_dir, "setup-release.py"))
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # python setup.py sdist --format=zip,gztar
 
@@ -11,8 +11,8 @@ import argparse
 
 version = imp.load_source('version', 'lib/version.py')
 
-if sys.version_info[:3] < (2, 7, 0):
-    sys.exit("Error: Electrum requires Python version >= 2.7.0...")
+if sys.version_info[:3] < (3, 4, 0):
+    sys.exit("Error: Electrum requires Python version >= 3.4.0...")
 
 data_files = []
 
@@ -36,7 +36,7 @@ setup(
     name="Electrum",
     version=version.ELECTRUM_VERSION,
     install_requires=[
-        'pyaes',
+        'pyaes>=0.1a1',
         'ecdsa>=0.9',
         'pbkdf2',
         'requests',
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27
+envlist = py34
 
 [testenv]
 deps=