Upgrade django to 6.0.2 and all other dependencies (#5092)

* Upgrade django to 6.0.2 and all other dependencies

* Fix tests

Author: dimasciput

bims/admin.py

@@ -248,7 +248,7 @@ def queryset(self, request, queryset):
         return queryset
 
 
-class LocationSiteAdmin(admin.GeoModelAdmin):
+class LocationSiteAdmin(admin.GISModelAdmin):
     change_list_template = 'admin/location_site_changelist.html'
     form = LocationSiteForm
     default_zoom = 5
@@ -483,16 +483,18 @@ class IUCNStatusAdmin(OrderedModelAdmin):
     )
 
     def iucn_colour(self, obj):
-        return format_html('<div style="background:%s; ' \
-                           'width: 50px; height: 15px;"></div>' % obj.colour)
+        return format_html(
+            '<div style="background:{}; width: 50px; height: 15px;"></div>',
+            obj.colour)
 
     def total_species(self, obj):
         total_taxa = Taxonomy.objects.filter(
             iucn_status=obj
         ).count()
         return format_html(
-            f'<a href="/admin/bims/taxonomy/?iucn_status__id__exact={obj.id}">'
-            f'{total_taxa}</a>'
+            '<a href="/admin/bims/taxonomy/?iucn_status__id__exact={}">'
+            '{}</a>',
+            obj.id, total_taxa
         )
 
     iucn_colour.allow_tags = True
@@ -974,9 +976,9 @@ def merge_users(self, request, queryset):
     merge_users.short_description = 'Merge users'
 
     def sass_accredited_status(self, obj):
