- Bump to version 2.10.2

GeoNode · Feb 14, 2020 · 38c062f · 38c062f
1 parent b4eea00
commit 38c062f
Show file tree

Hide file tree

Showing 19 changed files with 154 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM geonode/geonode:2.10.x
+FROM geonode/geonode:2.10.2
 MAINTAINER GeoNode development team
 
 COPY requirements.txt /usr/src/app/

diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ http://master.demo.geonode.org. After your registration you will be able
 to test all basic functionalities like uploading layers, creation of
 maps, editing metadata, styles and much more. To get an overview what
 GeoNode can do we recommend to have a look at the [Users
-Workshop](http://docs.geonode.org/en/2.10.x/usage/index.html).
+Workshop](http://docs.geonode.org/en/2.10.2/usage/index.html).
 
 Install
 -------
@@ -55,17 +55,17 @@ GeoNode can be setup in different ways, flavors and plattforms. If
 you´re planning to do development or install for production please visit
 the offical GeoNode installation documentation:
 
-- [Docker](http://docs.geonode.org/en/2.10.x/install/core/index.html#docker)
-- [Ubuntu 18.04](http://docs.geonode.org/en/2.10.x/install/core/index.html#ubuntu-18-04)
+- [Docker](http://docs.geonode.org/en/2.10.2/install/core/index.html#docker)
+- [Ubuntu 18.04](http://docs.geonode.org/en/2.10.2/install/core/index.html#ubuntu-18-04)
 
 Learn GeoNode
 -------------
 
 After you´ve finished the setup process make yourself familiar with the
 general usage and settings of your GeoNodes instance. - the [User
-Training](http://docs.geonode.org/en/2.10.x/usage/index.html)
+Training](http://docs.geonode.org/en/2.10.2/usage/index.html)
 is going in depth into what we can do. - the [Administrators
-Workshop](http://docs.geonode.org/en/2.10.x/admin/index.html)
+Workshop](http://docs.geonode.org/en/2.10.2/admin/index.html)
 will guide you to the most important parts regarding management commands
 and configuration settings.
 
@@ -84,7 +84,7 @@ lightweight components to speed up things.
 To get you started have a look at the [Install
 instructions](#install) which cover all what is needed to run GeoNode
 for development. Further visit the the [Developer
-workshop](http://docs.geonode.org/en/2.10.x/devel/index.html)
+workshop](http://docs.geonode.org/en/2.10.2/devel/index.html)
 for a basic overview.
 
 If you're planning of customizing your GeoNode instance, or to extend

diff --git a/docker-compose.async.yml b/docker-compose.async.yml
@@ -40,7 +40,7 @@ services:
 
   celery:
     restart: unless-stopped
-    image: geonode/geonode:2.10.x
+    image: geonode/geonode:2.10.2
     container_name: celery4${COMPOSE_PROJECT_NAME}
     stdin_open: true
     # tty: true
@@ -79,7 +79,7 @@ services:
 
   django:
     restart: unless-stopped
-    image: geonode/geonode:2.10.x
+    image: geonode/geonode:2.10.2
     container_name: django4${COMPOSE_PROJECT_NAME}
     stdin_open: true
     # tty: true

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
 
   django:
     restart: unless-stopped
-    image: geonode/geonode:2.10.x
+    image: geonode/geonode:2.10.2
     container_name: django4${COMPOSE_PROJECT_NAME}
     stdin_open: true
     # tty: true

diff --git a/docs/basic/theme/index.rst b/docs/basic/theme/index.rst
@@ -247,7 +247,7 @@ You can see on `line 189 of the GeoNode base.html template <https://github.com/G
                 {% if not custom_theme.jumbotron_cta_hide %}
                     <p>
                         <a class="btn btn-default btn-lg" target="_blank" role="button"
-                          href="{{custom_theme.jumbotron_cta_link|default:_('http://docs.geonode.org/en/2.10.x/usage/index.html')}}">
+                          href="{{custom_theme.jumbotron_cta_link|default:_('http://docs.geonode.org/en/2.10.2/usage/index.html')}}">
                             {{custom_theme.jumbotron_cta_text|default:_("Get Started &raquo;")}}
                         </a>
                     </p>

diff --git a/docs/install/project/index.rst b/docs/install/project/index.rst
@@ -202,7 +202,7 @@ Docker
 
     'django4my_geonode' instead of 'django4geonode' and so on...
 
-Deploy an instance of a geonode-project Django template 2.10.x with Docker on localhost
+Deploy an instance of a geonode-project Django template 2.10.2 with Docker on localhost
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Prepare the environment
@@ -245,7 +245,7 @@ Finally, run the containers
 
   docker-compose -f docker-compose.yml up -d
 
-Deploy an instance of a geonode-project Django template 2.10.x with Docker on a domain
+Deploy an instance of a geonode-project Django template 2.10.2 with Docker on a domain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. note:: We will use ``www.example.org`` as an example. You can change the name at your convenience.

diff --git a/geonode/__init__.py b/geonode/__init__.py
@@ -20,7 +20,7 @@
 
 import os
 
-__version__ = (2, 10, 2, 'unstable', 0)
+__version__ = (2, 10, 2, 'final', 0)
 
 
 default_app_config = "geonode.apps.AppConfig"

diff --git a/geonode/geoserver/helpers.py b/geonode/geoserver/helpers.py
@@ -75,7 +75,7 @@
     msg = (
         'Please configure OGC_SERVER when enabling geonode.geoserver.'
         ' More info can be found at '
-        'http://docs.geonode.org/en/2.10.x/basic/settings/index.html#ogc-server')
+        'http://docs.geonode.org/en/2.10.2/basic/settings/index.html#ogc-server')
     raise ImproperlyConfigured(msg)
 
 

diff --git a/geonode/locale/ar/LC_MESSAGES/django.po b/geonode/locale/ar/LC_MESSAGES/django.po
@@ -6266,8 +6266,8 @@ msgid "GeoNode is an open source platform for sharing geospatial data and maps."
 msgstr "GeoNode هو منصة مفتوحة المصدر لتبادل البيانات الجغرافية والخرائط."
 
 #: geonode/templates/index.html:23
-msgid "http://docs.geonode.org/en/2.10.x/usage/index.html"
-msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html"
+msgid "http://docs.geonode.org/en/2.10.2/usage/index.html"
+msgstr "http://docs.geonode.org/en/2.10.2/usage/index.html"
 
 #: geonode/templates/index.html:23
 msgid "Get Started &raquo;"

diff --git a/geonode/locale/de/LC_MESSAGES/django.po b/geonode/locale/de/LC_MESSAGES/django.po
@@ -1084,8 +1084,8 @@ msgstr "GeoNode ist eine Open-Source-Plattform zur Veröffentlichung von Geodate
 
 #: geonode/contrib/geosites/site_template/templates/site_index.html:14
 #: geonode/contrib/geosites/templates/master_index.html:15 geonode/templates/index.html:23
-msgid "http://docs.geonode.org/en/2.10.x/usage/index.html"
-msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html"
+msgid "http://docs.geonode.org/en/2.10.2/usage/index.html"
+msgstr "http://docs.geonode.org/en/2.10.2/usage/index.html"
 
 #: geonode/contrib/geosites/site_template/templates/site_index.html:15
 #: geonode/contrib/geosites/templates/master_index.html:16 geonode/templates/index.html:23

diff --git a/geonode/locale/el/LC_MESSAGES/django.po b/geonode/locale/el/LC_MESSAGES/django.po
@@ -1182,8 +1182,8 @@ msgstr ""
 #: geonode/contrib/geosites/site_template/templates/site_index.html:14
 #: geonode/contrib/geosites/templates/master_index.html:15
 #: geonode/templates/index.html:23
-msgid "http://docs.geonode.org/en/2.10.x/usage/index.html"
-msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html"
+msgid "http://docs.geonode.org/en/2.10.2/usage/index.html"
+msgstr "http://docs.geonode.org/en/2.10.2/usage/index.html"
 
 #: geonode/contrib/geosites/site_template/templates/site_index.html:15
 #: geonode/contrib/geosites/templates/master_index.html:16

diff --git a/geonode/locale/en/LC_MESSAGES/django.po b/geonode/locale/en/LC_MESSAGES/django.po
@@ -6666,8 +6666,8 @@ msgstr ""
 "GeoNode is an open source platform for sharing geospatial data and maps."
 
 #: geonode/templates/index.html:24
-msgid "http://docs.geonode.org/en/2.10.x/usage/index.html"
-msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html"
+msgid "http://docs.geonode.org/en/2.10.2/usage/index.html"
+msgstr "http://docs.geonode.org/en/2.10.2/usage/index.html"
 
 #: geonode/templates/index.html:25
 msgid "Get Started &raquo;"

diff --git a/geonode/locale/fr/LC_MESSAGES/django.po b/geonode/locale/fr/LC_MESSAGES/django.po
@@ -6692,8 +6692,8 @@ msgid "home"
 msgstr "Si vous avez des questions concernant le logiciel ou des services s'y rapportant, joignez-nous sur notre <a href=\"http://lists.osgeo.org/cgi-bin/mailman/listinfo/geonode-users\">mailing list</a>"
 
 #: geonode/templates/index.html:23
-msgid "http://docs.geonode.org/en/2.10.x/usage/index.html"
-msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html"
+msgid "http://docs.geonode.org/en/2.10.2/usage/index.html"
+msgstr "http://docs.geonode.org/en/2.10.2/usage/index.html"
 
 #: geonode/templates/index.html:23
 msgid "Get Started &raquo;"

diff --git a/geonode/locale/it/LC_MESSAGES/django.po b/geonode/locale/it/LC_MESSAGES/django.po
@@ -6627,8 +6627,8 @@ msgstr ""
 "geospaziali e mappe."
 
 #: geonode/templates/index.html:24
-msgid "http://docs.geonode.org/en/2.10.x/usage/index.html"
-msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html"
+msgid "http://docs.geonode.org/en/2.10.2/usage/index.html"
+msgstr "http://docs.geonode.org/en/2.10.2/usage/index.html"
 
 #: geonode/templates/index.html:25
 msgid "Get Started &raquo;"

diff --git a/geonode/templates/index.html b/geonode/templates/index.html
@@ -21,7 +21,7 @@ <h1>{{custom_theme.jumbotron_welcome_title|default:_("Welcome")}}</h1>
 		<p>{{custom_theme.jumbotron_welcome_content|default:_("GeoNode is an open source platform for sharing geospatial data and maps.")}}</p>
 		{% if not custom_theme.jumbotron_cta_hide %}
   		<p><a class="btn btn-default btn-lg" target="_blank"
-  				href="{{custom_theme.jumbotron_cta_link|default:_("http://docs.geonode.org/en/2.10.x/usage/index.html")}}"
+  				href="{{custom_theme.jumbotron_cta_link|default:_("http://docs.geonode.org/en/2.10.2/usage/index.html")}}"
   				role="button">{{custom_theme.jumbotron_cta_text|default:_("Get Started &raquo;")}}</a></p>
 		{% endif %}
 	</div>

diff --git a/geonode/tests/integration.py b/geonode/tests/integration.py
@@ -86,7 +86,7 @@ def zip_dir(basedir, archivename):
  --------------------
 
  1)
-  (http://docs.geonode.org/en/2.10.x/install/core/index.html?highlight=paver#run-geonode-for-the-first-time-in-debug-mode)
+  (http://docs.geonode.org/en/2.10.2/install/core/index.html?highlight=paver#run-geonode-for-the-first-time-in-debug-mode)
 
   $ paver setup
 

diff --git a/scripts/spcgeonode/docker-compose.override.yml b/scripts/spcgeonode/docker-compose.override.yml
@@ -4,7 +4,7 @@ version: '3.4'
 # Common Django template for Geonode, Celery and Celerycam services below
 x-common-django:
   &default-common-django
-  image: geonode/spcgeonode:django-2.10.x
+  image: geonode/spcgeonode:django-2.10.2
   environment:
     - DEBUG=True
   volumes:
@@ -27,29 +27,29 @@ services:
     command: 'celery events --app=geonode.celery_app:app --pidfile="/celeryev.pid" --camera=django_celery_monitor.camera.Camera --frequency=2.0 -l debug'
 
   nginx:
-    image: geonode/spcgeonode:nginx-2.10.x
+    image: geonode/spcgeonode:nginx-2.10.2
     volumes:
       - ./_volume_static:/spcgeonode-static/
       - ./_volume_media:/spcgeonode-media/
       - ./_volume_certificates:/spcgeonode-certificates/
 
   geoserver:
-    image: geonode/spcgeonode:geoserver-2.10.x
+    image: geonode/spcgeonode:geoserver-2.10.2
     volumes:
       - ./_volume_geodatadir:/spcgeonode-geodatadir/
 
   letsencrypt:
-    image: geonode/spcgeonode:letsencrypt-2.10.x
+    image: geonode/spcgeonode:letsencrypt-2.10.2
     volumes:
       - ./_volume_certificates:/spcgeonode-certificates/
 
   pgdumper:
-    image: geonode/spcgeonode:pgdumper-2.10.x
+    image: geonode/spcgeonode:pgdumper-2.10.2
     volumes:
       - ./_volume_pgdumps:/spcgeonode-pgdumps/
 
   rclone:
-    image: geonode/spcgeonode:rclone-2.10.x
+    image: geonode/spcgeonode:rclone-2.10.2
     volumes:
       - ./_volume_pgdumps:/spcgeonode-pgdumps/
       - ./_volume_media:/spcgeonode-media/

diff --git a/scripts/spcgeonode/docker-compose.yml b/scripts/spcgeonode/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.4'
 # Common Django template for Geonode, Celery and Celerycam services below
 x-common-django:
   &default-common-django
-  image: geonode/spcgeonode:django-2.10.x
+  image: geonode/spcgeonode:django-2.10.2
   build:
     context: ../../
     dockerfile: scripts/spcgeonode/django/Dockerfile
@@ -89,7 +89,7 @@ services:
 
   # Nginx is serving django static and media files and proxies to django and geonode
   nginx:
-    image: geonode/spcgeonode:nginx-2.10.x
+    image: geonode/spcgeonode:nginx-2.10.2
     build: ./nginx/
     environment:
       - HTTPS_HOST=${HTTPS_HOST}
@@ -107,7 +107,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/spcgeonode:geoserver-2.10.x
+    image: geonode/spcgeonode:geoserver-2.10.2
     build: ./geoserver/
     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"
@@ -130,7 +130,7 @@ services:
 
   # Gets and installs letsencrypt certificates
   letsencrypt:
-    image: geonode/spcgeonode:letsencrypt-2.10.x
+    image: geonode/spcgeonode:letsencrypt-2.10.2
     build: ./letsencrypt/
     environment:
       - HTTPS_HOST=${HTTPS_HOST}
@@ -144,7 +144,7 @@ services:
   # dumps the non geodata db
   pgdumper_nogeo:
     container_name: dumper_${GEONODE_DATABASE}_${COMPOSE_PROJECT_NAME}
-    image: geonode/spcgeonode:pgdumper-2.10.x
+    image: geonode/spcgeonode:pgdumper-2.10.2
     build: ./pgdumper/
     volumes:
       - pgdumps:/spcgeonode-pgdumps/
@@ -156,7 +156,7 @@ services:
   # dumps the geodata db
   pgdumper_geo:
     container_name: dumper_${GEONODE_GEODATABASE}_${COMPOSE_PROJECT_NAME}
-    image: geonode/spcgeonode:pgdumper-2.10.x
+    image: geonode/spcgeonode:pgdumper-2.10.2
     build: ./pgdumper/
     volumes:
       - pgdumps:/spcgeonode-pgdumps/
@@ -167,7 +167,7 @@ services:
       - DATABASE_URL=postgres://${GEONODE_GEODATABASE_USER}:${GEONODE_GEODATABASE_PASSWORD}@postgres:5432/${GEONODE_GEODATABASE}
 
   rclone:
-    image: geonode/spcgeonode:rclone-2.10.x
+    image: geonode/spcgeonode:rclone-2.10.2
     build: ./rclone/
     environment:
       - S3_ACCESS_KEY=${S3_ACCESS_KEY}
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,7 +86,7 @@ def zip_dir(basedir, archivename): @@
      --------------------
 )
-      (http://docs.geonode.org/en/2.10.x/install/core/index.html?highlight=paver#run-geonode-for-the-first-time-in-debug-mode)
+      (http://docs.geonode.org/en/2.10.2/install/core/index.html?highlight=paver#run-geonode-for-the-first-time-in-debug-mode)
       $ paver setup
@@ Expand Down @@