From 89358a6c463453803eb666d73893051bab9af06b Mon Sep 17 00:00:00 2001 From: Daniel Indictor Date: Mon, 13 Apr 2020 04:13:23 -0400 Subject: [PATCH] Made changes necessary to bump supported Django version to 3.0 --- .travis.yml | 2 ++ README.md | 2 +- tests/test_settings.py | 29 +++++++++++++++++++++++++++-- tox.ini | 7 ++++--- 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 686ee21..37b9770 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,8 @@ matrix: env: TOXENV=py36-django111 - python: 3.7-dev env: TOXENV=py37-django20 + - python: 3.7-dev + env: TOXENV=py37-django30 - python: 3.7-dev env: TOXENV=py37-djangotip install: diff --git a/README.md b/README.md index 4a42910..1a69d1a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Codacy Badge](https://api.codacy.com/project/badge/Grade/159540d899bd41bb860f0ce996427e1f)](https://www.codacy.com/app/IwoHerka/django-eav2?utm_source=github.com&utm_medium=referral&utm_content=makimo/django-eav2&utm_campaign=Badge_Grade) [![Maintainability](https://api.codeclimate.com/v1/badges/b90eacf7a90db4b58f13/maintainability)](https://codeclimate.com/github/makimo/django-eav2/maintainability) ![Python Version](https://img.shields.io/badge/Python-2.7,%203.5,%203.6,%203.7dev-blue.svg) -![Django Version](https://img.shields.io/badge/Django-1.11,%202.0,%20tip-green.svg) +![Django Version](https://img.shields.io/badge/Django-1.11,%202.0,%203.0,%20tip-green.svg) ## Django EAV 2 - Entity-Attribute-Value storage for Django diff --git a/tests/test_settings.py b/tests/test_settings.py index ce60683..9590532 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -10,11 +10,36 @@ INSTALLED_APPS = [ 'django.contrib.auth', 'django.contrib.sites', 'django.contrib.admin', + 'django.contrib.messages', # Required for admin app. 'django.contrib.contenttypes', - "tests", - "eav" + 'tests', + 'eav' ] +MIDDLEWARE = [ + # Following 3 middleware required for admin app. + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware' +] + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + + DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', diff --git a/tox.ini b/tox.ini index 376eefc..4ad535d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,9 @@ [tox] envlist = py27-django{111}, - py35-django{111,20,tip}, - py36-django{111,20,tip}, - py37-django{111,20,tip}, + py35-django{111,20,30,tip}, + py36-django{111,20,30,tip}, + py37-django{111,20,30,tip}, migrationscheck [testenv] @@ -12,6 +12,7 @@ pip_pre=True deps = django111: Django >=1.11, <2.0 django20: Django >= 2.0, <2.1 + django30: Django >= 3.0, <3.1 djangotip: Django commands =