-        false_response = format_html(
+        false_response = mark_safe(
             '<img src="/static/admin/img/icon-no.svg" alt="False">')
-        true_response = format_html(
+        true_response = mark_safe(
             '<img src="/static/admin/img/icon-yes.svg" alt="True">')
 
     def role(self, obj):
@@ -995,9 +997,9 @@ def sass_accredited_status(self, obj, **kwargs):
             false_response = 'False'
             true_response = 'True'
         else:
-            false_response = format_html(
+            false_response = mark_safe(
                 '<img src="/static/admin/img/icon-no.svg" alt="False">')
-            true_response = format_html(
+            true_response = mark_safe(
                 '<img src="/static/admin/img/icon-yes.svg" alt="True">')
         try:
             profile = BimsProfile.objects.get(user=obj)
@@ -1018,9 +1020,9 @@ def signed_up(self, obj, **kwargs):
             false_response = 'False'
             true_response = 'True'
         else:
-            false_response = format_html(
+            false_response = mark_safe(
                 '<img src="/static/admin/img/icon-no.svg" alt="False">')
-            true_response = format_html(
+            true_response = mark_safe(
                 '<img src="/static/admin/img/icon-yes.svg" alt="True">')
         if not obj.email:
             return false_response
@@ -1078,13 +1080,15 @@ def response_add(self, request, obj, post_url_continue=None):
             request, obj, post_url_continue)
 
     def changelist_view(self, request, extra_context=None):
-        test = request.META['HTTP_REFERER'].split(request.META['PATH_INFO'])
-        if test[-1] and not test[-1].startswith('?'):
-            if 'signed_up' not in request.GET:
-                q = request.GET.copy()
-                q['signed_up'] = 'True'
-                request.GET = q
-                request.META['QUERY_STRING'] = request.GET.urlencode()
+        referer = request.META.get('HTTP_REFERER', '')
+        if referer:
+            test = referer.split(request.META['PATH_INFO'])
+            if test[-1] and not test[-1].startswith('?'):
+                if 'signed_up' not in request.GET:
+                    q = request.GET.copy()
+                    q['signed_up'] = 'True'
+                    request.GET = q
+                    request.META['QUERY_STRING'] = request.GET.urlencode()
         return super().changelist_view(request, extra_context=extra_context)
 
 class BaseMapLayerAdmin(OrderedModelAdmin):
@@ -1336,8 +1340,7 @@ class TaxonGroupAdmin(admin.ModelAdmin):
         'category',
     )
     filter_horizontal = (
-        'taxonomies',
-        'experts'
+        'experts',
     )
     raw_id_fields = (
         'gbif_parent_species',
@@ -1836,9 +1839,9 @@ def taxon_group_list(self, obj: Biotope):
 
     def used_in_SASS(self, obj: Biotope):
         if obj.sassbiotopefraction_set.all().exists():
-            return format_html(
+            return mark_safe(
                 '<img src="/static/admin/img/icon-yes.svg" alt="True">')
-        return format_html(
+        return mark_safe(
             '<img src="/static/admin/img/icon-no.svg" alt="False">')
 
     list_display = (

bims/forms/upload.py

@@ -17,10 +17,14 @@ class UploadForm(forms.Form):
     name = forms.CharField(max_length=200)
     email = forms.EmailField()
     upload_type = forms.ModelChoiceField(
-        queryset=UploadType.objects.all().order_by('order'),
+        queryset=UploadType.objects.none(),
         empty_label=None,
         to_field_name='code'
     )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['upload_type'].queryset = UploadType.objects.all().order_by('order')
     upload_file = forms.FileField(
         validators=[FileExtensionValidator(
             allowed_extensions=ALLOWED_EXTENSIONS)

bims/migrations/0183_auto_20190924_0628.py

@@ -5,7 +5,8 @@
 import datetime
 from django.db import migrations, models
 import django.db.models.deletion
-from django.utils.timezone import utc
+from datetime import timezone as tz
+utc = tz.utc
 
 
 class Migration(migrations.Migration):

bims/tests/model_factories.py

@@ -1,4 +1,5 @@
 # noinspection PyUnresolvedReferences,PyPackageRequirements
+import datetime
 import factory
 import random
 
@@ -187,9 +188,8 @@ class Meta:
     is_staff = False
     is_active = True
     is_superuser = False
-    last_login = timezone.datetime(2000, 1, 1).replace(tzinfo=timezone.utc)
-    date_joined = timezone.datetime(1999, 1, 1).replace(
-        tzinfo=timezone.utc)
+    last_login = timezone.datetime(2000, 1, 1, tzinfo=datetime.timezone.utc)
+    date_joined = timezone.datetime(1999, 1, 1, tzinfo=datetime.timezone.utc)
 
     @classmethod
     def _prepare(cls, create, **kwargs):

bims/tests/test_delete_dangling_sites.py

@@ -155,7 +155,7 @@ def test_dangling_queryset_for_location_site_skip_logic(self):
         qs = _dangling_queryset(
             LocationSite, skip_models=frozenset({LocationContext})
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             qs.order_by("id"),
             [site1, site3],
             transform=lambda x: x,

bims/tests/test_taxa_upload.py

@@ -6,6 +6,7 @@
 from mock import mock
 
 from bims.models import TaxonGroupTaxonomy
+from bims.models.taxon_origin import TaxonOrigin
 from bims.scripts.taxa_upload import TaxaCSVUpload
 from bims.tests.model_factories import (
     UploadSessionF,
@@ -48,6 +49,13 @@ def setUp(self):
             national=False
         )
 
+        # Create TaxonOrigin records used by the upload script
+        for key in ('indigenous', 'alien', 'unknown', 'alien-invasive', 'alien-non-invasive'):
+            TaxonOrigin.objects.get_or_create(
+                origin_key=key,
+                defaults={'category': key}
+            )
+
         with open(os.path.join(
             test_data_directory, 'taxa_upload_family.csv'
         ), 'rb') as file:

bims/tests/test_upload_view.py

@@ -29,6 +29,10 @@ def setUp(self):
             self.url = reverse(UPLOAD_URL_NAME)
         except Exception:
             self.url = "/upload/"
+        self.upload_type, _ = UploadType.objects.get_or_create(
+            code="occurrence",
+            defaults={"name": "Occurrence", "order": 0},
+        )
 
     def _make_file(self, name="data.csv", content=b"col1,col2\nx,y\n"):
         return SimpleUploadedFile(name, content, content_type="text/csv")

bims/views/site_visit/update.py

@@ -402,10 +402,10 @@ def get_success_url(self):
         session_uuid = '%s' % uuid.uuid4()
         self.add_last_session(self.request, session_uuid, {
             'edited_at': int(time.mktime(libdatetime.now().timetuple())),
-            'records': BiologicalCollectionRecord.objects.filter(
+            'records': list(BiologicalCollectionRecord.objects.filter(
                 survey=self.object
-            ),
-            'location_site': self.object.site,
+            ).values_list('id', flat=True)),
+            'location_site': self.object.site.id if self.object.site else None,
             'form': 'site-visit-form'
         })
         next_url = '/site-visit/detail/{}/'.format(self.object.id)

core/config_hook/apps.py

@@ -9,10 +9,14 @@ class AppConfig(AppConfig):
 
     def ready(self):
         super(AppConfig, self).ready()
-        # check settings
         from django.conf import settings
-        from bims.utils.add_index import add_indexes_for_taxonomy
-        add_indexes_for_taxonomy()
+        from django.db.models.signals import post_migrate
+
+        def create_taxonomy_indexes(sender, **kwargs):
+            from bims.utils.add_index import add_indexes_for_taxonomy
+            add_indexes_for_taxonomy()
+
+        post_migrate.connect(create_taxonomy_indexes, sender=self)
 
         installed_apps = []
 

core/settings/legacy_geonode_settings.py

@@ -238,12 +238,10 @@
 AUTH_USER_MODEL = os.getenv('AUTH_USER_MODEL', 'people.Profile')
 
 PASSWORD_HASHERS = [
-    'django.contrib.auth.hashers.SHA1PasswordHasher',
     'django.contrib.auth.hashers.PBKDF2PasswordHasher',
-    'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
+    'django.contrib.auth.hashers.ScryptPasswordHasher',
     # 'django.contrib.auth.hashers.Argon2PasswordHasher',
     # 'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
-    # 'django.contrib.auth.hashers.BCryptPasswordHasher',
 ]
 
 MODELTRANSLATION_LANGUAGES = ['en', ]
@@ -743,7 +741,7 @@
     'DETAIL': 'never',
 }
 
-SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
+SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'
 
 try:
     # try to parse python notation, default in dockerized env