update setup.py, travis, and wine_build

.travis.yml

@@ -16,34 +16,18 @@ jobs:
         - pip install -e .
       script: pylint lbrynet
 
-    - &tests
+    - stage: test
-      stage: test
       name: "Unit Tests"
       install:
         - pip install coverage
         - pip install git+https://github.com/lbryio/torba.git#egg=torba
         - pip install -e .[test]
       script:
-        - HOME=/tmp coverage run -p --source=lbrynet -m twisted.trial --reactor=asyncio tests.unit.core tests.unit.cryptstream tests.unit.database tests.unit.dht tests.unit.lbryfilemanager tests.unit.lbrynet_daemon tests.unit.schema tests.unit.wallet tests.unit.components tests.unit.test_conf
+        - HOME=/tmp coverage run -p --source=lbrynet -m unittest discover -vv tests.unit
-        - HOME=/tmp coverage run -p --source=lbrynet -m twisted.trial --reactor=asyncio tests.unit.test_cli
-       #- HOME=/tmp coverage run -p --source=lbrynet -m twisted.trial --reactor=asyncio tests.unit.analytics
       after_success:
         - coverage combine
         - bash <(curl -s https://codecov.io/bash)
 
-    - <<: *tests
-      name: "DHT Tests"
-      script: HOME=/tmp coverage run --source=lbrynet -m twisted.trial --reactor=asyncio tests.functional
-
-    - name: "Integration Tests"
-      install:
-        - pip install tox-travis coverage
-        - pushd .. && git clone https://github.com/lbryio/torba.git && popd
-      script: tox
-      after_success:
-        - coverage combine tests/
-        - bash <(curl -s https://codecov.io/bash)
-
     - stage: build
       name: "Windows"
       language: generic

scripts/wine_build.sh

@@ -6,11 +6,8 @@ apt-get -qq update
 apt-get -qq install -y git
 
 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
-sed -i -e '172,184{s/^/#/}' twisted/src/twisted/python/_setup.py
 
 pip install setuptools_scm
-cd twisted && pip install -e .[tls] && cd ..
 cd torba && pip install -e . && cd ..
 
 cd lbry
@@ -20,10 +17,6 @@ wget -Onetifaces-0.10.7-cp37-cp37m-win32.whl https://ci.appveyor.com/api/buildjo
 pip install netifaces-0.10.7-cp37-cp37m-win32.whl
 
 pip install -e .
-
-# Twisted needs that, but installing before lbry makes everything hang
-# PyInstaller removed that as a dependency in 3.4
-# The source file from Twisted that requires it is "src/twisted/internet/stdio.py"
 pip install pywin32
 
 pyinstaller --additional-hooks-dir=scripts/. --icon=icons/lbry256.ico -F -n lbrynet lbrynet/extras/cli.py

setup.py

@@ -25,7 +25,6 @@ setup(
     install_requires=[
         'aiohttp',
         'aioupnp',
-        'twisted[tls]==18.7.0',
         'appdirs',
         'distro',
         'base58==1.0.0',
@@ -38,9 +37,6 @@ setup(
         'ecdsa',
         'torba',
         'pyyaml',
-        'requests',
-        'txJSON-RPC',
-        'treq',
         'docopt',
         'colorama==0.3.7',
     ],