♻️ django 3.2 - new version of libraries: fix errors and deprecation warnings

1 files changed, 2 insertions, 3 deletions

diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index 19d04ea17..d4944b3d9 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -30,7 +30,6 @@ from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.gis.db import models
 from django.contrib.gis.geos import GEOSGeometry, Point
 from django.contrib.gis.gdal.error import GDALException
-from django.contrib.postgres.fields import JSONField
 from django.contrib.postgres.search import SearchVectorField, SearchVector
 from django.contrib.sites.models import Site
 from django.core.cache import cache as django_cache
@@ -40,7 +39,7 @@ from django.core.serializers import serialize
 from django.urls import reverse, NoReverseMatch
 from django.core.validators import validate_slug
 from django.db import connection, transaction, OperationalError, IntegrityError
-from django.db.models import Q, Count, Max
+from django.db.models import JSONField, Q, Count, Max
 from django.db.models.signals import post_save, post_delete, m2m_changed
 from django.template import loader
 from django.template.defaultfilters import slugify
@@ -4370,7 +4369,7 @@ class Merge(models.Model):
     merge_key = models.TextField(_("Merge key"), blank=True, null=True)
     merge_candidate = models.ManyToManyField("self", blank=True)
     merge_exclusion = models.ManyToManyField("self", blank=True)
-    archived = models.NullBooleanField(default=False, blank=True, null=True)
+    archived = models.BooleanField(default=False, blank=True, null=True)
     # 1 for one word similarity, 2 for two word similarity, etc.
     MERGE_CLEMENCY = None
     EMPTY_MERGE_KEY = "--"