Merge tag '4.2.2' into 52n-prepare-4.2.2

.github/workflows/flake8.yml

@@ -27,7 +27,7 @@ jobs:
         python-version: ${{matrix.python-version}}
 
     - name: Install flake8 & black
-      run: pip install flake8 black
+      run: pip install --upgrade $(grep 'flake8\|black' requirements.txt)
 
     - name: "Check: flake8"
       run: |

create-envfile.py

@@ -92,9 +92,7 @@ def _get_vals_to_replace(args):
         _vals_to_replace["letsencrypt_mode"] = (
             "disabled"
             if not _vals_to_replace.get("https_host")
-            else "staging"
-            if _jsfile.get("env_type", args.env_type) in ["test"]
-            else "production"
+            else "staging" if _jsfile.get("env_type", args.env_type) in ["test"] else "production"
         )
         _vals_to_replace["debug"] = False if _jsfile.get("env_type", args.env_type) in ["prod", "test"] else True
         _vals_to_replace["email"] = _jsfile.get("email", args.email)
@@ -124,7 +122,7 @@ def _get_vals_to_replace(args):
         prog="ENV file builder",
         description="Tool for generate environment file automatically. The information can be passed or via CLI or via JSON file ( --file /path/env.json)",
         usage="python create-envfile.py localhost -f /path/to/json/file.json",
