Skip to content

Support Django 1.11 & Python 3.6 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Support Django 1.11 & Python 3.6 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bfbb11
Suppor Django 1.11 & Python 3.6
manosim May 14, 2017
ef3a097
Add Django 1.11
manosim May 14, 2017
2b703f3
Python 3.6 only for Django 1.11
manosim May 14, 2017
7018056
Django master doesn't run on Python 2.7
manosim May 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: python
sudo: false

python:
- "3.5"
- "3.6"

env:
- TOX_ENV=py27-django18
Expand All @@ -18,9 +18,14 @@ env:
- TOX_ENV=py34-django110
- TOX_ENV=py35-django110

- TOX_ENV=py27-djangomaster
- TOX_ENV=py27-django111
- TOX_ENV=py34-django111
- TOX_ENV=py35-django111
- TOX_ENV=py36-django111

- TOX_ENV=py34-djangomaster
- TOX_ENV=py35-djangomaster
- TOX_ENV=py36-djangomaster

cache:
- pip
Expand Down
2 changes: 2 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"Framework :: Django :: 1.7",
"Framework :: Django :: 1.8",
"Framework :: Django :: 1.9",
"Framework :: Django :: 1.10",
"Framework :: Django :: 1.11",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 2.7",
Expand Down
11 changes: 7 additions & 4 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,23 @@ envlist =
{py27,py34,py35}-django18,
{py27,py34,py35}-django19,
{py27,py34,py35}-django110,
{py27,py34,py35}-django{master}
{py27,py34,py35,py36}-django111,
{py34,py35,py36}-django{master}

[testenv]
commands = python runtests.py
setenv =
PYTHONDONTWRITEBYTECODE=1
PYTHONWARNINGS=once
deps =
django18: Django==1.8.14
django19: Django==1.9.9
django110: Django==1.10
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
django111: Django>=1.11,<2.0
djangomaster: https://github.com/django/django/archive/master.tar.gz
-rrequirements/requirements-testing.txt
basepython =
py36: python3.6
py35: python3.5
py34: python3.4
py27: python2.7