Merge pull request #422 from gerrod3/json_field

Fix `JSONField` deprecation warnings

Author: gerrod3

pulp_python/app/migrations/0010_update_json_field.py

@@ -0,0 +1,53 @@
+# Generated by Django 3.2.6 on 2021-08-24 19:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('python', '0009_pythondistribution_allow_uploads'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='pythonpackagecontent',
+            name='classifiers',
+            field=models.JSONField(default=list),
+        ),
+        migrations.AlterField(
+            model_name='pythonpackagecontent',
+            name='obsoletes_dist',
+            field=models.JSONField(default=list),
+        ),
+        migrations.AlterField(
+            model_name='pythonpackagecontent',
+            name='project_urls',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AlterField(
+            model_name='pythonpackagecontent',
+            name='provides_dist',
+            field=models.JSONField(default=list),
+        ),
+        migrations.AlterField(
+            model_name='pythonpackagecontent',
+            name='requires_dist',
+            field=models.JSONField(default=list),
+        ),
+        migrations.AlterField(
+            model_name='pythonpackagecontent',
+            name='requires_external',
+            field=models.JSONField(default=list),
+        ),
+        migrations.AlterField(
+            model_name='pythonremote',
+            name='excludes',
+            field=models.JSONField(default=list),
+        ),
+        migrations.AlterField(
+            model_name='pythonremote',
+            name='includes',
+            field=models.JSONField(default=list),
+        ),
+    ]

pulp_python/app/models.py

@@ -1,7 +1,7 @@
 from logging import getLogger
 
 from aiohttp.web import json_response
-from django.contrib.postgres.fields import ArrayField, JSONField
+from django.contrib.postgres.fields import ArrayField
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 from django.conf import settings
@@ -150,12 +150,12 @@ class PythonPackageContent(Content):
     project_url = models.TextField()
     platform = models.TextField()
     supported_platform = models.TextField()
-    requires_dist = JSONField(default=list)
-    provides_dist = JSONField(default=list)
-    obsoletes_dist = JSONField(default=list)
-    requires_external = JSONField(default=list)
-    classifiers = JSONField(default=list)
-    project_urls = JSONField(default=dict)
+    requires_dist = models.JSONField(default=list)
+    provides_dist = models.JSONField(default=list)
+    obsoletes_dist = models.JSONField(default=list)
+    requires_external = models.JSONField(default=list)
+    classifiers = models.JSONField(default=list)
+    project_urls = models.JSONField(default=dict)
     description_content_type = models.TextField()
 
     def __str__(self):
@@ -203,8 +203,8 @@ class PythonRemote(Remote):
     TYPE = 'python'
     DEFAULT_DOWNLOAD_CONCURRENCY = 10
     prereleases = models.BooleanField(default=False)
-    includes = JSONField(default=list)
-    excludes = JSONField(default=list)
+    includes = models.JSONField(default=list)
+    excludes = models.JSONField(default=list)
     package_types = ArrayField(models.CharField(max_length=15, blank=True),
                                choices=PACKAGE_TYPES, default=list)
     keep_latest_packages = models.IntegerField(default=0)