diff options
| author | Tom Christie | 2015-02-26 13:49:44 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-02-26 13:49:44 +0000 |
| commit | dafc045c2dc9e1e3b6654438f97bcae0a5aabfa0 (patch) | |
| tree | 97af95222b46ce93f41a7bf2e60b324411538cd3 | |
| parent | 6bbd509f345b150cdfa9b5c17ca500c0c9fbf601 (diff) | |
| parent | 1b398a20decbf6e10173d280bc4fccd86a94b629 (diff) | |
| download | django-rest-framework-dafc045c2dc9e1e3b6654438f97bcae0a5aabfa0.tar.bz2 | |
Merge pull request #2606 from tomchristie/1.8-beta
Formally upgrade suport to Django 1.8-beta
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | docs/index.md | 2 | ||||
| -rw-r--r-- | tests/test_parsers.py | 6 | ||||
| -rw-r--r-- | tox.ini | 4 |
5 files changed, 8 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 4f929785..3eb89dc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/docs/index.md b/docs/index.md index 23781419..91766a0b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -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: diff --git a/tests/test_parsers.py b/tests/test_parsers.py index 8816065a..fe6aec19 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -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 @@ -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 |