Version 4.5.0 (#689)

* Update istsos to 2.4.1-4

* Change download file to ods

* Update to use ods files

* Fix link

* Bump version 4.5.0

deployment/.env

@@ -248,8 +248,8 @@ PYTHONPATH=/home/web/django_project:/geonode
 USE_DEFAULT_GEOSERVER_STYLE=False
 INITIAL_FIXTURES=True
 
-VERSION=4.4.18
-ISTSOS_VERSION=2.4.1-3
+VERSION=4.5.0
+ISTSOS_VERSION=2.4.1-4
 
 # ------ GEOSERVER ------
 STABLE_EXTENSIONS=web-resource-plugin,netcdf-out-plugin

deployment/docker-compose.yml

@@ -26,14 +26,6 @@ services:
       - rabbitmq:/var/lib/rabbitmq
     restart: on-failure
 
-  # postfix with smtp authentication (sasldb) TLS and OpenDKIM support are optional
-  smtp:
-    image: catatnight/postfix
-    environment:
-      maildomain: "${DJANGO_EMAIL_HOST}"
-      smtp_user: "${DJANGO_EMAIL_HOST_USER}:${DJANGO_EMAIL_HOST_PASSWORD}"
-    restart: unless-stopped
-
   # Our custom django application. It includes Geonode.
   django:
     <<: *default-common-django

deployment/docker/Dockerfile

@@ -11,6 +11,7 @@ RUN apt-get update -y && apt-get -y --allow-downgrades --allow-remove-essential
 RUN echo "Activate memcached" && \
     apt-get update && apt-get install -y memcached && \
     pip install pylibmc  && pip install sherlock
+RUN apt-get install -y libreoffice
 
 WORKDIR /
 

deployment/docker/REQUIREMENTS.txt

@@ -17,5 +17,6 @@ wagtailmenus==3.1.5
 openpyxl==3.0.10
 pyexcel-xls==0.7.0
 pyexcel-xlsx==0.6.0
+pyexcel-ods3==0.6.1
 
 git+https://github.com/kartoza/[email protected]

django_project/igrac/migrations/0009_auto_20230605_1022.py

@@ -4,27 +4,6 @@
 import django.db.models.deletion
 from django.db import migrations, models
 
-from geonode.layers.models import Dataset
-from igrac.models.site_preference import SitePreference
-
-
-def run(apps, schema_editor):
-    site_preference = SitePreference.objects.first()
-    if site_preference:
-        try:
-            site_preference.well_and_monitoring_data_layer = Dataset.objects.get(
-                store='groundwater', name='Groundwater_Well'
-            )
-        except Dataset.DoesNotExist:
-            pass
-        try:
-            site_preference.ggmn_layer = Dataset.objects.get(
-                store='groundwater', name='Groundwater_Well_GGMN'
-            )
-        except Dataset.DoesNotExist:
-            pass
-        site_preference.save()
-
 
 class Migration(migrations.Migration):
     dependencies = [
@@ -36,18 +15,22 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='sitepreference',
             name='ggmn_layer',
-            field=models.OneToOneField(blank=True, null=True,
-                                       on_delete=django.db.models.deletion.SET_NULL,
-                                       related_name='preference_ggmn_layer',
-                                       to='layers.dataset'),
+            field=models.OneToOneField(
+                blank=True, null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name='preference_ggmn_layer',
+                to='layers.dataset'
+            ),
         ),
         migrations.AddField(
             model_name='sitepreference',
             name='well_and_monitoring_data_layer',
-            field=models.OneToOneField(blank=True, null=True,
-                                       on_delete=django.db.models.deletion.SET_NULL,
-                                       related_name='preference_well_and_monitoring_data_layer',
-                                       to='layers.dataset'),
+            field=models.OneToOneField(
+                blank=True, null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name='preference_well_and_monitoring_data_layer',
+                to='layers.dataset'
+            ),
         ),
         migrations.CreateModel(
             name='GroundwaterLayer',
@@ -60,6 +43,5 @@ class Migration(migrations.Migration):
                     on_delete=django.db.models.deletion.CASCADE,
                     to='layers.dataset')),
             ],
-        ),
-        migrations.RunPython(run, migrations.RunPython.noop),
+        )
     ]

django_project/version/version.txt

@@ -1 +1 @@
-4.4.18
+4.5.0