mirror of
https://github.com/encode/django-rest-framework.git
synced 2024-11-11 04:07:39 +03:00
Merge pull request #2606 from tomchristie/1.8-beta
Formally upgrade suport to Django 1.8-beta
This commit is contained in:
commit
dafc045c2d
|
@ -21,10 +21,10 @@ env:
|
|||
- TOX_ENV=py26-django15
|
||||
- TOX_ENV=py27-django14
|
||||
- TOX_ENV=py26-django14
|
||||
- TOX_ENV=py34-django18alpha
|
||||
- TOX_ENV=py33-django18alpha
|
||||
- TOX_ENV=py32-django18alpha
|
||||
- TOX_ENV=py27-django18alpha
|
||||
- TOX_ENV=py34-django18beta
|
||||
- TOX_ENV=py33-django18beta
|
||||
- TOX_ENV=py32-django18beta
|
||||
- TOX_ENV=py27-django18beta
|
||||
|
||||
install:
|
||||
- pip install tox
|
||||
|
|
|
@ -34,7 +34,7 @@ There is a live example API for testing purposes, [available here][sandbox].
|
|||
# Requirements
|
||||
|
||||
* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
|
||||
* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-alpha)
|
||||
* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-beta)
|
||||
|
||||
# Installation
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ Some reasons you might want to use REST framework:
|
|||
REST framework requires the following:
|
||||
|
||||
* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
|
||||
* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7)
|
||||
* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-beta)
|
||||
|
||||
The following packages are optional:
|
||||
|
||||
|
|
|
@ -99,11 +99,5 @@ class TestFileUploadParser(TestCase):
|
|||
filename = parser.get_filename(self.stream, None, self.parser_context)
|
||||
self.assertEqual(filename, 'ÀĥƦ.txt')
|
||||
|
||||
self.__replace_content_disposition('inline; filename=fallback.txt; filename*=utf-8--ÀĥƦ.txt')
|
||||
filename = parser.get_filename(self.stream, None, self.parser_context)
|
||||
# Malformed. Either None or 'fallback.txt' will be acceptable.
|
||||
# See also https://code.djangoproject.com/ticket/24209
|
||||
self.assertIn(filename, ('fallback.txt', None))
|
||||
|
||||
def __replace_content_disposition(self, disposition):
|
||||
self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = disposition
|
||||
|
|
4
tox.ini
4
tox.ini
|
@ -3,7 +3,7 @@ envlist =
|
|||
py27-{flake8,docs},
|
||||
{py26,py27}-django14,
|
||||
{py26,py27,py32,py33,py34}-django{15,16},
|
||||
{py27,py32,py33,py34}-django{17,18alpha}
|
||||
{py27,py32,py33,py34}-django{17,18beta}
|
||||
|
||||
[testenv]
|
||||
commands = ./runtests.py --fast
|
||||
|
@ -14,7 +14,7 @@ deps =
|
|||
django15: Django==1.5.6 # Should track minimum supported
|
||||
django16: Django==1.6.3 # Should track minimum supported
|
||||
django17: Django==1.7.2 # Should track maximum supported
|
||||
django18alpha: https://www.djangoproject.com/download/1.8a1/tarball/
|
||||
django18beta: https://www.djangoproject.com/download/1.8b1/tarball/
|
||||
-rrequirements/requirements-testing.txt
|
||||
-rrequirements/requirements-optionals.txt
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user