py3 in setup.py and tox config
This commit is contained in:
parent
21101386a2
commit
c86140a608
14
electrum
14
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"))
|
||||
|
|
8
setup.py
8
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',
|
||||
|
|
Loading…
Reference in New Issue