AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge remote-tracking branch 'lillypad/master'

Browse Source
This commit is contained in:
Johann Bauer
2018-02-11 16:21:32 +01:00
parent f8df8d60c4 c44427d33e
commit f9a3edc2a2
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
requirements.txt Normal file
View File

@@ -0,0 +1,9 @@
pyaes>=0.1a1
ecdsa>=0.9
pbkdf2
requests
qrcode
protobuf
dnspython
jsonrpclib-pelix
PySocks>=1.6.6

17
setup.py
View File

@@ -9,6 +9,9 @@ import platform
import imp import imp
import argparse import argparse
with open('requirements.txt') as f:
requirements = f.read().splitlines()
with open('requirements-hw.txt') as f: with open('requirements-hw.txt') as f:
requirements_hw = f.read().splitlines() requirements_hw = f.read().splitlines()
@@ -17,7 +20,7 @@ version = imp.load_source('version', 'lib/version.py')
if sys.version_info[:3] < (3, 4, 0): if sys.version_info[:3] < (3, 4, 0):
sys.exit("Error: Electrum requires Python version >= 3.4.0...") sys.exit("Error: Electrum requires Python version >= 3.4.0...")
data_files = ['requirements-hw.txt'] data_files = ['requirements.txt', 'requirements-hw.txt']
if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']: if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']:
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
@@ -38,17 +41,7 @@ if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']:
setup( setup(
name="Electrum", name="Electrum",
version=version.ELECTRUM_VERSION, version=version.ELECTRUM_VERSION,
install_requires=[ install_requires=requirements,
'pyaes>=0.1a1',
'ecdsa>=0.9',
'pbkdf2',
'requests',
'qrcode',
'protobuf',
'dnspython',
'jsonrpclib-pelix',
'PySocks>=1.6.6',
],
extras_require={ extras_require={
'hardware': requirements_hw, 'hardware': requirements_hw,
}, },