revert tox.ini and .travis.yml

mpdavis · Jan 16, 2018 · ccaff6c · ccaff6c
1 parent 1c7691b
commit ccaff6c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,22 @@
-sudo: false
 # Travis infra requires pinning dist:precise, at least as of 2017-09-01
 # detail: https://blog.travis-ci.com/2017-06-21-trusty-updates-2017-Q2-launch
-dist: trusty
+dist: precise
 language: python
 python:
-  - "2.6"
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
   - "pypy-5.3.1"
 install:
-  - pip install -U setuptools && pip install -U tox codecov tox-travis
+  - pip install -U tox codecov tox-travis
 script:
   - tox
 after_success:
-- codecov
+  - codecov
+matrix:
+  include:
+    - python: 3.6
+      env:
+        - TOX_ENV=flake8
+      script: tox -e $TOX_ENV
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
-envlist = py{27,33,34,35,36,37,py,pypy}
+envlist = py{27,34,35,36,py},flake8
+skip_missing_interpreters = True
 
 [testenv]
 commands =
@@ -12,5 +13,9 @@ deps =
     pytest-cov
     pytest-runner
     cryptography
-    enum34
-    six
+
+[testenv:flake8]
+commands = flake8 jose
+skip_install= True
+deps =
+    flake8