From 5924e0d27bcc5c0ce7990f26c67caad02dd73713 Mon Sep 17 00:00:00 2001 From: Charlie Denton Date: Thu, 18 Jan 2018 21:27:17 +0000 Subject: [PATCH 1/2] Remove unused base test case --- tests/utils.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/utils.py b/tests/utils.py index fe1b7a1..a639437 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,4 +1,3 @@ -from incuna_test_utils.testcases.integration import BaseIntegrationTestCase from incuna_test_utils.testcases.request import BaseRequestTestCase from .factories import UserFactory @@ -7,8 +6,3 @@ class RequestTestCase(BaseRequestTestCase): """Add helper methods for working with requests in tests.""" user_factory = UserFactory - - -class IntegrationTestCase(BaseIntegrationTestCase): - """Add helper methods for integration tests.""" - user_factory = UserFactory From a39b695182c5300b80e5a6de799145933b9b336e Mon Sep 17 00:00:00 2001 From: Charlie Denton Date: Thu, 18 Jan 2018 21:30:31 +0000 Subject: [PATCH 2/2] Add support for django 2.0 --- .travis.yml | 4 +++- CHANGELOG.md | 2 ++ requirements.txt | 2 +- tests/routes/test_admin.py | 4 +++- tests/routes/test_handlers.py | 2 +- tests/routes/test_urls.py | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4030e7b..0bbb8ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,13 +12,15 @@ env: global: - DATABASE_URL='postgres://postgres@localhost/conman' matrix: - - DJANGO='django~=1.10.0' - DJANGO='django~=1.11.0' + - DJANGO='django~=2.0.1' - DJANGO='https://github.com/django/django/tarball/master' matrix: allow_failures: - env: DJANGO='https://github.com/django/django/tarball/master' + - env: DJANGO='django~=2.0.1' + python: 3.4 fast_finish: true install: diff --git a/CHANGELOG.md b/CHANGELOG.md index 87e64fe..59caa09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,14 @@ ### Added +- Added support for Django 2.0. - Added `Route.get_subclasses()`. - Added `TemplateHandler`. A simpler handler that requires only a template. This is the new default for `Route.handler_class`. ### Backwards incompatible +- Dropped support for Django 1.10. - `CONMAN_ADMIN_ROUTES` setting has been removed. In future, we'll automatically detect subclasses of `Route` for admin integration. - Renamed `RouteViewHandler` to `ViewHandler`. diff --git a/requirements.txt b/requirements.txt index 8750a23..498ef5d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ colour-runner==0.0.5 coverage==4.4.2 dj-database-url==0.4.1 -django~=1.11.0 +django~=2.0.1 factory_boy==2.9.2 flake8==3.5.0 flake8-commas==1.0.0 diff --git a/tests/routes/test_admin.py b/tests/routes/test_admin.py index 19df840..578cd1c 100644 --- a/tests/routes/test_admin.py +++ b/tests/routes/test_admin.py @@ -1,6 +1,8 @@ +from unittest import mock + from django.contrib.admin import site from django.contrib.admin.widgets import AdminTextInputWidget -from django.test import mock, SimpleTestCase, TestCase +from django.test import SimpleTestCase, TestCase from conman.routes.admin import RouteParentAdmin from conman.routes.models import Route diff --git a/tests/routes/test_handlers.py b/tests/routes/test_handlers.py index e4b39bc..1b30852 100644 --- a/tests/routes/test_handlers.py +++ b/tests/routes/test_handlers.py @@ -1,9 +1,9 @@ from unittest import mock from django.core.checks import Warning -from django.core.urlresolvers import clear_url_caches, Resolver404 from django.http import HttpResponse from django.test import RequestFactory, TestCase +from django.urls import clear_url_caches, Resolver404 from conman.routes.handlers import ( BaseHandler, diff --git a/tests/routes/test_urls.py b/tests/routes/test_urls.py index f031f99..84e614b 100644 --- a/tests/routes/test_urls.py +++ b/tests/routes/test_urls.py @@ -1,5 +1,5 @@ -from django.core.urlresolvers import resolve, Resolver404 from django.test import TestCase +from django.urls import resolve, Resolver404 from conman.routes import views