Merge branch 'master' of github.com:andialbrecht/sqlparse

andialbrecht · Oct 25, 2015 · 0b6dab4 · 0b6dab4
2 parents cded58e + 4bb4139
commit 0b6dab4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git 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:

diff --git a/setup.py b/setup.py
@@ -115,6 +115,8 @@ def get_version():
         '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'
     ],

diff --git a/tox.ini b/tox.ini
@@ -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