removed lbryschema references from scripts and copied lbryschema requirements into local setup.py

This commit is contained in:
Lex Berezhny 2018-09-20 20:03:07 -04:00
parent e46f0e2444
commit 65cfc1f63c
5 changed files with 4 additions and 10 deletions

View file

@ -9,7 +9,7 @@
# Add files or directories to the blacklist. They should be base names, not # Add files or directories to the blacklist. They should be base names, not
# paths. # paths.
ignore=CVS ignore=CVS,schema
# Add files or directories matching the regex patterns to the # Add files or directories matching the regex patterns to the
# blacklist. The regex matches against base names, not paths. # blacklist. The regex matches against base names, not paths.

View file

@ -11,7 +11,6 @@ jobs:
install: install:
- pip install pylint - pip install pylint
- pip install git+https://github.com/lbryio/torba.git - pip install git+https://github.com/lbryio/torba.git
- pip install git+https://github.com/lbryio/lbryschema.git
- pip install -e . - pip install -e .
script: pylint lbrynet script: pylint lbrynet
@ -20,7 +19,6 @@ jobs:
name: "Unit Tests w/ Python 3.7" name: "Unit Tests w/ Python 3.7"
install: install:
- pip install coverage - 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/torba.git
- pip install git+https://github.com/lbryio/lbryumx.git#latest_rebased - pip install git+https://github.com/lbryio/lbryumx.git#latest_rebased
- pip install -e .[test] - pip install -e .[test]
@ -47,7 +45,6 @@ jobs:
- name: "Integration Tests" - name: "Integration Tests"
install: install:
- pip install tox-travis coverage - 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/torba.git && popd
- pushd .. && git clone https://github.com/lbryio/lbryumx.git && cd lbryumx && git checkout latest_rebased && cd .. && popd - pushd .. && git clone https://github.com/lbryio/lbryumx.git && cd lbryumx && git checkout latest_rebased && cd .. && popd
script: tox script: tox
@ -79,8 +76,6 @@ jobs:
install: install:
- pip3 install pyinstaller - pip3 install pyinstaller
- pip3 install git+https://github.com/lbryio/torba.git - 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 . - pip3 install -e .
script: script:
- pyinstaller -F -n lbrynet lbrynet/cli.py - pyinstaller -F -n lbrynet lbrynet/cli.py

View file

@ -5,14 +5,12 @@ rm -rf /tmp/.wine-*
apt-get -qq update apt-get -qq update
apt-get -qq install -y git 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/lbryio/torba.git --depth 1
git clone https://github.com/twisted/twisted.git --depth 1 --branch twisted-18.7.0 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 sed -i -e '172,184{s/^/#/}' twisted/src/twisted/python/_setup.py
pip install setuptools_scm pip install setuptools_scm
cd twisted && pip install -e .[tls] && cd .. cd twisted && pip install -e .[tls] && cd ..
cd lbryschema && pip install -e . && cd ..
cd torba && pip install -e . && cd .. cd torba && pip install -e . && cd ..
cd lbry cd lbry

View file

@ -32,7 +32,9 @@ setup(
'envparse', 'envparse',
'jsonrpc', 'jsonrpc',
'cryptography', 'cryptography',
'lbryschema', 'protobuf==3.2.0',
'jsonschema',
'ecdsa',
'torba', 'torba',
'pyyaml', 'pyyaml',
'requests', 'requests',

View file

@ -5,7 +5,6 @@ envlist = py37-integration
deps = deps =
coverage coverage
../torba[server] ../torba[server]
../lbryschema
../lbryumx ../lbryumx
extras = test extras = test
changedir = {toxinidir}/tests changedir = {toxinidir}/tests