Merge branch 'master' into development

This commit is contained in:
Jack 2016-03-29 16:34:47 -04:00
commit 4dfc3ff94c
3 changed files with 33 additions and 2 deletions

View file

@ -87,7 +87,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
except jsonrpclib.Fault, f: except jsonrpclib.Fault, f:
self._cbRender(f, request, id, version) self._cbRender(f, request, id, version)
else: else:
request.setHeader('Access-Control-Allow-Origin', UI_ADDRESS) request.setHeader("Access-Control-Allow-Origin", "*")
request.setHeader("content-type", "text/json") request.setHeader("content-type", "text/json")
if args == [{}]: if args == [{}]:
d = defer.maybeDeferred(function) d = defer.maybeDeferred(function)

27
requirements.txt Normal file
View file

@ -0,0 +1,27 @@
Twisted==16.0.0
Yapsy==1.11.223
appdirs==1.4.0
argparse==1.2.1
colorama==0.3.7
dnspython==1.12.0
ecdsa==0.13
gmpy==1.17
jsonrpc==1.2
jsonrpclib==0.1.7
https://github.com/lbryio/lbryum/tarball/master/#egg=lbryum
leveldb==0.193
miniupnpc==1.9
pbkdf2==1.3
protobuf==3.0.0b2
pycrypto==2.6.1
python-bitcoinrpc==0.1
qrcode==5.2.2
requests==2.9.1
seccure==0.3.1.3
simplejson==3.8.2
six==1.10.0
slowaes==0.1a1
txJSON-RPC==0.3.1
unqlite==0.2.0
wsgiref==0.1.2
zope.interface==4.1.3

View file

@ -37,7 +37,11 @@ gui_data_files = ['close2.gif', 'lbry-dark-242x80.gif', 'lbry-dark-icon.xbm', 'l
'drop_down.gif', 'show_options.gif', 'hide_options.gif', 'lbry.conf'] 'drop_down.gif', 'show_options.gif', 'hide_options.gif', 'lbry.conf']
gui_data_paths = [os.path.join(base_dir, 'lbrynet', 'lbrynet_gui', f) for f in gui_data_files] gui_data_paths = [os.path.join(base_dir, 'lbrynet', 'lbrynet_gui', f) for f in gui_data_files]
setup(name='lbrynet', version='.'.join([str(x) for x in __version__]), setup(name='lbrynet',
description='A fully decentralized network for distributing data',
version=__version__,
maintainer='Jimmy Kiselak',
maintainer_email='jimmy@lbry.io',
packages=find_packages(base_dir), packages=find_packages(base_dir),
install_requires=requires, install_requires=requires,
entry_points={'console_scripts': console_scripts}, entry_points={'console_scripts': console_scripts},