Merge branch 'main' into set_name

WordPress · Jul 8, 2021 · 90cab8f · 90cab8f
2 parents a3080da + dbe75fa
commit 90cab8f
Show file tree

Hide file tree

Showing 7 changed files with 242 additions and 243 deletions.
diff --git a/analytics/Pipfile.lock b/analytics/Pipfile.lock
diff --git a/openverse-api/Pipfile b/openverse-api/Pipfile
@@ -19,7 +19,7 @@ wsgi-basic-auth = "*"
 grequests = "*"
 requests-oauthlib = "*"
 aws-requests-auth = "*"
-Django = "==2.2.24"
+Django = "==3.2.5"
 Pillow = "*"
 django-cors-headers = "*"
 django-uuslug = "*"

diff --git a/openverse-api/Pipfile.lock b/openverse-api/Pipfile.lock
diff --git a/openverse-api/catalog/api/apps.py b/openverse-api/catalog/api/apps.py
@@ -2,4 +2,5 @@
 
 
 class ApiConfig(AppConfig):
-    name = 'api'
+    name = 'catalog.api'
+    default_auto_field = 'django.db.models.AutoField'
diff --git a/openverse-api/catalog/api/models/audio.py b/openverse-api/catalog/api/models/audio.py
@@ -1,4 +1,4 @@
-from django.contrib.postgres.fields import JSONField, ArrayField
+from django.contrib.postgres.fields import ArrayField
 from django.db import models
 from uuslug import uuslug
 
@@ -103,7 +103,7 @@ class Audio(AbstractMedia):
         help_text='Number in hertz, eg. 44100.',
     )
 
-    alt_files = JSONField(
+    alt_files = models.JSONField(
         blank=True,
         null=True,
         help_text='JSON describing alternative files for this audio.',

diff --git a/openverse-api/catalog/api/models/media.py b/openverse-api/catalog/api/models/media.py
@@ -1,4 +1,4 @@
-from django.contrib.postgres.fields import JSONField, ArrayField
+from django.contrib.postgres.fields import ArrayField
 from django.db import models
 from django.utils.html import format_html
 
@@ -27,7 +27,7 @@ class AbstractMedia(IdentifierMixin, MediaMixin, FileMixin, OpenLedgerModel):
     information common to all media types indexed by Openverse.
     """
 
-    watermarked = models.NullBooleanField(blank=True, null=True)
+    watermarked = models.BooleanField(blank=True, null=True)
 
     license = models.CharField(max_length=50)
     license_version = models.CharField(max_length=25, blank=True, null=True)
@@ -56,14 +56,14 @@ class AbstractMedia(IdentifierMixin, MediaMixin, FileMixin, OpenLedgerModel):
 
     view_count = models.IntegerField(default=0)
 
-    tags = JSONField(blank=True, null=True)
+    tags = models.JSONField(blank=True, null=True)
     tags_list = ArrayField(
         models.CharField(max_length=255),
         blank=True,
         null=True
     )
 
-    meta_data = JSONField(blank=True, null=True)
+    meta_data = models.JSONField(blank=True, null=True)
 
     @property
     def license_url(self):

diff --git a/openverse-api/catalog/api/serializers/link_serializers.py b/openverse-api/catalog/api/serializers/link_serializers.py
@@ -77,7 +77,7 @@ def save(self):
                 last_url = str(
                     ShortenedLink
                     .objects
-                    .latest(field_name='created_on')
+                    .latest('created_on')
                     .shortened_path
                 )
             except ShortenedLink.DoesNotExist: