Merge tag '4.3.1' into thuenen_4.x

Release 4.3.1
Thuenen-GeoNode-Development · Aug 16, 2024 · c9af27b · c9af27b
2 parents 37fc263 + 46f27dc
commit c9af27b
Show file tree

Hide file tree

Showing 276 changed files with 7,239 additions and 7,109 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -128,7 +128,7 @@ workflows:
           codecov_name: api
           load_docker_cache: false
           save_docker_cache: false
-          test_suite: ./test.sh geonode.base.api.tests geonode.layers.api.tests geonode.maps.api.tests geonode.documents.api.tests geonode.geoapps.api.tests geonode.upload.api.tests
+          test_suite: ./test.sh geonode.api.tests geonode.base.api.tests geonode.layers.api.tests geonode.maps.api.tests geonode.documents.api.tests geonode.geoapps.api.tests geonode.upload.api.tests
       - build:
           name: geonode_test_csw
           codecov_name: csw

diff --git a/.clabot b/.clabot
@@ -75,6 +75,7 @@
     "EHJ-52n",
     "MartinPontius",
     "ahmdthr",
-    "fvicent"
+    "fvicent",
+    "RegisSinjari"
   ]
 }
diff --git a/.devcontainer/.env b/.devcontainer/.env
@@ -166,7 +166,7 @@ SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
 CACHE_BUSTING_STATIC_ENABLED=False
 
 MEMCACHED_ENABLED=False
-MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
+MEMCACHED_BACKEND=django.core.cache.backends.memcached.PyLibMCCache
 MEMCACHED_LOCATION=127.0.0.1:11211
 MEMCACHED_LOCK_EXPIRE=3600
 MEMCACHED_LOCK_TIMEOUT=10

diff --git a/.env.sample b/.env.sample
@@ -49,10 +49,6 @@ ALLOWED_HOSTS="['django', '{hostname}']"
 DEFAULT_BACKEND_UPLOADER=geonode.importer
 TIME_ENABLED=True
 MOSAIC_ENABLED=False
-HAYSTACK_SEARCH=False
-HAYSTACK_ENGINE_URL=http://elasticsearch:9200/
-HAYSTACK_ENGINE_INDEX_NAME=haystack
-HAYSTACK_SEARCH_RESULTS_PER_PAGE=200
 
 # #################
 # nginx
@@ -177,7 +173,7 @@ GEOIP_PATH=/mnt/volumes/statics/geoip.db
 CACHE_BUSTING_STATIC_ENABLED=False
 
 MEMCACHED_ENABLED=False
-MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
+MEMCACHED_BACKEND=django.core.cache.backends.memcached.PyLibMCCache
 MEMCACHED_LOCATION=memcached:11211
 MEMCACHED_LOCK_EXPIRE=3600
 MEMCACHED_LOCK_TIMEOUT=10

diff --git a/.env_dev b/.env_dev
@@ -49,10 +49,6 @@ ALLOWED_HOSTS="['django', '*']"
 DEFAULT_BACKEND_UPLOADER=geonode.importer
 TIME_ENABLED=True
 MOSAIC_ENABLED=False
-HAYSTACK_SEARCH=False
-HAYSTACK_ENGINE_URL=http://elasticsearch:9200/
-HAYSTACK_ENGINE_INDEX_NAME=haystack
-HAYSTACK_SEARCH_RESULTS_PER_PAGE=200
 
 # #################
 # nginx
@@ -177,7 +173,7 @@ SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
 CACHE_BUSTING_STATIC_ENABLED=False
 
 MEMCACHED_ENABLED=False
-MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
+MEMCACHED_BACKEND=django.core.cache.backends.memcached.PyLibMCCache
 MEMCACHED_LOCATION=127.0.0.1:11211
 MEMCACHED_LOCK_EXPIRE=3600
 MEMCACHED_LOCK_TIMEOUT=10

