Deluge
diff options
| author | DjLegolas <djlegolas@protonmail.com> | 2022-02-06 23:59:33 +0200 |
|---|---|---|
| committer | Calum Lind <calumlind+deluge@gmail.com> | 2022-03-02 12:55:19 +0000 |
| commit | a9543485672eaa1a5ba773764c89e4fcec3bada3 (patch) | |
| tree | 9ee1fe3771890f23855de558bfcf12ed923a5872 | |
| parent | 13be64d3558441e444b57882779e4faaa5842f20 (diff) | |
| download | deluge-a9543485672eaa1a5ba773764c89e4fcec3bada3.tar.gz deluge-a9543485672eaa1a5ba773764c89e4fcec3bada3.tar.bz2 deluge-a9543485672eaa1a5ba773764c89e4fcec3bada3.zip | |
[CI] Use libtorrent pypi install
Up until now, the linux installation source of libtorrent was launchpad,
because there was no other source, and we wanted a debug version of lt.
With pypi wheel versions now available use lt in the requirements.txt
file.
Closes: https://github.com/deluge-torrent/deluge/pull/364
| -rw-r--r-- | .github/workflows/ci.yml | 13 | ||||
| -rw-r--r-- | requirements.txt | 1 |
2 files changed, 2 insertions, 12 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3373051ff..cc966b2c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,15 +35,6 @@ jobs: ${{ runner.os }}-pip- ${{ runner.os }}- - - name: Add libtorrent deb repository - uses: myci-actions/add-deb-repo@8 - with: - repo: deb http://ppa.launchpad.net/libtorrent.org/1.2-daily/ubuntu focal main - repo-name: libtorrent - keys: 58E5430D9667FAEFFCA0B93F32309D6B9E009EDB - key-server: keyserver.ubuntu.com - install: python3-libtorrent-dbg - - name: Sets env var for security if: (github.event_name == 'pull_request' && contains(github.event.pull_request.body, 'security_test')) || (github.event_name == 'push' && contains(github.event.head_commit.message, 'security_test')) run: echo "SECURITY_TESTS=True" >> $GITHUB_ENV @@ -71,7 +62,6 @@ jobs: - name: Test with pytest run: | ulimit -c unlimited # Enable core dumps to be captured - cp /usr/lib/python3/dist-packages/libtorrent*.so $GITHUB_WORKSPACE/deluge python -c 'from deluge._libtorrent import lt; print(lt.__version__)'; catchsegv python -X dev -m pytest -v -m "not (todo or gtkui)" deluge @@ -111,8 +101,7 @@ jobs: - name: Install dependencies run: | - python -m pip install --upgrade pip wheel - python -m pip install libtorrent==1.2.* + pip install --upgrade pip wheel pip install -r requirements.txt -r requirements-tests.txt pip install -e . diff --git a/requirements.txt b/requirements.txt index 2d1a1298f..30073fc88 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +libtorrent twisted[tls]>=17.1 rencode pyopenssl |