forked from LBRYCommunity/lbry-sdk
residual fixes after lbrynet -> lbry move
This commit is contained in:
parent
f5e38f6e23
commit
fe7224e537
7 changed files with 10 additions and 10 deletions
2
Makefile
2
Makefile
|
@ -3,6 +3,6 @@ install:
|
||||||
cd lbry && pip install -e .
|
cd lbry && pip install -e .
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
cd lbry && pylint lbrynet
|
cd lbry && pylint lbry
|
||||||
cd torba && pylint --rcfile=setup.cfg torba
|
cd torba && pylint --rcfile=setup.cfg torba
|
||||||
cd torba && mypy --ignore-missing-imports torba
|
cd torba && mypy --ignore-missing-imports torba
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
.tox
|
.tox
|
||||||
__pycache__
|
__pycache__
|
||||||
dist
|
dist
|
||||||
lbrynet.egg-info
|
lbry.egg-info
|
||||||
docs
|
docs
|
||||||
tests
|
tests
|
||||||
|
|
2
lbry/.gitignore
vendored
2
lbry/.gitignore
vendored
|
@ -6,7 +6,7 @@
|
||||||
/.coverage
|
/.coverage
|
||||||
/lbry-venv
|
/lbry-venv
|
||||||
|
|
||||||
lbrynet.egg-info
|
lbry.egg-info
|
||||||
__pycache__
|
__pycache__
|
||||||
_trial_temp/
|
_trial_temp/
|
||||||
|
|
||||||
|
|
|
@ -12,12 +12,12 @@ from docopt import docopt
|
||||||
import aiohttp
|
import aiohttp
|
||||||
from aiohttp.web import GracefulExit
|
from aiohttp.web import GracefulExit
|
||||||
|
|
||||||
from lbry import __name__ as lbrynet_name, __version__ as lbrynet_version
|
from lbry import __version__ as lbrynet_version
|
||||||
from lbry.extras.daemon.loggly_handler import get_loggly_handler
|
from lbry.extras.daemon.loggly_handler import get_loggly_handler
|
||||||
from lbry.conf import Config, CLIConfig
|
from lbry.conf import Config, CLIConfig
|
||||||
from lbry.extras.daemon.Daemon import Daemon
|
from lbry.extras.daemon.Daemon import Daemon
|
||||||
|
|
||||||
log = logging.getLogger(lbrynet_name)
|
log = logging.getLogger('lbry')
|
||||||
log.addHandler(logging.NullHandler())
|
log.addHandler(logging.NullHandler())
|
||||||
|
|
||||||
|
|
||||||
|
@ -231,7 +231,7 @@ def main(argv=None):
|
||||||
ensure_directory_exists(directory)
|
ensure_directory_exists(directory)
|
||||||
|
|
||||||
if args.cli_version:
|
if args.cli_version:
|
||||||
print(f"{lbrynet_name} {lbrynet_version}")
|
print(f"lbrynet {lbrynet_version}")
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
elif args.command == 'start':
|
elif args.command == 'start':
|
||||||
|
|
|
@ -28,7 +28,7 @@ EXPOSE 5280
|
||||||
EXPOSE 50002
|
EXPOSE 50002
|
||||||
# blockchain
|
# blockchain
|
||||||
EXPOSE 9246
|
EXPOSE 9246
|
||||||
ENV TORBA_LEDGER lbrynet.wallet
|
ENV TORBA_LEDGER lbry.wallet
|
||||||
|
|
||||||
RUN /usr/local/bin/orchstr8 download
|
RUN /usr/local/bin/orchstr8 download
|
||||||
ENTRYPOINT ["/usr/local/bin/orchstr8"]
|
ENTRYPOINT ["/usr/local/bin/orchstr8"]
|
||||||
|
|
|
@ -18,5 +18,5 @@ cd lbry
|
||||||
pip install -e .
|
pip install -e .
|
||||||
pip install pywin32
|
pip install pywin32
|
||||||
|
|
||||||
pyinstaller --additional-hooks-dir=scripts/. --icon=icons/lbry256.ico -F -n lbrynet lbrynet/extras/cli.py
|
pyinstaller --additional-hooks-dir=scripts/. --icon=icons/lbry256.ico -F -n lbrynet lbry/extras/cli.py
|
||||||
wine dist/lbrynet.exe --version
|
wine dist/lbrynet.exe --version
|
||||||
|
|
|
@ -10,7 +10,7 @@ extras = test
|
||||||
changedir = {toxinidir}/tests
|
changedir = {toxinidir}/tests
|
||||||
setenv =
|
setenv =
|
||||||
HOME=/tmp
|
HOME=/tmp
|
||||||
TORBA_LEDGER=lbrynet.wallet
|
TORBA_LEDGER=lbry.wallet
|
||||||
commands =
|
commands =
|
||||||
orchstr8 download
|
orchstr8 download
|
||||||
coverage run -p --source={envsitepackagesdir}/lbrynet -m unittest discover -vv integration
|
coverage run -p --source={envsitepackagesdir}/lbry -m unittest discover -vv integration
|
||||||
|
|
Loading…
Reference in a new issue