Backport 10575 to 4.1.x

.circleci/config.yml

@@ -88,8 +88,9 @@ jobs:
                 working_directory: ./
                 no_output_timeout: 10m
             - run:
-                name: Run pep8 checks
+                name: Run code quality checks
                 command: |
+                  docker-compose -f docker-compose-test.yml exec django bash -c 'black --check geonode'
                   docker-compose -f docker-compose-test.yml exec django bash -c 'flake8 geonode'
                   docker-compose -f docker-compose-test.yml exec django bash -c 'codecov; bash <(curl -s https://codecov.io/bash) -t 2c0e7780-1640-45f0-93a3-e103b057d8c8'
                 working_directory: ./

.env_dev

@@ -93,7 +93,7 @@ GEOSERVER_LOCATION=http://localhost:8080/geoserver/
 GEOSERVER_ADMIN_USER=admin
 GEOSERVER_ADMIN_PASSWORD=geoserver
 
-OGC_REQUEST_TIMEOUT=5
+OGC_REQUEST_TIMEOUT=60
 OGC_REQUEST_MAX_RETRIES=0
 OGC_REQUEST_BACKOFF_FACTOR=0.3
 OGC_REQUEST_POOL_MAXSIZE=10

.github/workflows/backport.yml

@@ -1,16 +1,27 @@
 name: Backport
 on:
-  pull_request:
+  pull_request_target:
     types:
       - closed
       - labeled
 
 jobs:
   backport:
-    runs-on: ubuntu-18.04
     name: Backport
+    runs-on: ubuntu-latest
+    # Only react to merged PRs for security reasons.
+    # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
+    if: >
+      github.event.pull_request.merged
+      && (
+        github.event.action == 'closed'
+        || (
+          github.event.action == 'labeled'
+          && contains(github.event.label.name, 'backport')
+        )
+      )
     steps:
       - name: Backporting
-        uses: tibdex/backport@v1.0.0
+        uses: tibdex/backport@v2
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -50,7 +50,7 @@ Workshop](https://docs.geonode.org/en/master/usage/index.html).
 Install
 -------
 
-    The latest official release is 4.0.0!
+    The latest official release is 4.0.2!
 
 GeoNode can be setup in different ways, flavors and plattforms. If
 you´re planning to do development or install for production please visit

dev_config.yml

@@ -1,6 +1,6 @@
 ---
-GEOSERVER_URL: "https://artifacts.geonode.org/geoserver/2.20.5/geoserver.war"
-DATA_DIR_URL: "https://artifacts.geonode.org/geoserver/2.20.5/geonode-geoserver-ext-web-app-data.zip"
+GEOSERVER_URL: "https://artifacts.geonode.org/geoserver/2.20.6/geoserver.war"
+DATA_DIR_URL: "https://artifacts.geonode.org/geoserver/2.20.6/geonode-geoserver-ext-web-app-data.zip"
 JETTY_RUNNER_URL: "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.31.v20200723/jetty-runner-9.4.31.v20200723.jar"
 WINDOWS:
   py2exe: "http://downloads.sourceforge.net/project/py2exe/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe"

docker-compose-geoserver-server.yml

@@ -2,7 +2,7 @@ version: '2.2'
 services:
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.20.5
+    image: geonode/geoserver_data:2.20.6
     restart: on-failure
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     labels:
@@ -13,7 +13,7 @@ services:
       - geoserver-data-dir:/geoserver_data/data
 
   geoserver:
-    image: geonode/geoserver:2.20.5
+    image: geonode/geoserver:2.20.6
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true

docker-compose-test.yml

@@ -89,7 +89,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.20.5
+    image: geonode/geoserver:2.20.6
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://127.0.0.1:8080/geoserver/rest/workspaces/geonode.html"
@@ -113,7 +113,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.20.5
+    image: geonode/geoserver_data:2.20.6
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:

docker-compose.yml

@@ -89,7 +89,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.20.5
+    image: geonode/geoserver:2.20.6
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://127.0.0.1:8080/geoserver/rest/workspaces/geonode.html"
@@ -113,7 +113,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.20.5
+    image: geonode/geoserver_data:2.20.6
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:

geonode/__init__.py

@@ -19,24 +19,27 @@
 
 import os
 
-__version__ = (4, 1, 0, 'dev', 0)
+__version__ = (4, 1, 0, "dev", 0)
 
 
 default_app_config = "geonode.apps.AppConfig"
 
 
 def get_version():
     import geonode.version
+
     return geonode.version.get_version(__version__)
 
 
 def main(global_settings, **settings):
     from django.core.wsgi import get_wsgi_application
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', settings.get('django_settings'))
+
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", settings.get("django_settings"))
     app = get_wsgi_application()
     return app
 
 
 class GeoNodeException(Exception):
     """Base class for exceptions in this module."""
+
     pass