Added Django 2.2 to testing matrix (#555)

* Added Django 2.2 to testing matrix

* fixed deprecation warnings

* Fixed the tests

* Fixed formatting

* Updated travis file to include correct sqlite version

* See if all build will work with dist: xenial

* Check sqllite version

* another attempt

* try try again

* Try updating tests

* Revert "Try updating tests"

This reverts commit 6e065f3.

* Remove print

* Try disabling migrations

Author: Ross Mechanic

.travis.yml

@@ -1,17 +1,19 @@
 language: python
-
+dist: xenial
 sudo: false
 
 python:
   - 2.7
   - 3.4
   - 3.5
   - 3.6
+  - 3.7
 
 env:
   - DJANGO="Django>=1.11,<1.12"
   - DJANGO="Django>=2.0,<2.1"
   - DJANGO="Django>=2.1,<2.2"
+  - DJANGO="Django>=2.2,<2.3"
 
 install:
   - pip install -U coverage codecov
@@ -35,18 +37,9 @@ matrix:
       env: DJANGO="Django>=2.1,<2.2"
     - python: 3.4
       env: DJANGO="Django>=2.1,<2.2"
-  include:
-    - python: 3.7
-      env: DJANGO="Django>=1.11,<1.12"
-      dist: xenial
-      sudo: true
-    - python: 3.7
-      env: DJANGO="Django>=2.0,<2.1"
-      dist: xenial
-      sudo: true
-    - python: 3.7
-      env: DJANGO="Django>=2.1,<2.2"
-      dist: xenial
-      sudo: true
+    - python: 2.7
+      env: DJANGO="Django>=2.2,<2.3"
+    - python: 3.4
+      env: DJANGO="Django>=2.2,<2.3"
 
 after_success: codecov

CHANGES.rst

@@ -5,7 +5,7 @@ Unreleased
 ----------
 - Fixed BigAutoField not mirrored as BigInt (gh-556)
 - Fixed most_recent() bug with excluded_fields (gh-561)
-
+- Added official Django 2.2 support (gh-555)
 
 2.7.2 (2019-04-17)
 ------------------

runtests.py

@@ -28,6 +28,15 @@
     'django.contrib.messages',
 ]
 
+
+class DisableMigrations:
+    def __contains__(self, item):
+        return True
+
+    def __getitem__(self, item):
+        return None
+
+
 DEFAULT_SETTINGS = dict(
     ALLOWED_HOSTS=['localhost'],
     AUTH_USER_MODEL='custom_user.CustomUser',
@@ -43,6 +52,7 @@
             'ENGINE': 'django.db.backends.sqlite3',
         }
     },
+    MIGRATION_MODULES=DisableMigrations(),
     TEMPLATES=[{
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'APP_DIRS': True,

simple_history/registry_tests/tests.py

@@ -7,7 +7,7 @@
 from django.apps import apps
 from django.contrib.auth import get_user_model
 from django.core import management
-from django.test import TestCase
+from django.test import TestCase, override_settings
 from six.moves import cStringIO as StringIO
 
 from simple_history import exceptions, register
@@ -206,6 +206,7 @@ def test_custom_attr(self):
         self.assertEqual(field.attr_name, "custom_poll")
 
 
+@override_settings(MIGRATION_MODULES={})
 class TestMigrate(TestCase):
     def test_makemigration_command(self):
         management.call_command(

simple_history/tests/tests/test_models.py

@@ -1251,7 +1251,7 @@ def test_extra_ip_address_field_populated_on_save(self):
 
         poll_history = poll.history.first()
 
-        self.assertEquals("192.168.0.1", poll_history.ip_address)
+        self.assertEqual("192.168.0.1", poll_history.ip_address)
 
     def test_extra_ip_address_field_not_present_on_poll(self):
         poll = PollWithHistoricalIPAddress.objects.create(
@@ -1321,7 +1321,11 @@ class MultiDBWithUsingTest(TestCase):
     keyword argument in `save()`.
     """
 
-    multi_db = True
+    if django.VERSION >= (2, 2, 0, "final"):
+        databases = {"default", "other"}
+    else:
+        multi_db = True
+
     db_name = "other"
 
     def test_multidb_with_using_not_on_default(self):
@@ -1441,6 +1445,9 @@ def test_foreign_key_to_self_using_self_str(self):
 
 @override_settings(**database_router_override_settings)
 class MultiDBExplicitHistoryUserIDTest(TestCase):
+    if django.VERSION >= (2, 2):
+        databases = {"default", "other"}
+
     def setUp(self):
         self.user = get_user_model().objects.create(
             username="username", email="[email protected]", password="top_secret"
@@ -1570,7 +1577,10 @@ def test_revert(self):
 
 @override_settings(**database_router_override_settings_history_in_diff_db)
 class SaveHistoryInSeparateDatabaseTestCase(TestCase):
-    multi_db = True
+    if django.VERSION >= (2, 2, 0, "final"):
+        databases = {"default", "other"}
+    else:
+        multi_db = True
 
     def setUp(self):
         self.model = ModelWithHistoryInDifferentDb.objects.create(name="test")

tox.ini

@@ -3,6 +3,7 @@ envlist =
     py{27,34,35,36,37}-django111,
     py{34,35,36,37}-django20,
     py{35,36,37}-django21,
+    py{35,36,37}-django22,
     py{35,36,37}-djangotrunk,
     docs, flake8
 
@@ -32,6 +33,7 @@ deps =
     django111: Django>=1.11,<1.12
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<2.3
     djangotrunk: https://github.com/django/django/tarball/master
 commands =
     coverage run -a --branch setup.py test