From 8f26010c047192beb9d8c3da60932dfef9bcb497 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Fri, 29 Jul 2022 22:06:31 -0300 Subject: [PATCH] make libtorrent a normal dependency --- .github/workflows/main.yml | 4 ++-- setup.py | 2 +- tox.ini | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index df2988216..39991c1c7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: key: ${{ runner.os }}-pip-${{ hashFiles('setup.py') }} restore-keys: ${{ runner.os }}-pip- - run: pip install --user --upgrade pip wheel - - run: pip install -e .[torrent,lint] + - run: pip install -e .[lint] - run: make lint tests-unit: @@ -50,7 +50,7 @@ jobs: string: ${{ runner.os }} - run: python -m pip install --user --upgrade pip wheel - if: startsWith(runner.os, 'linux') - run: pip install -e .[torrent,test] + run: pip install -e .[test] - if: startsWith(runner.os, 'linux') env: HOME: /tmp diff --git a/setup.py b/setup.py index c8d3f6018..bc2ca6013 100644 --- a/setup.py +++ b/setup.py @@ -46,9 +46,9 @@ setup( 'coincurve==15.0.0', 'pbkdf2==1.3', 'filetype==1.0.9', + 'libtorrent==2.0.6', ], extras_require={ - 'torrent': ['lbry-libtorrent'], 'lint': [ 'pylint==2.10.0' ], diff --git a/tox.ini b/tox.ini index 6795a8a1a..2e562f4ea 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,6 @@ deps = extras = test hub - torrent changedir = {toxinidir}/tests setenv = HOME=/tmp