From 69851a6588c589658d9be7a867b94d8cd78defae Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Fri, 24 Aug 2018 16:44:26 -0400 Subject: [PATCH] README and other post lbryum-refactor merge cleanup (#1388) * updated README with correct Python version, point code coverage to codecov, added header icon and fixed jacks email link * removed .appveyor.yml, requirements.txt, requirements_testing.txt --- .appveyor.yml | 48 ---------------------------------------- README.md | 15 +++++-------- requirements.txt | 28 ----------------------- requirements_testing.txt | 3 --- 4 files changed, 6 insertions(+), 88 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 requirements.txt delete mode 100644 requirements_testing.txt diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 5c42f7fbe..000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,48 +0,0 @@ -version: 1.0.{build} - -branches: - only: - - master - -environment: - GH_TOKEN: - secure: LiI5jyuHUw6XbH4kC3gP1HX4P/v4rwD/gCNtaFhQu2AvJz1/1wALkp5ECnIxRySN - key_pass: - secure: u6DydPcdrUJlxGL9uc7yQRYG8+5rY6aAEE9nfCSzFyNzZlX9NniOp8Uh5ZKQqX7bGEngLI6ipbLfiJvn0XFnhbn2iTkOuMqOXVJVOehvwlQ= - pfx_key: - secure: 1mwqyRy7hDqDjDK+TIAoaXyXzpNgwruFNA6TPkinUcVM7A+NLD33RQLnfnwVy+R5ovD2pUfhQ6+N0Fqebv6tZh436LIEsock+6IOdpgFwrg= - AWS_ACCESS_KEY_ID: - secure: iVGwoJ7ogspjSmuqr+haVPLglSgQsp6tUZx6mIlKH7Q= - AWS_SECRET_ACCESS_KEY: - secure: zKaqdZGPl0exDL5YhJkb33prSemC9Rzg9S7Lw2wFy1WnJ6ffgl6mQH7jqJDUTqsY - -#notifications: -# - provider: Slack -# incoming_webhook: -# secure: LuxwG5OZnnA//gmSXzCKu8/FRqYjCgGfVFqajSsGHeQ1HQNp7rYNhQpsO8/3PK63xKJj3wzt86DJekf9q9Q5OcHa9AHXUQbEveX0psd7elw= - - -clone_folder: c:\projects\lbry - -test_script: -- cd C:\projects\lbry\ -- pip install cython -- pip install mock pylint unqlite Faker -- pip install . -- pylint lbrynet -# disable tests for now so that appveyor can build the app -- set PYTHONPATH=. -- trial lbrynet.tests -# TODO: integration tests do not work -#- python -m unittest discover tests/integration -#- rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger - - -build_script: -- cd C:\projects\lbry\build\ -- ps: .\build.ps1 - - -artifacts: -- path: build\dist\*.zip - name: lbrynet-daemon diff --git a/README.md b/README.md index 2813a7fc7..d777f9855 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,10 @@ -# LBRY - -[![Build Status](https://travis-ci.org/lbryio/lbry.svg?branch=master)](https://travis-ci.org/lbryio/lbry) -[![Coverage Status](https://coveralls.io/repos/github/lbryio/lbry/badge.svg)](https://coveralls.io/github/lbryio/lbry) +# LBRY LBRY [![Build Status](https://travis-ci.org/lbryio/lbry.svg?branch=master)](https://travis-ci.org/lbryio/lbry) [![Test Coverage](https://codecov.io/gh/lbryio/lbry/branch/master/graph/badge.svg)](https://codecov.io/gh/lbryio/lbry) LBRY is an open-source protocol providing distribution, discovery, and purchase of digital content (data) via a decentralized network. It utilizes the [LBRY blockchain](https://github.com/lbryio/lbrycrd) as a global namespace and database of digital content. Blockchain entries contain searchable content metadata, identities, and rights and access rules. LBRY also provides a data network that consists of peers uploading and downloading data from other peers, possibly in exchange for payments, and a distributed hash table, used by peers to discover other peers. This project aims to provide a daemon that can interact with the network via a json-rpc interface over HTTP. -The project is written in python2.7 and extensively uses Twisted framework. +The project is written in Python 3.7+ and extensively uses Twisted framework. ## Installation @@ -20,9 +17,9 @@ Our [releases page](https://github.com/lbryio/lbry/releases) contains pre-built ## Usage -Run `lbrynet-daemon` to launch the daemon. +Run `lbrynet start` to launch the daemon. -By default, `lbrynet-daemon` will provide a JSON-RPC server at `http://localhost:5279`. It is easy to interact with via cURL or sane programming languages. +By default, `lbrynet` will provide a JSON-RPC server at `http://localhost:5279`. It is easy to interact with via cURL or sane programming languages. Our [quickstart guide](http://lbry.io/quickstart) provides a simple walkthrough and examples for learning. @@ -46,8 +43,8 @@ We take security seriously. Please contact security@lbry.io regarding any securi ## Contact -The primary contact for this project is @jackrobison(jack@lbry.io) +The primary contact for this project is [@jackrobison](mailto:jack@lbry.io) ## Additional information and links -The documentation for the api can be found [here](https://lbry.io/api). \ No newline at end of file +The documentation for the api can be found [here](https://lbry.io/api). diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index a8d87a846..000000000 --- a/requirements.txt +++ /dev/null @@ -1,28 +0,0 @@ -certifi==2018.4.16 -Twisted==18.7.0'= -cryptography==2.3 -appdirs==1.4.3 -argparse==1.2.1 -docopt==0.6.2 -base58==1.0.0 -colorama==0.3.7 -dnspython==1.12.0 -ecdsa==0.13 -envparse==0.2.0 -GitPython==2.1.3 -jsonrpc==1.2 -keyring==10.4.0 -git+https://github.com/lbryio/lbryschema.git@v0.0.16#egg=lbryschema -miniupnpc==1.9 -pbkdf2==1.3 -pyyaml==3.12 -PyGithub==1.34 -qrcode==5.2.2 -requests==2.9.1 -service_identity==16.0.0 -six>=1.9.0 -slowaes==0.1a1 -txJSON-RPC==0.5 -treq==17.8.0 -typing -git+https://github.com/lbryio/torba.git#egg=torba diff --git a/requirements_testing.txt b/requirements_testing.txt deleted file mode 100644 index c88f6d749..000000000 --- a/requirements_testing.txt +++ /dev/null @@ -1,3 +0,0 @@ -mock>=2.0,<3.0 -Faker==0.8.17 -git+https://github.com/lbryio/orchstr8.git#egg=orchstr8