diff --git a/.env_local b/.env_local
@@ -49,10 +49,6 @@ ALLOWED_HOSTS="['django', '*']"
 DEFAULT_BACKEND_UPLOADER=geonode.importer
 TIME_ENABLED=True
 MOSAIC_ENABLED=False
-HAYSTACK_SEARCH=False
-HAYSTACK_ENGINE_URL=http://elasticsearch:9200/
-HAYSTACK_ENGINE_INDEX_NAME=haystack
-HAYSTACK_SEARCH_RESULTS_PER_PAGE=200
 
 # #################
 # nginx
@@ -177,7 +173,7 @@ SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
 CACHE_BUSTING_STATIC_ENABLED=False
 
 MEMCACHED_ENABLED=False
-MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
+MEMCACHED_BACKEND=django.core.cache.backends.memcached.PyLibMCCache
 MEMCACHED_LOCATION=127.0.0.1:11211
 MEMCACHED_LOCK_EXPIRE=3600
 MEMCACHED_LOCK_TIMEOUT=10

diff --git a/.env_test b/.env_test
@@ -49,10 +49,6 @@ ALLOWED_HOSTS="['django', 'localhost', '127.0.0.1']"
 DEFAULT_BACKEND_UPLOADER=geonode.importer
 TIME_ENABLED=True
 MOSAIC_ENABLED=False
-HAYSTACK_SEARCH=False
-HAYSTACK_ENGINE_URL=http://elasticsearch:9200/
-HAYSTACK_ENGINE_INDEX_NAME=haystack
-HAYSTACK_SEARCH_RESULTS_PER_PAGE=200
 
 # #################
 # nginx
@@ -186,7 +182,7 @@ GEOIP_PATH=/mnt/volumes/statics/geoip.db
 CACHE_BUSTING_STATIC_ENABLED=False
 
 MEMCACHED_ENABLED=False
-MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
+MEMCACHED_BACKEND=django.core.cache.backends.memcached.PyLibMCCache
 MEMCACHED_LOCATION=memcached:11211
 MEMCACHED_LOCK_EXPIRE=3600
 MEMCACHED_LOCK_TIMEOUT=10

diff --git a/.github/ISSUE_TEMPLATE/gnip.md b/.github/ISSUE_TEMPLATE/gnip.md
@@ -56,7 +56,6 @@ Project Steering Committee:
 * Alessio Fabiani:
 * Francesco Bartoli:
 * Giovanni Allegri:
-* Simone Dalmasso:
 * Toni Schoenbuchner:
 * Florian Hoedt:
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -52,7 +52,7 @@ services:
 
   # Nginx is serving django static and media files and proxies to django and geonode
   geonode:
-    image: geonode/nginx:1.25.3-v1
+    image: geonode/nginx:1.25.3-latest
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env
@@ -69,7 +69,7 @@ services:
 
   # Gets and installs letsencrypt certificates
   letsencrypt:
-    image: geonode/letsencrypt:2.6.0-v1
+    image: geonode/letsencrypt:2.6.0-latest
     container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env
@@ -79,7 +79,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.24.2-v1
+    image: geonode/geoserver:2.24.4-v1
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -105,7 +105,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.24.2-v1
+    image: geonode/geoserver_data:2.24.4-v1
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:
@@ -117,7 +117,7 @@ services:
   # PostGIS database.
   db:
     # use geonode official postgis 15 image
-    image: geonode/postgis:15.3-v1
+    image: geonode/postgis:15.3-latest
     command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
     container_name: db4${COMPOSE_PROJECT_NAME}
     env_file:

diff --git a/docker-compose-test.yml b/docker-compose-test.yml
@@ -3,7 +3,7 @@ version: '3.9'
 # Common Django template for GeoNode and Celery services below
 x-common-django:
   &default-common-django
-  image: geonode/geonode:4.2.5
+  image: geonode/geonode:4.3.0
   build:
       context: ./
       dockerfile: Dockerfile
@@ -32,7 +32,7 @@ services:
       start_period: 60s
       interval: 60s
       timeout: 10s
-      retries: 2
+      retries: 5
     environment:
       - IS_CELERY=False
     entrypoint: ["/usr/src/geonode/entrypoint.sh"]
