From 82501d4c4d40cce7434d71cf88e2e2a136c5e592 Mon Sep 17 00:00:00 2001 From: Niouby Date: Tue, 16 Apr 2019 16:48:42 +0200 Subject: [PATCH 1/3] Add template and middleware settings in test_settings --- tests/test_settings.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/test_settings.py b/tests/test_settings.py index 61f17d7..f8c171b 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -14,9 +14,29 @@ 'django.contrib.sites', 'django.contrib.auth', 'django.contrib.admin', + 'django.contrib.messages', + 'django.contrib.sessions', 'tests', ] +MIDDLEWARE = [ + "django.contrib.auth.middleware.AuthenticationMiddleware", + "django.contrib.messages.middleware.MessageMiddleware", +] + +TEMPLATES = [ + { + "BACKEND": "django.template.backends.django.DjangoTemplates", + "APP_DIRS": True, + "OPTIONS": { + "context_processors": [ + "django.contrib.auth.context_processors.auth", + "django.contrib.messages.context_processors.messages", + ] + }, + } +] + if django.VERSION[:2] < (1, 6): TEST_RUNNER = 'discover_runner.DiscoverRunner' From 55abbd9203d61c4f3dfafaf7a73ebaae462f7193 Mon Sep 17 00:00:00 2001 From: Niouby Date: Tue, 16 Apr 2019 16:49:23 +0200 Subject: [PATCH 2/3] update python/django support: add django 2.2 --- .travis.yml | 18 ++++++++++-------- docs/changelog.rst | 7 +++++++ tox.ini | 5 +++-- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c39452..e9ebd6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ sudo: false language: python +dist: xenial matrix: fast_finish: true @@ -33,6 +34,9 @@ matrix: - python: 3.5 env: TOXENV=py35-dj21 + - python: 3.5 + env: TOXENV=py35-dj22 + - python: 3.6 env: TOXENV=py36-dj111 @@ -42,28 +46,26 @@ matrix: - python: 3.6 env: TOXENV=py36-dj21 + - python: 3.6 + env: TOXENV=py36-dj22 + - python: 3.6 env: TOXENV=py36-djmaster - python: 3.7 env: TOXENV=py37-dj111 - dist: xenial - sudo: true - python: 3.7 env: TOXENV=py37-dj20 - dist: xenial - sudo: true - python: 3.7 env: TOXENV=py37-dj21 - dist: xenial - sudo: true + + - python: 3.7 + env: TOXENV=py37-dj22 - python: 3.7 env: TOXENV=py37-djmaster - dist: xenial - sudo: true install: - pip install tox codecov diff --git a/docs/changelog.rst b/docs/changelog.rst index 4e487cc..113cda5 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,13 @@ Changelog ========= +1.0.4 (unreleased) +----------------- + +* Run tests for Django 2.2 and Python 3.5, 3.6 and 3.7 + +* Add template and middleware settings in test_settings (required for Django 2.2) + 1.0.3 (2019-03-3) ----------------- diff --git a/tox.ini b/tox.ini index f5ee86f..edff540 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ envlist = flake8-py34, py{27,34,35,36,37}-dj111, py{34,35,36,37}-dj20, - py{35,36,37}-dj21, + py{35,36,37}-dj{21,22}, py{36,37}-djmaster [testenv] @@ -27,7 +27,8 @@ deps = django-discover-runner dj111: Django>=1.11,<2.0 dj20: Django>=2.0,<2.1 - dj21: https://github.com/django/django/archive/stable/2.1.x.tar.gz#egg=django + dj21: Django>=2.1,<2.2 + dj22: Django>=2.2,<2.3 djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django commands = From d81f825ba05d086c68d1c38dc6e692f683f402dc Mon Sep 17 00:00:00 2001 From: Niouby Date: Thu, 11 Jul 2019 11:02:07 +0200 Subject: [PATCH 3/3] fix tests, add SessionMiddleware --- tests/test_settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_settings.py b/tests/test_settings.py index f8c171b..2fd11aa 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -22,6 +22,7 @@ MIDDLEWARE = [ "django.contrib.auth.middleware.AuthenticationMiddleware", "django.contrib.messages.middleware.MessageMiddleware", + "django.contrib.sessions.middleware.SessionMiddleware", ] TEMPLATES = [