Require django-jsonfield >= 1.1.0 (#5)

* Drop support for Django 1.8-1.10

* Require django-jsonfield >= 1.1.0

* Add support for Django 2.1-2.2

* Add support for Python 3.7

.travis.yml

@@ -1,32 +1,30 @@
-sudo: false
+dist: xenial
 language: python
 python:
-  - 2.7
-  - 3.4
   - 3.5
+  - 3.6
+  - 3.7
 
 env:
-  - DJANGO_VERSION=1.8.18
-  - DJANGO_VERSION=1.9.13
-  - DJANGO_VERSION=1.10.8
-  - DJANGO_VERSION=1.11.8
-  - DJANGO_VERSION=2.0
+  - DJANGO_VERSION=1.11.20
+  - DJANGO_VERSION=2.0.13
+  - DJANGO_VERSION=2.1.8
+  - DJANGO_VERSION=2.2
 
 install:
   - pip install -q Django==$DJANGO_VERSION
-  - pip install 'django-jsonfield >= 1.0.1, < 2.0.0a0' coverage
+  - pip install 'django-jsonfield >= 1.1.0, < 2.0.0a0' coverage
 
 script: coverage run --source=. ./setup.py test
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 
 matrix:
-  exclude:
-    - python: 2.7
-      env: DJANGO_VERSION=2.0
   include:
-    - python: 3.6
-      env: DJANGO_VERSION=1.11.8
-    - python: 3.6
-      env: DJANGO_VERSION=2.0
+    - python: 2.7
+      env: DJANGO_VERSION=1.11.20
+    - python: 3.4
+      env: DJANGO_VERSION=1.11.20
+    - python: 3.4
+      env: DJANGO_VERSION=2.0.13

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2017, Lucas Connors <[email protected]>
+Copyright (c) 2019, Lucas Connors <[email protected]>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

conditions/tests/migrations/0001_initial.py

@@ -0,0 +1,34 @@
+# Generated by Django 2.1.7 on 2019-04-04 12:43
+
+import conditions.fields
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Campaign',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('text', models.TextField()),
+                ('conditions', conditions.fields.ConditionsField(default=dict)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='UserProfile',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('level', models.IntegerField(default=1)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

docs/about.rst

@@ -8,4 +8,4 @@ django-conditions is a Django app that allows creation of conditional logic in a
 - In a game, define the winning objectives of a mission/quest
 - and many more...
 
-django-conditions supports Django 1.8-2.0 and Python 2.7, 3.4-3.6.
+django-conditions supports Django 1.11-2.2 and Python 2.7, 3.4-3.7.

setup.py

@@ -34,16 +34,18 @@ def run(self):
                 'django.contrib.auth',
                 'django.contrib.contenttypes',
                 'conditions',
+                'conditions.tests',
             ),
             MIDDLEWARE_CLASSES=()
         )
         django.setup()
+        call_command('migrate')
         call_command('test')
 
 
 requirements = [
-    'Django >= 1.8, < 2.1a0',
-    'django-jsonfield >= 1.0.1, < 2.0.0a0',
+    'Django >= 1.11, < 3.0a0',
+    'django-jsonfield >= 1.1.0, < 2.0.0a0',
 ]
 
 
@@ -61,11 +63,10 @@ def run(self):
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 1.8',
-        'Framework :: Django :: 1.9',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved',
         'License :: OSI Approved :: BSD License',
@@ -75,6 +76,7 @@ def run(self):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],