Adapt to django 2+ changes.

rk2810 · rk2810 · commit bf7d06181863 · 2019-05-30T11:19:51.000+05:30
Signed-off-by: rk2810 &lt;rohan.kumquat@gmail.com&gt;
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,5 @@
 .tox
 /dist
 /wheelhouse
+/build
+
diff --git a/dj_elastictranscoder/migrations/0001_initial.py b/dj_elastictranscoder/migrations/0001_initial.py
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
                 ('message', models.TextField()),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('last_modified', models.DateTimeField(auto_now=True)),
-                ('content_type', models.ForeignKey(to='contenttypes.ContentType')),
+                ('content_type', models.ForeignKey(to='contenttypes.ContentType', on_delete=models.CASCADE)),
             ],
         ),
     ]
diff --git a/dj_elastictranscoder/models.py b/dj_elastictranscoder/models.py
@@ -17,7 +17,7 @@ class EncodeJob(models.Model):
         (4, 'Complete'),
     )
     id = models.CharField(max_length=100, primary_key=True)
-    content_type = models.ForeignKey(ContentType)
+    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
     object_id = models.PositiveIntegerField()
     state = models.PositiveIntegerField(choices=STATE_CHOICES, default=0, db_index=True)
     content_object = GenericForeignKey()
diff --git a/dj_elastictranscoder/urls.py b/dj_elastictranscoder/urls.py
@@ -1,7 +1,7 @@
 import django
 
 
-if django.VERSION >= (1, 9):
+if django.VERSION >= (2, 2):
     from django.conf.urls import url
     from dj_elastictranscoder import views
 
diff --git a/setup.py b/setup.py
@@ -24,20 +24,20 @@ def get_version():
     sys.exit()
 
 setup(
-    name='django-elastic-transcoder',
+    name='django2-elastic-transcoder',
     version=get_version(),
     description="Django with AWS elastic transcoder",
     long_description=open('README.rst').read(),
-    author='tzangms',
-    author_email='tzangms@streetvoice.com',
+    author='rohanK',
+    author_email='rohan.kumquat@gmail.com',
     url='http://github.com/StreetVoice/django-elastic-transcoder',
     license='MIT',
     packages=find_packages(exclude=('testsapp', )),
     include_package_data=True,
     zip_safe=False,
     install_requires=[
         "boto3 >= 1.1",
-        "django >= 1.3, < 1.10",
+        "django >= 1.3, < 2.3",
         "qiniu >= 7.0.8",
     ],
     classifiers=[
diff --git a/tox.ini b/tox.ini
@@ -22,6 +22,7 @@ deps =
     dj17: django>=1.7,<1.7.999
     dj18: django>=1.8,<1.8.999
     dj19: https://github.com/django/django/archive/master.tar.gz#egg=django
+    dj2.1: django>=1.9,<2.3
 setenv =
     DJANGO_SETTINGS_MODULE = testsapp.tests_settings
     PYTHONPATH = {toxinidir}/testsapp:{toxinidir}
@@ -30,4 +31,4 @@ setenv =
 commands = py.test --cov=dj_elastictranscoder
 deps =
     -rtestsapp/requirements.txt
-    django>=1.8,<1.8.999
+    django>=1.8,<2.3

-Original file line number
+Diff line change
 .tox
 /dist
 /wheelhouse
 +/build
++
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class Migration(migrations.Migration):`
`20`	`20`	`('message', models.TextField()),`
`21`	`21`	`('created_at', models.DateTimeField(auto_now_add=True)),`
`22`	`22`	`('last_modified', models.DateTimeField(auto_now=True)),`
`23`		`- ('content_type', models.ForeignKey(to='contenttypes.ContentType')),`
	`23`	`+ ('content_type', models.ForeignKey(to='contenttypes.ContentType', on_delete=models.CASCADE)),`
`24`	`24`	`],`
`25`	`25`	`),`
`26`	`26`	`]`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class EncodeJob(models.Model):`
`17`	`17`	`(4, 'Complete'),`
`18`	`18`	`)`
`19`	`19`	`id = models.CharField(max_length=100, primary_key=True)`
`20`		`- content_type = models.ForeignKey(ContentType)`
	`20`	`+ content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)`
`21`	`21`	`object_id = models.PositiveIntegerField()`
`22`	`22`	`state = models.PositiveIntegerField(choices=STATE_CHOICES, default=0, db_index=True)`
`23`	`23`	`content_object = GenericForeignKey()`