From 543b327d09696b808c694ff6d5884fa415f183c3 Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 23 Mar 2016 22:06:04 -0400 Subject: [PATCH] use only six 1.9 on os x --- setup.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index b032122fb..36000670b 100644 --- a/setup.py +++ b/setup.py @@ -23,13 +23,19 @@ console_scripts = ['lbrynet-console = lbrynet.lbrynet_console.LBRYConsole:launch if sys.platform == 'darwin': console_scripts.append('lbrynet-daemon-status = lbrynet.lbrynet_daemon.LBRYOSXStatusBar:main') +requires = ['pycrypto', 'twisted', 'miniupnpc', 'yapsy', 'seccure', + 'python-bitcoinrpc==0.1', 'txJSON-RPC', 'requests>=2.4.2', 'unqlite==0.2.0', + 'leveldb', 'lbryum', 'jsonrpc', 'simplejson', 'appdirs'] + +if sys.platform == 'darwin': + requires.append('six==1.9.0') +else: + requires.append('six>=1.9.0') setup(name='lbrynet', version='0.0.4', packages=find_packages(), - install_requires=['six>=1.9.0', 'pycrypto', 'twisted', 'miniupnpc', 'yapsy', 'seccure', - 'python-bitcoinrpc==0.1', 'txJSON-RPC', 'requests>=2.4.2', 'unqlite==0.2.0', - 'leveldb', 'lbryum', 'jsonrpc', 'simplejson', 'appdirs'], + install_requires=requires, entry_points={'console_scripts': console_scripts}, data_files=[ ('lbrynet/lbrynet_console/plugins',