From e46fb7fe9cb18f026247191cc2decf0664ef78b8 Mon Sep 17 00:00:00 2001
From: Chris Mayo <aklhfex@gmail.com>
Date: Sat, 5 Oct 2019 19:38:57 +0100
Subject: [PATCH] Supports Python 3 Only

Needs miniboa >= 1.0.8 for telnet test on Python 3.7.
Test with older Beautiful Soup without line number support on
Python 3.5.

Resolve tox deprecation warning:
  Matching undeclared envs is deprecated. Be sure all the envs that Tox
  should run are declared in the tox config.
---
 .travis.yml |  6 ------
 tox.ini     | 33 +++++++++++++++++++++++----------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d921dd7f..54d1ad07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.7"
   - "3.5"
   - "3.6"
   - "3.7"
@@ -26,11 +25,6 @@ notifications:
   email: false
 after_script:
   - coveralls
-matrix:
-  allow_failures:
-    - python: "3.5"
-    - python: "3.6"
-    - python: "3.7"
 cache:
   pip: true
   directories:
diff --git a/tox.ini b/tox.ini
index 8856ab7e..b2433e8e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,20 +1,33 @@
 [tox]
-envlist = py27
+envlist = py{35,36,37,35-oldbs4}
+
+[base]
+deps =
+    pyftpdlib
+    parameterized
+    pdfminer
+    pyopenssl
+    pytest-xdist
+    pytest-cov
+    miniboa >= 1.0.8
+    biplist
 
 [testenv]
 usedevelop = true
 deps =
     -rrequirements.txt
-    pyftpdlib
-    parameterized
-    py27: pdfminer < 20191010
-    !py27: pdfminer
-    pyopenssl
-    pytest-xdist
-    pytest-cov
-    miniboa
-    biplist
+    {[base]deps}
 commands =
     pytest {posargs:--cov=linkcheck}
 setenv =
     LC_ALL=en_US.utf-8
+
+[testenv:py35-oldbs4]
+# test bs4 without line number support
+deps =
+    beautifulsoup4 < 4.8.1
+    requests >= 2.4
+    pyxdg
+    dnspython
+    future
+    {[base]deps}