From 7d8d9d161948329525d7e8af589654616d048965 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Wed, 22 May 2019 14:16:13 -0400 Subject: [PATCH] require torba 0.5.3 --- .travis.yml | 13 ++++++++----- scripts/wine_build.sh | 6 ++++-- setup.py | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97563d648..12b1bf284 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ jobs: name: "pylint lbrynet" install: - pip install astroid pylint - - pip install git+https://github.com/lbryio/torba.git#egg=torba + - pip install git+https://github.com/lbryio/torba.git#2626a28 - pip install -e . script: pylint lbrynet @@ -18,7 +18,7 @@ jobs: name: "Unit Tests" install: - pip install coverage - - pip install git+https://github.com/lbryio/torba.git#egg=torba + - pip install git+https://github.com/lbryio/torba.git#2626a28 - pip install -e . script: - HOME=/tmp coverage run -p --source=lbrynet -m unittest discover -vv tests.unit @@ -29,7 +29,10 @@ jobs: - name: "Integration Tests" install: - pip install tox-travis coverage - - pushd .. && git clone https://github.com/lbryio/torba.git && popd + - pushd .. + - git clone https://github.com/lbryio/torba.git + - git checkout 2626a28 + - popd script: tox after_success: - coverage combine tests/ @@ -38,7 +41,7 @@ jobs: - name: "Run Examples" install: - pip install coverage - - pip install git+https://github.com/lbryio/torba.git#egg=torba + - pip install git+https://github.com/lbryio/torba.git#2626a28 - pip install -e . script: - HOME=/tmp coverage run -p --source=lbrynet scripts/generate_json_api.py @@ -79,7 +82,7 @@ jobs: env: OS=linux install: - pip3 install pyinstaller - - pip3 install git+https://github.com/lbryio/torba.git + - pip3 install git+https://github.com/lbryio/torba.git#2626a28 - python3 scripts/set_build.py - pip3 install -e . script: diff --git a/scripts/wine_build.sh b/scripts/wine_build.sh index 175adbc11..d563e5edf 100755 --- a/scripts/wine_build.sh +++ b/scripts/wine_build.sh @@ -6,8 +6,10 @@ apt-get -qq update apt-get -qq install -y git pip install setuptools_scm -git clone https://github.com/lbryio/torba.git --depth 1 -cd torba && pip install -e . && cd .. +git clone https://github.com/lbryio/torba.git --depth 20 +cd torba +git checkout 2626a28e6 +pip install -e . && cd .. cd lbry diff --git a/setup.py b/setup.py index a4ebfa8d0..2023640f3 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ setup( 'console_scripts': 'lbrynet=lbrynet.extras.cli:main' }, install_requires=[ - 'torba', + 'torba==0.5.3', 'aiohttp==3.5.4', 'aioupnp', 'appdirs==1.4.3',