diff options
| author | Andi Albrecht <albrecht.andi@gmail.com> | 2015-10-25 08:46:56 +0100 |
|---|---|---|
| committer | Andi Albrecht <albrecht.andi@gmail.com> | 2015-10-25 08:46:56 +0100 |
| commit | 0b6dab4fecdbbe15a5cd47779f1a231a31f8ed73 (patch) | |
| tree | a0100fd8f895e86118dce2f99c3591a4cb632865 | |
| parent | cded58e3dbd7fc1e4dfb250d07c28662eafc32ed (diff) | |
| parent | 4bb4139bf5ee714edfdf221ae91cac7e83ce9567 (diff) | |
| download | sqlparse-0b6dab4fecdbbe15a5cd47779f1a231a31f8ed73.tar.gz | |
Merge branch 'master' of github.com:andialbrecht/sqlparse
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | tox.ini | 11 |
3 files changed, 17 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 313afb8..01adfd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,11 @@ env: - TOX_ENV=py33 - TOX_ENV=py34 - TOX_ENV=pypy +matrix: + include: + - python: 3.5 + env: + - TOX_ENV=py35 before_install: - sudo apt-get install pypy install: @@ -115,6 +115,8 @@ setup( 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', 'Topic :: Database', 'Topic :: Software Development' ], @@ -1,5 +1,5 @@ [tox] -envlist=py26,py27,py32,py33,py34,pypy +envlist=py26,py27,py32,py33,py34,py35,pypy [testenv] deps= @@ -35,3 +35,12 @@ commands= cp -r {toxinidir}/tests/ tests/ 2to3 -w --no-diffs -n tests/ py.test --cov={envdir}/lib/python3.4/site-packages/sqlparse/ tests + +[testenv:py35] +changedir={envdir} +commands= + sqlformat --version # Sanity check. + rm -rf tests/ + cp -r {toxinidir}/tests/ tests/ + 2to3 -w --no-diffs -n tests/ + py.test --cov={envdir}/lib/python3.5/site-packages/sqlparse/ tests |