From 65cfc1f63c099a381c115015d94ae61487a6bd9a Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Thu, 20 Sep 2018 20:03:07 -0400 Subject: [PATCH] removed lbryschema references from scripts and copied lbryschema requirements into local setup.py --- .pylintrc | 2 +- .travis.yml | 5 ----- scripts/wine_build.sh | 2 -- setup.py | 4 +++- tox.ini | 1 - 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.pylintrc b/.pylintrc index ada0377dd..99ef868eb 100644 --- a/.pylintrc +++ b/.pylintrc @@ -9,7 +9,7 @@ # Add files or directories to the blacklist. They should be base names, not # paths. -ignore=CVS +ignore=CVS,schema # Add files or directories matching the regex patterns to the # blacklist. The regex matches against base names, not paths. diff --git a/.travis.yml b/.travis.yml index 750950345..269499ad9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ jobs: install: - pip install pylint - pip install git+https://github.com/lbryio/torba.git - - pip install git+https://github.com/lbryio/lbryschema.git - pip install -e . script: pylint lbrynet @@ -20,7 +19,6 @@ jobs: name: "Unit Tests w/ Python 3.7" install: - pip install coverage - - pip install git+https://github.com/lbryio/lbryschema.git - pip install git+https://github.com/lbryio/torba.git - pip install git+https://github.com/lbryio/lbryumx.git#latest_rebased - pip install -e .[test] @@ -47,7 +45,6 @@ jobs: - name: "Integration Tests" install: - pip install tox-travis coverage - - pushd .. && git clone https://github.com/lbryio/lbryschema.git && popd - pushd .. && git clone https://github.com/lbryio/torba.git && popd - pushd .. && git clone https://github.com/lbryio/lbryumx.git && cd lbryumx && git checkout latest_rebased && cd .. && popd script: tox @@ -79,8 +76,6 @@ jobs: install: - pip3 install pyinstaller - pip3 install git+https://github.com/lbryio/torba.git - - pip3 install git+https://github.com/lbryio/lbryschema.git - - python scripts/set_build.py - pip3 install -e . script: - pyinstaller -F -n lbrynet lbrynet/cli.py diff --git a/scripts/wine_build.sh b/scripts/wine_build.sh index e6c8130f6..186fbdd31 100755 --- a/scripts/wine_build.sh +++ b/scripts/wine_build.sh @@ -5,14 +5,12 @@ rm -rf /tmp/.wine-* apt-get -qq update apt-get -qq install -y git -git clone https://github.com/lbryio/lbryschema.git --depth 1 git clone https://github.com/lbryio/torba.git --depth 1 git clone https://github.com/twisted/twisted.git --depth 1 --branch twisted-18.7.0 sed -i -e '172,184{s/^/#/}' twisted/src/twisted/python/_setup.py pip install setuptools_scm cd twisted && pip install -e .[tls] && cd .. -cd lbryschema && pip install -e . && cd .. cd torba && pip install -e . && cd .. cd lbry diff --git a/setup.py b/setup.py index b901dfdbe..f54cb8f3e 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,9 @@ setup( 'envparse', 'jsonrpc', 'cryptography', - 'lbryschema', + 'protobuf==3.2.0', + 'jsonschema', + 'ecdsa', 'torba', 'pyyaml', 'requests', diff --git a/tox.ini b/tox.ini index 5cd0e0aad..dbddb79aa 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,6 @@ envlist = py37-integration deps = coverage ../torba[server] - ../lbryschema ../lbryumx extras = test changedir = {toxinidir}/tests