Skip to content

Commit

Permalink
Merge pull request #601 from jdufresne/py36
Browse files Browse the repository at this point in the history
Add Python 3.6 to trove classifiers and tox configuration
  • Loading branch information
matthiask committed Oct 23, 2017
2 parents 53e67bf + df2b10d commit f150514
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
'Topic :: Utilities',
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[tox]
envlist =
{py27,py33,py34,pypy}-{dj18}
{py27,py34,py35,pypy}-{dj19,dj110,dj111}
{py35}-{dj20}
{py27,py34,py35,pypy}-{dj19,dj110}
{py27,py34,py35,py36,pypy}-{dj111}
{py35,py36}-{dj20}

[testenv]
changedir = {toxinidir}/tests
Expand All @@ -12,6 +13,7 @@ basepython =
py33: python3.3
py34: python3.4
py35: python3.5
py36: python3.6
pypy: pypy
deps =
mock_django>=0.6.7
Expand Down

0 comments on commit f150514

Please sign in to comment.