summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian May <brian@linuxpenguins.xyz>2018-03-16 18:34:15 +1100
committerBrian May <brian@linuxpenguins.xyz>2018-03-16 18:34:15 +1100
commita215f1b227a7e9a1e6d0985e7b67373c3f522e71 (patch)
treef7e282e8a327af128a795ce076811b00d6d25068
parent11455d0bcd8593d3f32484ee14d757654b2396d1 (diff)
Remove Python 2.6 from automatic tests
Automatic python 2.6 testing is becoming harder, especially as pytest 3.4.2 is unavailable for Python 2.6.
-rw-r--r--.travis.yml5
-rw-r--r--tox.ini1
2 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index b716831..b50a76b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
language: python
python:
-- 2.6
- 2.7
- 3.4
- 3.5
@@ -12,9 +11,9 @@ install:
before_script:
# stop the build if there are Python syntax errors or undefined names.
- - if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then flake8 sshuttle --count --select=E901,E999,F821,F822,F823 --show-source --statistics; fi
+ - flake8 sshuttle --count --select=E901,E999,F821,F822,F823 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide.
- - if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then flake8 sshuttle --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics; fi
+ - flake8 sshuttle --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
script:
- PYTHONPATH=. py.test
diff --git a/tox.ini b/tox.ini
index 1fc6079..e12a34e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
[tox]
downloadcache = {toxworkdir}/cache/
envlist =
- py26,
py27,
py34,
py35,