Skip to content

Commit c2c9225

Browse files
authored
Merge pull request #5619 from rpkilby/explicit-django20-support
Update Django 2.0 support
2 parents d71bd57 + 7a533cd commit c2c9225

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ matrix:
2929

3030
allow_failures:
3131
- env: DJANGO=master
32-
- env: DJANGO=2.0
3332

3433
install:
3534
- pip install tox tox-travis

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ There is a live example API for testing purposes, [available here][sandbox].
5353
# Requirements
5454

5555
* Python (2.7, 3.4, 3.5, 3.6)
56-
* Django (1.10, 1.11, 2.0 alpha)
56+
* Django (1.10, 1.11, 2.0rc1)
5757

5858
# Installation
5959

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ setenv =
2424
deps =
2525
django110: Django>=1.10,<1.11
2626
django111: Django>=1.11,<2.0
27-
django20: Django>=2.0b1,<2.1
27+
django20: Django>=2.0rc1,<2.1
2828
djangomaster: https://github.com/django/django/archive/master.tar.gz
2929
-rrequirements/requirements-testing.txt
3030
-rrequirements/requirements-optionals.txt

0 commit comments

Comments
 (0)