Skip to content

Commit

Permalink
Add testing for Django 1.11 and Python 3.6 (#295)
Browse files Browse the repository at this point in the history
Fixes #289
  • Loading branch information
jdufresne authored and jschneier committed Apr 8, 2017
1 parent ab574fd commit 6010899
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 16 deletions.
44 changes: 30 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,36 @@ sudo: false
language: python
cache: pip

python:
- 3.5

env:
- TOX_ENV=py27-django18
- TOX_ENV=py33-django18
- TOX_ENV=py34-django18
- TOX_ENV=py35-django18
- TOX_ENV=py27-django19
- TOX_ENV=py34-django19
- TOX_ENV=py35-django19
- TOX_ENV=py27-django110
- TOX_ENV=py34-django110
- TOX_ENV=py35-django110
matrix:
include:
- python: 2.7
env: TOX_ENV=py27-django18
- python: 3.3
env: TOX_ENV=py33-django18
- python: 3.4
env: TOX_ENV=py34-django18
- python: 3.5
env: TOX_ENV=py35-django18
- python: 2.7
env: TOX_ENV=py27-django19
- python: 3.4
env: TOX_ENV=py34-django19
- python: 3.5
env: TOX_ENV=py35-django19
- python: 2.7
env: TOX_ENV=py27-django110
- python: 3.4
env: TOX_ENV=py34-django110
- python: 3.5
env: TOX_ENV=py35-django110
- python: 2.7
env: TOX_ENV=py27-django111
- python: 3.4
env: TOX_ENV=py34-django111
- python: 3.5
env: TOX_ENV=py35-django111
- python: 3.6
env: TOX_ENV=py36-django111

before_install:
- pip install codecov
Expand Down
2 changes: 1 addition & 1 deletion requirements-tests.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django>=1.7
Django>=1.8
pytest-cov>=2.2.1
boto>=2.32.0
boto3>=1.2.3
Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def get_requirements_tests():
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
Expand All @@ -38,6 +39,7 @@ def get_requirements_tests():
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
],
tests_require=get_requirements_tests(),
test_suite='tests',
Expand Down
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ envlist =
{py27,py33,py34,py35}-django18,
{py27,py34,py35}-django19
{py27,py34,py35}-django110
{py27,py34,py35,py36}-django111


[testenv]
Expand All @@ -14,7 +15,8 @@ deps =
django18: Django>=1.8, <1.9
django19: Django>=1.9, <1.10
django110: Django>=1.10, <1.11
py27: mock==1.0.1
django111: Django>=1.11, <2.0
py27: mock
boto>=2.32.0
pytest-cov>=2.2.1
boto3>=1.2.3
Expand Down

0 comments on commit 6010899

Please sign in to comment.