@@ -52,7 +52,7 @@ services:
 
   # Nginx is serving django static and media files and proxies to django and geonode
   geonode:
-    image: geonode/nginx:1.25.3-v1
+    image: geonode/nginx:1.25.3-latest
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env_test
@@ -82,7 +82,7 @@ services:
 
   # Gets and installs letsencrypt certificates
   letsencrypt:
-    image: geonode/letsencrypt:2.6.0-v1
+    image: geonode/letsencrypt:2.6.0-latest
     container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env_test
@@ -92,7 +92,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.24.2-v1
+    image: geonode/geoserver:2.24.4-v1
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -118,7 +118,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.24.2-v1
+    image: geonode/geoserver_data:2.24.4-v1
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:
@@ -130,7 +130,7 @@ services:
   # PostGIS database.
   db:
     # use geonode official postgis 15 image
-    image: geonode/postgis:15.3-v1
+    image: geonode/postgis:15.3-latest
     command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
     container_name: db4${COMPOSE_PROJECT_NAME}
     env_file:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.9'
 # Common Django template for GeoNode and Celery services below
 x-common-django:
   &default-common-django
-  image: geonode/geonode:4.2.5
+  image: geonode/geonode:4.3.1
   #build:
   #    context: ./
   #    dockerfile: Dockerfile
@@ -64,7 +64,7 @@ services:
 
   # Nginx is serving django static and media files and proxies to django and geonode
   geonode:
-    image: geonode/nginx:1.25.3-v1
+    image: geonode/nginx:1.25.3-latest
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env
@@ -81,7 +81,7 @@ services:
 
   # Gets and installs letsencrypt certificates
   letsencrypt:
-    image: geonode/letsencrypt:2.6.0-v1
+    image: geonode/letsencrypt:2.6.0-latest
     container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env
@@ -91,7 +91,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.24.2-v1
+    image: geonode/geoserver:2.24.4-v1
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -117,7 +117,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.24.2-v2
+    image: geonode/geoserver_data:2.24.4-v1
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:
@@ -129,7 +129,7 @@ services:
   # PostGIS database.
   db:
     # use geonode official postgis 15 image
-    image: geonode/postgis:15.3-v1
+    image: geonode/postgis:15.3-latest
     command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
     container_name: db4${COMPOSE_PROJECT_NAME}
     env_file:

diff --git a/geonode/__init__.py b/geonode/__init__.py
@@ -19,10 +19,7 @@
 
 import os
 
-__version__ = (4, 2, 5, "final", 0)
-
-
-default_app_config = "geonode.apps.AppConfig"
+__version__ = (4, 3, 1, "final", 0)
 
 
 def get_version():

diff --git a/geonode/api/__init__.py b/geonode/api/__init__.py
@@ -16,4 +16,3 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 #########################################################################
-default_app_config = "geonode.api.apps.GeoNodeApiAppConfig"
diff --git a/geonode/api/api.py b/geonode/api/api.py
@@ -22,7 +22,6 @@
 
 from django.apps import apps
 from django.db.models import Q
-from django.conf.urls import url
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.urls import reverse
@@ -61,7 +60,6 @@
 from tastypie import fields
 from tastypie.resources import ModelResource
 from tastypie.constants import ALL, ALL_WITH_RELATIONS
-from tastypie.utils import trailing_slash
 
 from geonode.utils import check_ogc_backend
 from geonode.security.utils import get_visible_resources
@@ -548,16 +546,7 @@ def dehydrate(self, bundle):
         return bundle
 
     def prepend_urls(self):
-        if settings.HAYSTACK_SEARCH:
-            return [
-                url(
-                    r"^(?P<resource_name>{})/search{}$".format(self._meta.resource_name, trailing_slash()),
-                    self.wrap_view("get_search"),
-                    name="api_get_search",
-                ),
-            ]
-        else:
-            return []
+        return []
 
     def serialize(self, request, data, format, options=None):
         if options is None: