Skip to content

Commit 6e90533

Browse files
committed
Django 1.6 was released today and it's supported!
Fix #438.
1 parent 1c2bb37 commit 6e90533

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ python:
55
- "3.2"
66
- "3.3"
77
env:
8-
- DJANGO_VERSION=1.4.8
9-
- DJANGO_VERSION=1.5.4
8+
- DJANGO_VERSION=1.4.10
9+
- DJANGO_VERSION=1.5.5
10+
- DJANGO_VERSION=1.6
1011
matrix:
1112
exclude:
1213
- python: "3.2"
13-
env: DJANGO_VERSION=1.4.8
14+
env: DJANGO_VERSION=1.4.10
1415
- python: "3.3"
15-
env: DJANGO_VERSION=1.4.8
16+
env: DJANGO_VERSION=1.4.10
1617
install:
1718
- pip install Django==$DJANGO_VERSION sqlparse
1819
script: make test

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
license='BSD',
1414
packages=find_packages(exclude=('tests', 'example')),
1515
install_requires=[
16-
'django>=1.4.2,<1.6',
16+
'django>=1.4.2,<1.7',
1717
'sqlparse',
1818
],
1919
include_package_data=True,

tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,25 @@ deps =
5757
[testenv:py26-django16]
5858
basepython = python2.6
5959
deps =
60-
https://www.djangoproject.com/download/1.6c1/tarball/
60+
Django>=1.6,<1.7
6161
{[testenv]deps}
6262

6363
[testenv:py27-django16]
6464
basepython = python2.7
6565
deps =
66-
https://www.djangoproject.com/download/1.6c1/tarball/
66+
Django>=1.6,<1.7
6767
{[testenv]deps}
6868

6969
[testenv:py32-django16]
7070
basepython = python3.2
7171
deps =
72-
https://www.djangoproject.com/download/1.6c1/tarball/
72+
Django>=1.6,<1.7
7373
{[testenv]deps}
7474

7575
[testenv:py33-django16]
7676
basepython = python3.3
7777
deps =
78-
https://www.djangoproject.com/download/1.6c1/tarball/
78+
Django>=1.6,<1.7
7979
{[testenv]deps}
8080

8181
[testenv:flake8]

0 commit comments

Comments
 (0)