From 8a4fe4f3add9b338cbf1dc4f244fafc50302d176 Mon Sep 17 00:00:00 2001
From: Victor Shyba <victor1984@riseup.net>
Date: Tue, 10 Mar 2020 20:24:57 -0300
Subject: [PATCH] lbry-libtorrent is now on pypi

---
 .github/workflows/main.yml |  2 --
 .gitlab-ci.yml             | 12 +++++-------
 tox.ini                    |  4 +---
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f50692e5c..bea9fa1be 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -45,8 +45,6 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends ffmpeg
-      - if: matrix.test == 'datanetwork'
-        run: sudo apt install -y --no-install-recommends libboost1.65-all-dev
       - run: pip install tox-travis
       - run: tox -e ${{ matrix.test }}
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad0698a7b..46aa3a845 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,10 +40,8 @@ test:unit:
 test:datanetwork-integration:
   stage: test
   script:
-    - apt-get update
-    - apt-get install -y libboost-all-dev
-    - python3.7 -m pip install tox-travis
-    - LIBTORRENT_URL=https://s3.amazonaws.com/files.lbry.io/python_libtorrent-1.2.4-py2.py3-none-any.whl tox -e datanetwork --recreate
+    - pip install tox-travis
+    - tox -e datanetwork --recreate
 
 test:blockchain-integration:
   stage: test
@@ -86,7 +84,7 @@ test:json-api:
 
 build:linux:
   extends: .build
-  image: ubuntu:18.04
+  image: ubuntu:16.04
   variables:
     OS: linux
   before_script:
@@ -94,9 +92,9 @@ build:linux:
     - apt-get install -y --no-install-recommends software-properties-common zip curl build-essential
     - add-apt-repository -y ppa:deadsnakes/ppa
     - apt-get update
-    - apt-get install -y --no-install-recommends python3.7-dev libboost1.65-all-dev
+    - apt-get install -y --no-install-recommends python3.7-dev
     - python3.7 <(curl -q https://bootstrap.pypa.io/get-pip.py) # make sure we get pip with python3.7
-    - pip install https://s3.amazonaws.com/files.lbry.io/python_libtorrent-1.2.4-py3-none-any.whl  # temporarly only on linux
+    - pip install lbry-libtorrent
 
 build:mac:
   extends: .build
diff --git a/tox.ini b/tox.ini
index c9d0dae71..73d57410b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,14 +6,12 @@ extras = test
 changedir = {toxinidir}/tests
 setenv =
   HOME=/tmp
-  LIBTORRENT_URL={env:LIBTORRENT_URL:https://s3.amazonaws.com/files.lbry.io/python_libtorrent-1.2.4-py3-none-any.whl}
 commands =
-  pip install {env:LIBTORRENT_URL}
   pip install https://github.com/rogerbinns/apsw/releases/download/3.30.1-r1/apsw-3.30.1-r1.zip \
 		--global-option=fetch \
 		--global-option=--version --global-option=3.30.1 --global-option=--all \
 		--global-option=build --global-option=--enable --global-option=fts5
-  pip install https://s3.amazonaws.com/files.lbry.io/python_libtorrent-1.2.4-py2.py3-none-any.whl
+  pip install lbry-libtorrent
   orchstr8 download
   blockchain: coverage run -p --source={envsitepackagesdir}/lbry -m unittest discover -vv integration.blockchain {posargs}
   datanetwork: coverage run -p --source={envsitepackagesdir}/lbry -m unittest discover -vv integration.datanetwork {posargs}