Merge pull request #43 from vikingco/VD-688/fix-locking

VD-688: Fix django-db-locking migrations

.travis.yml

@@ -12,7 +12,9 @@ install:
    - pip install -r requirements/requirements_test.txt
    - pip install "Django${DJANGO}"
 before_script:
-    flake8 locking/
+    # All migrations have to be generated
+    - (! python test_project/manage.py makemigrations --dry-run --exit)
+    - flake8 locking/
 script:
     pytest -v --capture=sys --cov=locking/ locking/ --cov-report term-missing:skip-covered
 after_success:

locking/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.5'
+__version__ = '2.0.6'

locking/migrations/0001_squashed_0007_auto_20171004_0900.py

@@ -9,8 +9,6 @@
 
 class Migration(migrations.Migration):
 
-    replaces = [('locking', '0001_initial'), ('locking', '0002_rename'), ('locking', '0003_optimize_queries'), ('locking', '0004_auto_20160907_0942'), ('locking', '0004_auto_20151115_0703'), ('locking', '0005_merge_20170504_1024'), ('locking', '0006_auto_20170609_1342'), ('locking', '0007_auto_20171004_0900')]
-
     initial = True
 
     dependencies = [

locking/migrations/0002_auto_20171208_0824.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-12-08 08:24
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('locking', '0001_squashed_0007_auto_20171004_0900'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='nonblockinglock',
+            name='expires_on',
+            field=models.DateTimeField(db_index=True, verbose_name='expires on'),
+        ),
+        migrations.AlterField(
+            model_name='nonblockinglock',
+            name='renewed_on',
+            field=models.DateTimeField(db_index=True, verbose_name='renewed on'),
+        ),
+    ]