Merge branch 'versioning' into development

This commit is contained in:
Jimmy Kiselak 2016-03-23 22:07:11 -04:00
commit 5d4846cf60
2 changed files with 3 additions and 2 deletions

View file

@ -4,4 +4,5 @@ import logging
logging.getLogger(__name__).addHandler(logging.NullHandler()) logging.getLogger(__name__).addHandler(logging.NullHandler())
__version__ = (0, 2, 0) version = (0, 2, 0)
__version__ = ".".join([str(x) for x in version])

View file

@ -33,7 +33,7 @@ gui_data_files = ['close2.gif', 'lbry-dark-242x80.gif', 'lbry-dark-icon.xbm', 'l
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', setup(name='lbrynet',
version='.'.join([str(x) for x in __version__]), version=__version__,
packages=find_packages(base_dir), packages=find_packages(base_dir),
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'], 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'],
entry_points={'console_scripts': console_scripts}, entry_points={'console_scripts': console_scripts},