Merge branch 'master' into upd_docker_images_tags

geonode/people/models.py

@@ -246,6 +246,7 @@ def _notify_account_activated(self):
                     "site_name": current_site.name,
                     "email": self.email,
                     "inviter": self,
+                    "LOGIN_URL": settings.LOGIN_URL,
                 }
 
                 email_template = "pinax/notifications/account_active/account_active"

geonode/templates/pinax/notifications/account_active/account_active_message.txt

@@ -1,3 +1,3 @@
 {% load i18n %}
 {% trans "Your account has been approved and is now active." %} ({{ username }})<br/>
-{% trans "You can use the login form at" %}: http://{{ current_site.name }}
+{% trans "You can use the login form at" %}: {{ LOGIN_URL }}

geonode/templates/pinax/notifications/account_active/full.txt

@@ -1,3 +1,3 @@
 {% load i18n %}
 {% trans "Your account has been approved and is now active." %}<br/>
-{% trans "You can use the login form at" %}: http://{{ current_site }}
+{% trans "You can use the login form at" %}: {{ LOGIN_URL }}

requirements.txt

@@ -1,8 +1,8 @@
 # native dependencies
-Pillow==9.5.0
+Pillow==10.0.0
 lxml==4.9.2
 psycopg2==2.9.6
-Django==3.2.19
+Django==3.2.20
 
 # Other
 amqp==5.1.1
@@ -91,7 +91,7 @@ pinax-ratings==4.0.0
 # django-geonode-mapstore-client==4.0.5
 -e git+https://github.com/GeoNode/geonode-mapstore-client.git@master#egg=django_geonode_mapstore_client
 -e git+https://github.com/GeoNode/geonode-importer.git@master#egg=geonode-importer
-geonode-avatar==5.0.8
+django-avatar==7.1.1
 geonode-oauth-toolkit==2.2.2
 geonode-user-messages==2.0.2
 geonode-announcements==2.0.2
@@ -111,9 +111,9 @@ django-bootstrap3-datetimepicker-2==2.8.3
 # storage manager dependencies
 django-storages==1.13.2
 dropbox==11.36.2
-google-cloud-storage==2.9.0
+google-cloud-storage==2.10.0
 google-cloud-core==2.3.2
-boto3==1.26.160
+boto3==1.26.165
 
 # Django Caches
 python-memcached<=1.59

setup.cfg

@@ -25,10 +25,10 @@ setup_requires =
     setuptools
 install_requires =
     # native dependencies
-    Pillow==9.5.0
+    Pillow==10.0.0
     lxml==4.9.2
     psycopg2==2.9.6
-    Django==3.2.19
+    Django==3.2.20
 
     # Other
     amqp==5.1.1
@@ -116,7 +116,7 @@ install_requires =
     # GeoNode org maintained apps.
     django-geonode-mapstore-client>=4.0.5,<5.0.0
     geonode-importer>=1.0.2
-    geonode-avatar==5.0.8
+    django-avatar==7.1.1
     geonode-oauth-toolkit==2.2.2
     geonode-user-messages==2.0.2
     geonode-announcements==2.0.2
@@ -136,9 +136,9 @@ install_requires =
     # storage manager dependencies
     django-storages==1.13.2
     dropbox==11.36.2
-    google-cloud-storage==2.9.0
+    google-cloud-storage==2.10.0
     google-cloud-core==2.3.2
-    boto3==1.26.160
+    boto3==1.26.165
 
     # Django Caches
     python-memcached<=1.59
@@ -201,6 +201,7 @@ install_requires =
     mako==1.2.4
     certifi>=2022.12.7 # not directly required, pinned by Snyk to avoid a vulnerability
     jwcrypto>=1.4 # not directly required, pinned by Snyk to avoid a vulnerability
+    cryptography>=41.0.0 # not directly required, pinned by Snyk to avoid a vulnerability
 
 [options.packages.find]
 exclude = tests