From 91751744ada0773a75cb3bd4fc728a2e2559a3e3 Mon Sep 17 00:00:00 2001
From: Victor Uriarte <victor.m.uriarte@intel.com>
Date: Sat, 28 May 2016 22:43:06 -0700
Subject: Update travis/tox config

Add Flake8 linting
Fix testing to use Tox
Exclude compat from linting
Exclude lambda assigment from linting
Remove pytest.ini
---
 .travis.yml | 35 +++++++++++++++++++++--------------
 pytest.ini  |  6 ------
 tox.ini     | 39 ++++++++++++++++++++++++++++-----------
 3 files changed, 49 insertions(+), 31 deletions(-)
 delete mode 100644 pytest.ini

diff --git a/.travis.yml b/.travis.yml
index febc5bd..946d77e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,30 @@
 language: python
+python: 3.5
 
-python:
-  - "3.5"
-  - "3.4"
-  - "3.3"
-  - "2.7"
-  - "pypy"
-  - "pypy3"
-  - "nightly"
+env:
+    - TOXENV=flake8
+    - TOXENV=py27
+    - TOXENV=py33
+    - TOXENV=py34
+    - TOXENV=py35
+    - TOXENV=pypy
+    - TOXENV=pypy3
 
 matrix:
-  allow_failures:
-    - python: "nightly"
+    fast_finish: true
+
+    include:
+        - python: "nightly"
+          env: TOXENV=py36
+
+    allow_failures:
+        - python: "nightly"
 
 install:
-  - pip install pytest pytest-cov coveralls
-  - pip install -e .
+    - pip install tox coveralls
 
-script: py.test --cov=sqlparse
+script:
+    - tox
 
 after_success:
-  coveralls
+    - coveralls
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index a2cbd90..0000000
--- a/pytest.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[pytest]
-pep8ignore = 
-  extras/* ALL
-  examples/* ALL
-  docs/* ALL
-  * E125 E127
diff --git a/tox.ini b/tox.ini
index 41f8240..265cc3c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,35 @@
 [tox]
-envlist=flake8,py27,py33,py34,py35,pypy,pypy3
+envlist =
+    py27,
+    py33,
+    py34,
+    py35,
+    py36,
+    pypy,
+    pypy3,
+    flake8
 
 [testenv]
-deps=
-  pytest
-  pytest-cov
-commands=
-  sqlformat --version  # Sanity check.
-  py.test --cov=sqlparse/ tests
+deps =
+    pytest
+    pytest-cov
+    pytest-travis-fold
+passenv =
+    TRAVIS
+commands =
+    python --version
+    sqlformat --version
+    py.test --cov=sqlparse
 
 [testenv:flake8]
-basepython=python3.5
-deps=flake8
-commands=flake8 sqlparse
+deps =
+    flake8
+commands =
+    flake8 sqlparse tests setup.py
 
 [flake8]
-ignore = W503
+exclude =
+    sqlparse/compat.py
+ignore =
+    W503,
+    E731
-- 
cgit v1.2.1