From d47d4a039c8fda04c67132d1c455b92826c1c6c6 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Sat, 23 Sep 2017 00:22:55 +0600 Subject: [PATCH 1/6] added django 2.0 alpha on tox matrix --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 698a0b745..8b666b918 100644 --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,7 @@ envlist = {py27,py33,py34,py35}-django18, {py27,py34,py35}-django{19,110}, {py27,py34,py35,py36}-django111, + {py34,py35,py36}-django20, {py35,py36}-djangomaster lint,docs @@ -15,6 +16,7 @@ DJANGO = 1.9: django19 1.10: django110 1.11: django111 + 2.0: django20 master: djangomaster [testenv] From c4879a0190a25c917e7b28797d1e9aa84ba52890 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Sat, 23 Sep 2017 00:31:17 +0600 Subject: [PATCH 2/6] added django 2.0 alpha on travis matrix --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7a91af809..7e392d59a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ env: - DJANGO=1.9 - DJANGO=1.10 - DJANGO=1.11 + - DJANGO=2.0 - DJANGO=master matrix: @@ -21,6 +22,8 @@ matrix: env: DJANGO=master - python: "3.6" env: DJANGO=1.11 + - python: "3.6" + env: DJANGO=2.0 - python: "3.3" env: DJANGO=1.8 - python: "2.7" @@ -30,11 +33,14 @@ matrix: exclude: - python: "2.7" env: DJANGO=master + - python: "2.7" + env: DJANGO=2.0 - python: "3.4" env: DJANGO=master allow_failures: - env: DJANGO=master + - env: DJANGO=2.0 install: - pip install tox tox-travis From 09302173fde9ecaa7a16889d135c233e7f985df6 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Sat, 23 Sep 2017 09:11:42 +0600 Subject: [PATCH 3/6] updated dependency requirements versions --- requirements/requirements-codestyle.txt | 2 +- requirements/requirements-documentation.txt | 2 +- requirements/requirements-optionals.txt | 4 ++-- requirements/requirements-packaging.txt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt index 264416f5f..5f37b40ac 100644 --- a/requirements/requirements-codestyle.txt +++ b/requirements/requirements-codestyle.txt @@ -1,5 +1,5 @@ # PEP8 code linting, which we run on all commits. -flake8==2.4.0 +flake8==3.4.1 pep8==1.5.7 # Sort and lint imports diff --git a/requirements/requirements-documentation.txt b/requirements/requirements-documentation.txt index 81aa70456..012ec99f1 100644 --- a/requirements/requirements-documentation.txt +++ b/requirements/requirements-documentation.txt @@ -1,2 +1,2 @@ # MkDocs to build our documentation. -mkdocs==0.16.2 +mkdocs==0.16.3 diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index 319b7547a..67525bebc 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -1,7 +1,7 @@ # Optional packages which may be used with REST framework. pytz==2017.2 markdown==2.6.4 -django-guardian==1.4.8 +django-guardian==1.4.9 django-filter==1.0.4 -coreapi==2.2.4 +coreapi==2.3.1 coreschema==0.0.4 diff --git a/requirements/requirements-packaging.txt b/requirements/requirements-packaging.txt index f930bfa96..f12d4af0e 100644 --- a/requirements/requirements-packaging.txt +++ b/requirements/requirements-packaging.txt @@ -1,8 +1,8 @@ # Wheel for PyPI installs. -wheel==0.29.0 +wheel==0.30.0 # Twine for secured PyPI uploads. -twine==1.6.5 +twine==1.9.1 # Transifex client for managing translation resources. transifex-client==0.11 From 6a00675d9505af846622a2c4b50d819be637bb25 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Sat, 23 Sep 2017 12:24:55 +0600 Subject: [PATCH 4/6] updated dependency requirements versions --- requirements/requirements-codestyle.txt | 2 +- requirements/requirements-testing.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt index 5f37b40ac..af2117386 100644 --- a/requirements/requirements-codestyle.txt +++ b/requirements/requirements-codestyle.txt @@ -1,6 +1,6 @@ # PEP8 code linting, which we run on all commits. flake8==3.4.1 -pep8==1.5.7 +pep8==1.7.0 # Sort and lint imports isort==4.2.5 diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index b9e168442..515cff78d 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -1,4 +1,4 @@ # PyTest for running the tests. -pytest==3.0.5 +pytest==3.2.2 pytest-django==3.1.2 -pytest-cov==2.4.0 +pytest-cov==2.5.1 From 698bef81d5c54942c069bf1af08a562465f77005 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Sat, 23 Sep 2017 12:47:09 +0600 Subject: [PATCH 5/6] updated tox --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 8b666b918..a73f1594d 100644 --- a/tox.ini +++ b/tox.ini @@ -29,6 +29,7 @@ deps = django19: Django>=1.9,<1.10 django110: Django>=1.10,<1.11 django111: Django>=1.11,<2.0 + django20: Django>=2.0a1,<2.1 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From a1c328581f9c94797eda96e277661a7302b6a8e2 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Sat, 23 Sep 2017 15:18:25 +0600 Subject: [PATCH 6/6] change in urlatten compat --- rest_framework/compat.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 528340d69..a5377e76b 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -20,11 +20,13 @@ from django.views.generic import View try: from django.urls import ( - NoReverseMatch, RegexURLPattern, RegexURLResolver, ResolverMatch, Resolver404, get_script_prefix, reverse, reverse_lazy, resolve + NoReverseMatch, URLResolver, ResolverMatch, Resolver404, + get_script_prefix, reverse, reverse_lazy, resolve, URLPattern ) except ImportError: from django.core.urlresolvers import ( # Will be removed in Django 2.0 - NoReverseMatch, RegexURLPattern, RegexURLResolver, ResolverMatch, Resolver404, get_script_prefix, reverse, reverse_lazy, resolve + NoReverseMatch, RegexURLPattern, RegexURLResolver, ResolverMatch, + Resolver404, get_script_prefix, reverse, reverse_lazy, resolve )