renamed build binary to lbrynet and other cleanup
This commit is contained in:
Lex Berezhny
Jack Robison
parent
d54d989c40
commit
4da40e8d52
5 changed files with 45 additions and 91 deletions
31
.gitignore
vendored
31
.gitignore
vendored
|
|
@ -1,26 +1,9 @@
|
|||
*.pyc
|
||||
*.egg
|
||||
*.so
|
||||
*.xml
|
||||
*.iml
|
||||
*.log
|
||||
*.pem
|
||||
*.decTest
|
||||
*.prof
|
||||
.#*
|
||||
/build
|
||||
/dist
|
||||
/.tox
|
||||
/.idea
|
||||
/.coverage
|
||||
|
||||
/build/build
|
||||
/build/dist
|
||||
/bulid/requirements_base.txt
|
||||
|
||||
/lbrynet.egg-info
|
||||
/docs_build
|
||||
/lbry-venv
|
||||
|
||||
.tox/
|
||||
.idea/
|
||||
.coverage
|
||||
.DS_Store
|
||||
|
||||
# temporary files from the twisted.trial test runner
|
||||
lbrynet.egg-info
|
||||
__pycache__
|
||||
_trial_temp/
|
||||
|
|
|
|||
14
.travis.yml
14
.travis.yml
|
|
@ -53,7 +53,7 @@ jobs:
|
|||
artifacts:
|
||||
working_dir: dist
|
||||
paths:
|
||||
- lbry.exe
|
||||
- lbrynet.exe
|
||||
target_paths:
|
||||
- /daemon/build-${TRAVIS_BUILD_NUMBER}_commit-${TRAVIS_COMMIT:0:7}_branch-${TRAVIS_BRANCH}$([ ! -z ${TRAVIS_TAG} ] && echo _tag-${TRAVIS_TAG})/win
|
||||
|
||||
|
|
@ -64,13 +64,13 @@ jobs:
|
|||
- pip install git+https://github.com/lbryio/lbryschema.git
|
||||
- pip install -e .
|
||||
script:
|
||||
- pyinstaller -F -n lbry lbrynet/cli.py
|
||||
- ./dist/lbry --version
|
||||
- pyinstaller -F -n lbrynet lbrynet/cli.py
|
||||
- ./dist/lbrynet --version
|
||||
addons:
|
||||
artifacts:
|
||||
working_dir: dist
|
||||
paths:
|
||||
- lbry
|
||||
- lbrynet
|
||||
target_paths:
|
||||
- /daemon/build-${TRAVIS_BUILD_NUMBER}_commit-${TRAVIS_COMMIT:0:7}_branch-${TRAVIS_BRANCH}$([ ! -z ${TRAVIS_TAG} ] && echo _tag-${TRAVIS_TAG})/linux
|
||||
|
||||
|
|
@ -84,13 +84,13 @@ jobs:
|
|||
- pip3 install git+https://github.com/lbryio/lbryschema.git
|
||||
- pip3 install -e .
|
||||
script:
|
||||
- pyinstaller -F -n lbry lbrynet/cli.py
|
||||
- ./dist/lbry --version
|
||||
- pyinstaller -F -n lbrynet lbrynet/cli.py
|
||||
- ./dist/lbrynet --version
|
||||
addons:
|
||||
artifacts:
|
||||
working_dir: dist
|
||||
paths:
|
||||
- lbry
|
||||
- lbrynet
|
||||
target_paths:
|
||||
- /daemon/build-${TRAVIS_BUILD_NUMBER}_commit-${TRAVIS_COMMIT:0:7}_branch-${TRAVIS_BRANCH}$([ ! -z ${TRAVIS_TAG} ] && echo _tag-${TRAVIS_TAG})/mac
|
||||
|
||||
|
|
|
|||
|
|
@ -1074,7 +1074,7 @@ class Daemon(AuthJSONRPCServer):
|
|||
Stop lbrynet-daemon
|
||||
|
||||
Usage:
|
||||
daemon_stop
|
||||
stop
|
||||
|
||||
Options:
|
||||
None
|
||||
|
|
|
|||
|
|
@ -17,5 +17,5 @@ cd torba && pip install -e . && cd ..
|
|||
|
||||
cd lbry
|
||||
pip install -e .
|
||||
pyinstaller -F -n lbry lbrynet/cli.py
|
||||
wine dist/lbry.exe --version
|
||||
pyinstaller -F -n lbrynet lbrynet/cli.py
|
||||
wine dist/lbrynet.exe --version
|
||||
|
|
|
|||
85
setup.py
85
setup.py
|
|
@ -1,79 +1,50 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
import os
|
||||
from lbrynet import __version__
|
||||
from setuptools import setup, find_packages
|
||||
|
||||
# TODO: find a way to keep this in sync with requirements.txt
|
||||
#
|
||||
# Note though that this list is intentionally less restrictive than
|
||||
# requirements.txt. This is only the libraries that are direct
|
||||
# dependencies of the lbrynet library. requirements.txt includes
|
||||
# dependencies of dependencies and specific versions that we know
|
||||
# all work together.
|
||||
#
|
||||
# See https://packaging.python.org/requirements/ and
|
||||
# https://caremad.io/posts/2013/07/setup-vs-requirement/ for more details.
|
||||
requires = [
|
||||
'aiohttp',
|
||||
'twisted[tls]',
|
||||
'appdirs',
|
||||
'distro',
|
||||
'base58',
|
||||
'envparse',
|
||||
'jsonrpc',
|
||||
'cryptography',
|
||||
'lbryschema',
|
||||
'torba',
|
||||
'miniupnpc',
|
||||
'txupnp==0.0.1a11',
|
||||
'pyyaml',
|
||||
'requests',
|
||||
'txJSON-RPC',
|
||||
'zope.interface',
|
||||
'treq',
|
||||
'docopt',
|
||||
'colorama==0.3.7',
|
||||
'six',
|
||||
]
|
||||
|
||||
console_scripts = [
|
||||
'lbrynet-daemon = lbrynet.daemon.DaemonControl:start',
|
||||
'lbrynet-cli = lbrynet.daemon.DaemonCLI:main',
|
||||
'lbrynet-console = lbrynet.daemon.DaemonConsole:main'
|
||||
]
|
||||
|
||||
|
||||
def package_files(directory):
|
||||
for path, _, filenames in os.walk(directory):
|
||||
for filename in filenames:
|
||||
yield os.path.join('..', path, filename)
|
||||
|
||||
|
||||
base_dir = os.path.abspath(os.path.dirname(__file__))
|
||||
# Get the long description from the README file
|
||||
with open(os.path.join(base_dir, 'README.md'), 'rb') as f:
|
||||
long_description = f.read().decode('utf-8')
|
||||
BASE = os.path.dirname(__file__)
|
||||
README_PATH = os.path.join(BASE, 'README.md')
|
||||
|
||||
setup(
|
||||
name="lbry",
|
||||
name="lbrynet",
|
||||
version=__version__,
|
||||
author="LBRY Inc.",
|
||||
author_email="hello@lbry.io",
|
||||
url="https://lbry.io",
|
||||
description="A decentralized media library and marketplace",
|
||||
long_description=long_description,
|
||||
long_description=open(README_PATH).read(),
|
||||
keywords="lbry protocol media",
|
||||
license='MIT',
|
||||
python_requires='>=3.6',
|
||||
packages=find_packages(exclude=('tests',)),
|
||||
install_requires=requires,
|
||||
entry_points={'console_scripts': console_scripts},
|
||||
zip_safe=False,
|
||||
entry_points={
|
||||
'console_scripts': 'lbrynet=lbrynet.cli:main'
|
||||
},
|
||||
install_requires=[
|
||||
'aiohttp',
|
||||
'twisted[tls]',
|
||||
'appdirs',
|
||||
'distro',
|
||||
'base58',
|
||||
'envparse',
|
||||
'jsonrpc',
|
||||
'cryptography',
|
||||
'lbryschema',
|
||||
'torba',
|
||||
'upnpclient',
|
||||
'pyyaml',
|
||||
'requests',
|
||||
'txJSON-RPC',
|
||||
'treq',
|
||||
'docopt',
|
||||
'colorama==0.3.7',
|
||||
'six'
|
||||
],
|
||||
extras_require={
|
||||
'test': (
|
||||
'mock>=2.0,<3.0',
|
||||
'faker>=0.8,<1.0'
|
||||
'faker==0.8'
|
||||
)
|
||||
}
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue