diff options
| author | Victor Uriarte <victor.m.uriarte@intel.com> | 2016-05-28 22:43:06 -0700 |
|---|---|---|
| committer | Victor Uriarte <victor.m.uriarte@intel.com> | 2016-05-29 12:50:05 -0700 |
| commit | 91751744ada0773a75cb3bd4fc728a2e2559a3e3 (patch) | |
| tree | 4e40b243508dae23aa2326629f4b8b2ace0233e0 | |
| parent | 9bad4389951efefeee1dcffbd35510a4be605592 (diff) | |
| download | sqlparse-91751744ada0773a75cb3bd4fc728a2e2559a3e3.tar.gz | |
Update travis/tox config
Add Flake8 linting
Fix testing to use Tox
Exclude compat from linting
Exclude lambda assigment from linting
Remove pytest.ini
| -rw-r--r-- | .travis.yml | 35 | ||||
| -rw-r--r-- | pytest.ini | 6 | ||||
| -rw-r--r-- | tox.ini | 39 |
3 files changed, 49 insertions, 31 deletions
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 @@ -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 |