Skip to content

Commit 4f3f99e

Browse files
committed
added builds for django 1.7
1 parent 6fcd01a commit 4f3f99e

File tree

2 files changed

+38
-7
lines changed

2 files changed

+38
-7
lines changed

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ guidelines <https://django-oauth-toolkit.readthedocs.org/en/latest/contributing.
4040
Requirements
4141
------------
4242

43-
* Python 2.6, 2.7, 3.3
44-
* Django 1.4, 1.5, 1.6
43+
* Python 2.6, 2.7, 3.3, 3.4
44+
* Django 1.4, 1.5, 1.6, 1.7rc1
4545

4646
Installation
4747
------------

tox.ini

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[tox]
22
envlist =
33
py26-django14, py26-django15, py26-django16,
4-
py27-django14, py27-django15, py27-django16,
5-
py33-django15, py33-django16,
4+
py27-django14, py27-django15, py27-django16, py27-django17,
5+
py33-django15, py33-django16, py33-django17,
6+
py34-django15, py34-django16, py34-django17,
67
docs
78

89
[testenv]
@@ -41,24 +42,54 @@ deps =
4142
Django<1.6
4243
{[testenv]deps}
4344

45+
[testenv:py27-django16]
46+
basepython = python2.7
47+
deps =
48+
Django<1.7
49+
{[testenv]deps}
50+
51+
[testenv:py27-django17]
52+
basepython = python2.7
53+
deps =
54+
https://www.djangoproject.com/download/1.7c1/tarball/
55+
{[testenv]deps}
56+
4457
[testenv:py33-django15]
4558
basepython = python3.3
4659
deps =
4760
Django<1.6
4861
{[testenv]deps}
4962

50-
[testenv:py27-django16]
51-
basepython = python2.7
63+
[testenv:py33-django16]
64+
basepython = python3.3
5265
deps =
5366
Django<1.7
5467
{[testenv]deps}
5568

56-
[testenv:py33-django16]
69+
[testenv:py33-django17]
5770
basepython = python3.3
71+
deps =
72+
https://www.djangoproject.com/download/1.7c1/tarball/
73+
{[testenv]deps}
74+
75+
[testenv:py34-django15]
76+
basepython = python3.4
77+
deps =
78+
Django<1.6
79+
{[testenv]deps}
80+
81+
[testenv:py34-django16]
82+
basepython = python3.4
5883
deps =
5984
Django<1.7
6085
{[testenv]deps}
6186

87+
[testenv:py34-django17]
88+
basepython = python3.4
89+
deps =
90+
https://www.djangoproject.com/download/1.7c1/tarball/
91+
{[testenv]deps}
92+
6293
[testenv:docs]
6394
basepython=python
6495
changedir=docs

0 commit comments

Comments
 (0)