Merge branch 'hotfix/2.6.2.1' into uat

client/extensions/tga-author-profile-fields/src/components/vocab/config.tsx

@@ -14,8 +14,8 @@ function getVocabularies(): Promise<Array<IVocabulary>> {
         {field: 'display_name', direction: 'ascending'},
         {
             $and: [
-                {field_type: {$exists: false, $eq: null}},
-                {custom_field_type: {$exists: false, $eq: null}},
+                {field_type: null},
+                {custom_field_type: null},
             ],
         }
     ).then((vocabularies) => {

server/requirements.in

@@ -4,6 +4,6 @@ slackclient==1.0.9
 WTForms==3.0.1
 Flask-WTF==1.2.1
 
-git+https://github.com/superdesk/superdesk-core.git@v2.6.5#egg=superdesk-core
+git+https://github.com/superdesk/superdesk-core.git@hotfix/2.6.8#egg=superdesk-core
 git+https://github.com/superdesk/[email protected]#egg=superdesk-planning
 git+https://github.com/superdesk/[email protected]#egg=superdesk-analytics

server/requirements.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile requirements.in
 #
-amqp==5.1.1
+amqp==5.2.0
     # via kombu
 arrow==0.13.0
     # via
@@ -14,7 +14,7 @@ async-timeout==4.0.3
     # via redis
 authlib==0.14.3
     # via superdesk-core
-babel==2.13.1
+babel==2.14.0
     # via flask-babel
 bcrypt==3.1.7
     # via superdesk-core
@@ -26,9 +26,9 @@ blinker==1.4
     #   flask-mail
     #   raven
     #   superdesk-core
-boto3==1.28.72
+boto3==1.34.20
     # via superdesk-core
-botocore==1.31.72
+botocore==1.34.20
     # via
     #   boto3
     #   s3transfer
@@ -42,7 +42,7 @@ cerberus==1.3.5
     # via
     #   eve
     #   superdesk-core
-certifi==2023.7.22
+certifi==2023.11.17
     # via
     #   elastic-apm
     #   elasticsearch
@@ -53,7 +53,7 @@ cffi==1.16.0
     #   cryptography
 chardet==3.0.4
     # via superdesk-core
-charset-normalizer==3.3.1
+charset-normalizer==3.3.2
     # via requests
 ciso8601==1.0.8
     # via eve-elastic
@@ -72,11 +72,11 @@ click-repl==0.3.0
     # via celery
 croniter==0.3.37
     # via superdesk-core
-cryptography==41.0.5
+cryptography==41.0.7
     # via
     #   authlib
     #   jwcrypto
-deepdiff==6.6.1
+deepdiff==6.7.1
     # via superdesk-planning
 deprecated==1.2.14
     # via jwcrypto
@@ -86,7 +86,7 @@ draftjs-exporter[lxml]==2.1.7
     #   superdesk-core
 ecs-logging==2.1.0
     # via elastic-apm
-elastic-apm[flask]==6.19.0
+elastic-apm[flask]==6.20.0
     # via
     #   elastic-apm
     #   superdesk-core
@@ -98,7 +98,7 @@ eve-elastic==7.3.2
     # via superdesk-core
 events==0.3
     # via eve
-feedparser==6.0.10
+feedparser==6.0.11
     # via superdesk-core
 flask==1.1.2
     # via
@@ -134,7 +134,7 @@ httplib2==0.22.0
     # via oauth2client
 icalendar==4.0.9
     # via superdesk-planning
-idna==3.4
+idna==3.6
     # via requests
 itsdangerous==1.1.0
     # via
@@ -151,7 +151,7 @@ jmespath==1.0.1
     # via
     #   boto3
     #   botocore
-jwcrypto==1.5.0
+jwcrypto==1.5.1
     # via
     #   flask-oidc-ex
     #   python-jwt
@@ -182,9 +182,9 @@ ordered-set==4.1.0
     # via deepdiff
 pillow==9.2.0
     # via superdesk-core
-prompt-toolkit==3.0.39
+prompt-toolkit==3.0.43
     # via click-repl
-pyasn1==0.5.0
+pyasn1==0.5.1
     # via
     #   ldap3
     #   oauth2client
@@ -208,7 +208,7 @@ python-dateutil==2.7.5
     #   croniter
     #   icalendar
     #   superdesk-core
-python-jwt==4.0.0
+python-jwt==4.1.0
     # via flask-oidc-ex
 python-magic==0.4.27
     # via superdesk-core
@@ -245,7 +245,7 @@ requests-oauthlib==1.3.1
     # via python-twitter
 rsa==4.9
     # via oauth2client
-s3transfer==0.7.0
+s3transfer==0.10.0
     # via boto3
 sgmllib3k==1.0.0
     # via feedparser
@@ -263,11 +263,11 @@ slackclient==1.0.9
     # via -r requirements.in
 superdesk-analytics @ git+https://github.com/superdesk/[email protected]
     # via -r requirements.in
-superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.6.5
+superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@hotfix/2.6.8
     # via -r requirements.in
 superdesk-planning @ git+https://github.com/superdesk/[email protected]
     # via -r requirements.in
-typing-extensions==4.8.0
+typing-extensions==4.9.0
     # via superdesk-core
 tzlocal==2.1
     # via superdesk-core
@@ -280,12 +280,12 @@ urllib3==1.25.11
     #   elasticsearch
     #   requests
     #   superdesk-core
-vine==5.0.0
+vine==5.1.0
     # via
     #   amqp
     #   celery
     #   kombu
-wcwidth==0.2.8
+wcwidth==0.2.13
     # via prompt-toolkit
 websocket-client==0.59.0
     # via slackclient

server/settings.py

@@ -200,3 +200,6 @@
 
 SIGN_OFF_REQUESTS_SHARED_SECRET = env("SIGN_OFF_REQUESTS_SHARED_SECRET", env("AUTH_SERVER_SHARED_SECRET"))
 SIGN_OFF_REQUESTS_EXPIRATION = 86400  # 1 day in seconds
+
+# Disable purging of publish queue
+PUBLISH_QUEUE_EXPIRY_MINUTES = 0