.travis.yml

@@ -1,18 +1,19 @@
 language: python
 env:
-   - DJANGO='>=1.8,<1.9'
-   - DJANGO='>=1.9,<1.10'
-   - DJANGO='>=1.10,<1.11'
    - DJANGO='>=1.11,<1.12'
+   - DJANGO='>=2.0,<2.1'
+   - DJANGO='>=2.1<2.2'
 python:
-   - "2.7"
-   - "3.6"
+   - "3.6.7"
 install:
+   - pip install --upgrade pip
    - pip install -e .
    - 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.2'
+__version__ = '2.0.8'

locking/exceptions.py

@@ -3,96 +3,96 @@ class Error(Exception):
 
 
 class LockError(Error):
-    '''
+    """
     Base class for errors arising from attempts to acquire the lock.
 
     >>> try:
     ...   raise LockError
     ... except Error:
     ...   pass
-    '''
+    """
     pass
 
 
 class LockFailed(LockError):
-    '''
+    """
     Lock creation failed for some unknown reason.
 
     >>> try:
     ...   raise LockFailed
     ... except LockError:
     ...   pass
-    '''
+    """
     pass
 
 
 class AlreadyLocked(LockFailed):
-    '''
+    """
     Some other process is locking the object.
 
     >>> try:
     ...   raise AlreadyLocked
     ... except LockFailed:
     ...   pass
-    '''
+    """
     pass
 
 
 class UnlockError(Error):
-    '''
+    """
     Base class for errors arising from attempts to release the lock.
 
     >>> try:
     ...   raise UnlockError
     ... except Error:
     ...   pass
-    '''
+    """
     pass
 
 
 class NotLocked(UnlockError):
-    '''
+    """
     Raised when an attempt is made to unlock an unlocked file.
 
     >>> try:
     ...   raise NotLocked
     ... except UnlockError:
     ...   pass
-    '''
+    """
     pass
 
 
 class RenewalError(Error):
-    '''
+    """
     Base class for errors arising from attempts to renew the lock.
 
     >>> try:
     ...   raise RenewalError
     ... except Error:
     ...   pass
-    '''
+    """
     pass
 
 
 class NonexistentLock(RenewalError):
-    '''
+    """
     Raised when an attempt is made to renew a nonexistent lock.
 
     >>> try:
     ...   raise NonexistentLock
     ... except RenewalError:
     ...   pass
-    '''
+    """
     pass
 
 
 class Expired(RenewalError):
-    '''
+    """
     Raised when an attempt is made to renew an expired lock.
 
     >>> try:
     ...   raise Expired
     ... except RenewalError:
     ...   pass
-    '''
+    """
     pass

locking/migrations/0001_squashed_0007_auto_20171004_0900.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-10-04 09:01
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='NonBlockingLock',
+            fields=[
+                ('locked_object', models.CharField(max_length=150, unique=True, verbose_name='locked object')),
+                ('created_on', models.DateTimeField(db_index=True, verbose_name='created on')),
+                ('max_age', models.PositiveIntegerField(default=0, help_text='The age of a lock before it can be overwritten. 0 means indefinitely.', verbose_name='Maximum lock age')),
+                ('expires_on', models.DateTimeField(db_index=True, default=datetime.datetime(2015, 9, 7, 3, 32, 8, 543000), verbose_name='expires on')),
+                ('renewed_on', models.DateTimeField(db_index=True, default=datetime.datetime(2015, 9, 7, 3, 32, 18, 56000), verbose_name='renewed on')),
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+            ],
+            options={
+                'verbose_name_plural': 'NonBlockingLocks',
+                'verbose_name': 'NonBlockingLock',
+                'ordering': ['created_on'],
+            },
+        ),
+    ]

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'),
+        ),
+    ]