-        allow_abbrev=False
+        allow_abbrev=False,
     )
     parser.add_argument(
         "--noinput",

docker-compose-dev.yml

@@ -79,7 +79,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.23.3-v1
+    image: geonode/geoserver:2.23.3-v2
     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"

docker-compose-test.yml

@@ -92,7 +92,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.23.3-v1
+    image: geonode/geoserver:2.23.3-v2
     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"

docker-compose.yml

@@ -91,7 +91,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.23.3-v1
+    image: geonode/geoserver:2.23.3-v2
     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"

geonode/__init__.py

@@ -19,7 +19,7 @@
 
 import os
 
-__version__ = (4, 2, 0, "dev", 0)
+__version__ = (4, 2, 2, "final", 0)
 
 
 default_app_config = "geonode.apps.AppConfig"

geonode/api/resourcebase_api.py

@@ -593,7 +593,6 @@ def hydrate_title(self, bundle):
 
 
 class ResourceBaseResource(CommonModelApi):
-
     """ResourceBase api"""
 
     class Meta(CommonMetaApi):
@@ -607,7 +606,6 @@ class Meta(CommonMetaApi):
 
 
 class FeaturedResourceBaseResource(CommonModelApi):
-
     """Only the featured resourcebases"""
 
     class Meta(CommonMetaApi):
@@ -620,7 +618,6 @@ class Meta(CommonMetaApi):
 
 
 class LayerResource(CommonModelApi):
-
     """Dataset API"""
 
     links = fields.ListField(attribute="links", null=True, use_in="all", default=[])
@@ -756,7 +753,6 @@ class Meta(CommonMetaApi):
 
 
 class MapResource(CommonModelApi):
-
     """Maps API"""
 
     def build_filters(self, filters=None, ignore_bad_filters=False, **kwargs):
@@ -822,7 +818,6 @@ class Meta(CommonMetaApi):
 
 
 class GeoAppResource(CommonModelApi):
-
     """GeoApps API"""
 
     def format_objects(self, objects):
@@ -874,7 +869,6 @@ class Meta(CommonMetaApi):
 
 
 class DocumentResource(CommonModelApi):
-
     """Documents API"""
 
     def build_filters(self, filters=None, ignore_bad_filters=False, **kwargs):

geonode/api/tests.py

@@ -386,7 +386,6 @@ def test_tags_lockdown(self):
 
 
 class SearchApiTests(ResourceTestCaseMixin, GeoNodeBaseTestSupport):
-
     """Test the search"""
 
     #  loading test thesausuri and initial data

geonode/base/api/permissions.py

@@ -41,7 +41,6 @@
 
 
 class IsSelf(permissions.BasePermission):
-
     """Grant permission only if the current instance is the request user.
     Used to allow users to edit their own account, nothing to others (even
     superusers).
@@ -62,7 +61,6 @@ def has_object_permission(self, request, view, obj):
 
 
 class IsSelfOrReadOnly(IsSelf):
-
     """Grant permissions if instance *IS* the request user, or read-only.
     Used to allow users to edit their own account, and others to read.
     """
@@ -75,7 +73,6 @@ def has_object_permission(self, request, view, obj):
 
 
 class IsSelfOrAdmin(IsSelf):
-
     """Grant R/W to self and superusers/staff members. Deny others."""
 
     def has_permission(self, request, view):
@@ -94,7 +91,6 @@ def has_object_permission(self, request, view, obj):
 
 
 class IsSelfOrAdminOrReadOnly(IsSelfOrAdmin):
-
     """Grant R/W to self and superusers/staff members, R/O to others."""
 
     def has_permission(self, request, view):
@@ -111,7 +107,6 @@ def has_object_permission(self, request, view, obj):
 
 
 class IsSelfOrAdminOrAuthenticatedReadOnly(IsSelfOrAdmin):
-
     """Grant R/W to self and superusers/staff members, R/O to auth."""
 
     def has_object_permission(self, request, view, obj):

geonode/base/api/serializers.py

@@ -655,7 +655,7 @@ class Meta:
             "is_copyable",
             "blob",
             "metadata",
-            "executions"
+            "executions",
             # TODO
             # csw_typename, csw_schema, csw_mdsource, csw_insert_date, csw_type, csw_anytext, csw_wkt_geometry,
             # metadata_uploaded, metadata_uploaded_preserve, metadata_xml,

geonode/base/forms.py

@@ -412,7 +412,6 @@ def build_attrs(self, base_attrs=None, extra_attrs=None, **kwargs):
 
 
 class ResourceBaseForm(TranslationModelForm, LinkedResourceForm):
-
     """Base form for metadata, should be inherited by childres classes of ResourceBase"""
 
     abstract = forms.CharField(label=_("Abstract"), required=False, widget=TinyMCE())

geonode/base/tests.py

@@ -166,7 +166,6 @@ def test_add_missing_metadata_author_or_poc(self):
 
 
 class TestCreationOfContactRolesByDifferentInputTypes(ThumbnailTests):
-
     """
     Test that contact roles can be set as people profile
     """

geonode/br/management/commands/create_tile_layers.py

@@ -42,12 +42,12 @@
    </metaWidthHeight>
    <mimeFormats>
       <string>application/json;type=utfgrid</string>
+      <string>image/gif</string>
+      <string>image/jpeg</string>
       <string>image/png</string>
+      <string>image/png8</string>
       <string>image/vnd.jpeg-png</string>
-      <string>image/jpeg</string>
       <string>image/vnd.jpeg-png8</string>
-      <string>image/gif</string>
-      <string>image/png8</string>
    </mimeFormats>
    <gridSubsets>
       <gridSubset>
@@ -66,16 +66,48 @@
          <gridSetName>EPSG:900913</gridSetName>
       </gridSubset>
    </gridSubsets>
+   <expireCache>0</expireCache>
+   <expireClients>0</expireClients>
+   <autoCacheStyles>true</autoCacheStyles>
+   <gutter>0</gutter>
+   <cacheWarningSkips/>
 </GeoServerLayer>"""
 
 
 class Command(BaseCommand):
     help = "Create missing TileLayers in GWC"
 
     def add_arguments(self, parser):
-        pass
+        parser.add_argument(
+            '-f',
+            '--force',
+            dest="force",
+            action='store_true',
+            help="Force tile layer re-creation also if it already exists in GWC")
+
+        parser.add_argument(
+            '-l',
+            '--layer',
+            dest="layers",
+            action='append',
+            help="Only process specified layers ")
+
+        parser.add_argument(
+            '-d',
+            '--dry-run',
+            dest="dry-run",
+            action='store_true',
+            help="Do not actually perform any change on GWC")
 
     def handle(self, **options):
+        force = options.get('force')
+        requested_layers = options.get('layers')
+        dry_run = options.get('dry-run')
+
+        logger.debug(f"FORCE is {force}")
+        logger.debug(f"DRY-RUN is {dry_run}")
+        logger.debug(f"LAYERS is {requested_layers}")
+
         try:
             baseurl = settings.OGC_SERVER["default"]["LOCATION"]
             user = settings.OGC_SERVER["default"]["USER"]
@@ -91,24 +123,38 @@ def handle(self, **options):
             cnt_old = 0
             cnt_new = 0
             cnt_bad = 0
+            cnt_skip = 0
+            cnt_force = 0
             for layer in layers:
                 i += 1
                 logger.info(f"- {i}/{tot} Processing layer: {layer.typename}")
+
+                if requested_layers and layer.typename not in requested_layers:
+                    logger.info("  - Layer filtered out by args")
+                    cnt_skip += 1
+                    continue
+
                 r = requests.get(f"{baseurl}gwc/rest/layers/{layer.typename}.xml", auth=HTTPBasicAuth(user, passwd))
 
                 if r.status_code == 200:
-                    logger.info("  - Layer already configured")
-                    cnt_old += 1
-                    continue
+                    if force:
+                        logger.info("  - Forcing layer configuration in GWC")
+                        cnt_force += 1
+                    else:
+                        logger.info("  - Layer already configured in GWC")
+                        cnt_old += 1
+                        continue
                 try:
                     data = REQ_TEMPLATE.format(layer.name)
                     url = f"{baseurl}gwc/rest/layers/{layer.typename}.xml"
                     logger.info("  - Configuring...")
-                    response = requests.put(
-                        url, data=data, headers={"Content-Type": "text/xml"}, auth=HTTPBasicAuth(user, passwd)
-                    )
 
-                    if response.status_code == 200:
+                    if not dry_run:
+                        response = requests.put(
+                            url, data=data, headers={"Content-Type": "text/xml"}, auth=HTTPBasicAuth(user, passwd)
+                        )
+
+                    if dry_run or response.status_code == 200:
                         logger.info(f"  - Done {layer.name}")
                         cnt_new += 1
                     else:
@@ -121,6 +167,7 @@ def handle(self, **options):
             raise e
 
         logger.info("Work completed")
-        logger.info(f"- TileLayers configured: {cnt_new}")
+        logger.info(f"- TileLayers configured: {cnt_new}" + (f" (forced {cnt_force})" if cnt_force else ""))
         logger.info(f"- TileLayers in error  : {cnt_bad}")
-        logger.info(f"- TileLayers found     : {cnt_old}")
+        logger.info(f"- TileLayers untouched : {cnt_old}")
+        logger.info(f"- TileLayers skipped   : {cnt_skip}")

geonode/catalogue/metadataxsl/tests.py

@@ -25,7 +25,6 @@
 
 
 class MetadataXSLTest(GeoNodeBaseTestSupport):
-
     """
     Tests geonode.catalogue.metadataxsl app/module
     """

geonode/context_processors.py

@@ -86,15 +86,17 @@ def resource_urls(request):
         EXIF_ENABLED=getattr(settings, "EXIF_ENABLED", False),
         FAVORITE_ENABLED=getattr(settings, "FAVORITE_ENABLED", False),
         SEARCH_FILTERS=getattr(settings, "SEARCH_FILTERS", False),
-        THESAURI_FILTERS=[
-            t["name"]
-            for t in [
-                settings.THESAURUS,
+        THESAURI_FILTERS=(
+            [
+                t["name"]
+                for t in [
+                    settings.THESAURUS,
+                ]
+                if t.get("filter")
             ]
-            if t.get("filter")
-        ]
-        if hasattr(settings, "THESAURUS")
-        else [t.identifier for t in thesaurus],
+            if hasattr(settings, "THESAURUS")
+            else [t.identifier for t in thesaurus]
+        ),
         MAP_CLIENT_USE_CROSS_ORIGIN_CREDENTIALS=getattr(settings, "MAP_CLIENT_USE_CROSS_ORIGIN_CREDENTIALS", False),
         SHOW_PROFILE_EMAIL=getattr(settings, "SHOW_PROFILE_EMAIL", False),
         OGC_SERVER=getattr(settings, "OGC_SERVER", None),

geonode/documents/forms.py

@@ -117,7 +117,6 @@ class DocumentDescriptionForm(forms.Form):
 
 
 class DocumentCreateForm(TranslationModelForm):
-
     """
     The document upload form.
     """

geonode/documents/models.py

@@ -37,7 +37,6 @@
 
 
 class Document(ResourceBase):
-
     """
     A document is any kind of information that can be attached to a map such as pdf, images, videos, xls...
     """

geonode/documents/views.py

@@ -322,9 +322,11 @@ def document_metadata(
         category_form = CategoryForm(
             request.POST,
             prefix="category_choice_field",
-            initial=int(request.POST["category_choice_field"])
-            if "category_choice_field" in request.POST and request.POST["category_choice_field"]
-            else None,
+            initial=(
+                int(request.POST["category_choice_field"])
+                if "category_choice_field" in request.POST and request.POST["category_choice_field"]
+                else None
+            ),
         )
 
         if hasattr(settings, "THESAURUS"):

geonode/geoapps/models.py

@@ -31,7 +31,6 @@
 
 
 class GeoApp(ResourceBase):
-
     """
     A GeoApp it is a generic container for every client applications the
     user might want to create or define.

geonode/geoapps/tests.py

@@ -31,7 +31,6 @@
 
 
 class GeoAppTests(GeoNodeBaseTestSupport):
-
     """Tests geonode.geoapps module"""
 
     fixtures = ["initial_data.json", "group_test_data.json", "default_oauth_apps.json"]