update core

client/index.tsx

@@ -0,0 +1,3 @@
+import {startApp} from 'superdesk-core/scripts/index';
+
+setTimeout(startApp);

client/package.json

@@ -2,7 +2,14 @@
     "name": "superdesk",
     "license": "GPL-3.0",
     "dependencies": {
-        "superdesk-core": "superdesk/superdesk-client-core#v1.33.8",
-        "superdesk-publisher": "superdesk/superdesk-publisher#2.1"
+        "superdesk-core": "github:superdesk/superdesk-client-core#v2.6.2",
+        "superdesk-publisher": "github:superdesk/superdesk-publisher#master"
+    },
+    "devDependencies": {
+        "@superdesk/build-tools": "^1.0.18",
+        "@types/node": "^14.18.43"
+    },
+    "scripts": {
+        "build": "npx @superdesk/build-tools build-root-repo ./"
     }
 }

client/superdesk.config.js

@@ -7,10 +7,10 @@
 module.exports = function(grunt) {
     return {
         apps: [
-            'superdesk-publisher'
+            'superdesk-publisher',
         ],
         importApps: [
-            'superdesk-publisher'
+            'superdesk-publisher',
         ],
         defaultRoute: '/workspace/personal',
         validatorMediaMetadata: {

server/Procfile

@@ -1,5 +1,5 @@
 rest: gunicorn -c gunicorn_config.py wsgi
 wamp: python3 -u ws.py
 work: celery -A worker worker
-beat: celery -A worker beat --pid=
+beat: celery -A worker beat
 capi: gunicorn -c gunicorn_config.py content_api.wsgi

server/requirements.in

@@ -0,0 +1,5 @@
+gunicorn
+honcho
+
+git+https://github.com/superdesk/[email protected]#egg=superdesk-core
+git+https://github.com/superdesk/[email protected]#egg=superdesk-planning

server/requirements.txt

@@ -1,4 +1,259 @@
-gunicorn==19.7.1
-honcho==1.0.1
-newrelic>=2.66,<2.67
-superdesk-core==1.33.7
+#
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
+#
+#    pip-compile --resolver=backtracking requirements.in
+#
+amqp==2.6.1
+    # via kombu
+arrow==0.13.0
+    # via
+    #   eve-elastic
+    #   superdesk-core
+authlib==0.14.3
+    # via superdesk-core
+babel==2.12.1
+    # via flask-babel
+bcrypt==3.1.7
+    # via superdesk-core
+billiard==3.6.4.0
+    # via celery
+blinker==1.4
+    # via
+    #   elastic-apm
+    #   flask-mail
+    #   raven
+    #   superdesk-core
+boto3==1.26.121
+    # via superdesk-core
+botocore==1.29.121
+    # via
+    #   boto3
+    #   s3transfer
+cachetools==5.3.0
+    # via flask-oidc-ex
+celery[redis]==4.4.7
+    # via superdesk-core
+cerberus==1.3.4
+    # via
+    #   eve
+    #   superdesk-core
+certifi==2022.12.7
+    # via
+    #   elastic-apm
+    #   elasticsearch
+    #   requests
+cffi==1.15.1
+    # via
+    #   bcrypt
+    #   cryptography
+chardet==3.0.4
+    # via superdesk-core
+charset-normalizer==3.1.0
+    # via requests
+ciso8601==1.0.8
+    # via eve-elastic
+click==7.1.2
+    # via flask
+croniter==0.3.37
+    # via superdesk-core
+cryptography==40.0.2
+    # via
+    #   authlib
+    #   jwcrypto
+deepdiff==6.3.0
+    # via superdesk-planning
+deprecated==1.2.13
+    # via jwcrypto
+draftjs-exporter[lxml]==2.1.7
+    # via superdesk-core
+elastic-apm[flask]==6.15.1
+    # via superdesk-core
+elasticsearch==7.13.4
+    # via eve-elastic
+eve==1.1.2
+    # via superdesk-core
+eve-elastic==7.3.1
+    # via superdesk-core
+events==0.3
+    # via eve
+feedparser==6.0.10
+    # via superdesk-core
+flask==1.1.4
+    # via
+    #   eve
+    #   flask-babel
+    #   flask-mail
+    #   flask-oidc-ex
+    #   flask-script
+    #   raven
+    #   superdesk-core
+flask-babel==1.0.0
+    # via superdesk-core
+flask-mail==0.9.1
+    # via superdesk-core
+flask-oidc-ex==0.5.5
+    # via superdesk-core
+flask-script==2.0.6
+    # via superdesk-core
+future==0.18.3
+    # via python-twitter
+gunicorn==20.1.0
+    # via -r requirements.in
+hachoir==3.0a3
+    # via superdesk-core
+hermescache==0.10.0
+    # via superdesk-core
+honcho==1.1.0
+    # via -r requirements.in
+httplib2==0.22.0
+    # via oauth2client
+icalendar==4.0.9
+    # via superdesk-planning
+idna==3.4
+    # via requests
+itsdangerous==1.1.0
+    # via
+    #   flask
+    #   flask-oidc-ex
+jinja2==2.11.3
+    # via
+    #   flask
+    #   flask-babel
+jmespath==1.0.1
+    # via
+    #   boto3
+    #   botocore
+jwcrypto==1.4.2
+    # via
+    #   flask-oidc-ex
+    #   python-jwt
+kombu==4.6.11
+    # via
+    #   celery
+    #   superdesk-core
+ldap3==2.5.2
+    # via superdesk-core
+lxml==4.6.5
+    # via
+    #   draftjs-exporter
+    #   superdesk-core
+markupsafe==2.0.1
+    # via
+    #   jinja2
+    #   superdesk-core
+mongolock==1.3.4
+    # via superdesk-core
+natsort==8.3.1
+    # via croniter
+oauth2client==4.1.3
+    # via flask-oidc-ex
+oauthlib==3.2.2
+    # via requests-oauthlib
+ordered-set==4.1.0
+    # via deepdiff
+pillow==9.2.0
+    # via superdesk-core
+pyasn1==0.5.0
+    # via
+    #   ldap3
+    #   oauth2client
+    #   pyasn1-modules
+    #   rsa
+pyasn1-modules==0.3.0
+    # via oauth2client
+pycparser==2.21
+    # via cffi
+pymongo==3.11.4
+    # via
+    #   eve
+    #   mongolock
+    #   superdesk-core
+pyparsing==3.0.9
+    # via httplib2
+python-dateutil==2.7.5
+    # via
+    #   arrow
+    #   botocore
+    #   croniter
+    #   icalendar
+    #   superdesk-core
+python-jwt==4.0.0
+    # via flask-oidc-ex
+python-magic==0.4.27
+    # via superdesk-core
+python-twitter==3.5
+    # via superdesk-core
+pytz==2023.3
+    # via
+    #   celery
+    #   eve-elastic
+    #   flask-babel
+    #   icalendar
+    #   superdesk-core
+    #   tzlocal
+pyyaml==5.4.1
+    # via superdesk-core
+raven[flask]==6.10.0
+    # via superdesk-core
+redis==3.2.1
+    # via
+    #   celery
+    #   superdesk-core
+regex==2020.7.14
+    # via superdesk-core
+requests==2.29.0
+    # via
+    #   python-twitter
+    #   requests-oauthlib
+    #   superdesk-core
+requests-oauthlib==1.3.1
+    # via python-twitter
+rsa==4.9
+    # via oauth2client
+s3transfer==0.6.0
+    # via boto3
+sgmllib3k==1.0.0
+    # via feedparser
+simplejson==3.19.1
+    # via eve
+six==1.16.0
+    # via
+    #   bcrypt
+    #   flask-oidc-ex
+    #   oauth2client
+    #   python-dateutil
+superdesk-core @ git+https://github.com/superdesk/[email protected]
+    # via -r requirements.in
+superdesk-planning @ git+https://github.com/superdesk/[email protected]
+    # via -r requirements.in
+typing-extensions==4.5.0
+    # via superdesk-core
+tzlocal==2.1
+    # via superdesk-core
+unidecode==0.4.21
+    # via superdesk-core
+urllib3==1.25.11
+    # via
+    #   botocore
+    #   elastic-apm
+    #   elasticsearch
+    #   requests
+    #   superdesk-core
+vine==1.3.0
+    # via
+    #   amqp
+    #   celery
+websockets==10.3
+    # via superdesk-core
+werkzeug==1.0.1
+    # via
+    #   flask
+    #   superdesk-core
+wrapt==1.15.0
+    # via
+    #   deprecated
+    #   elastic-apm
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

server/settings.py

@@ -53,7 +53,6 @@ def env(variable, fallback_value=None):
     REDIS_URL = env('REDIS_PORT').replace('tcp:', 'redis:')
 BROKER_URL = env('CELERY_BROKER_URL', REDIS_URL)
 
-SECRET_KEY = env('SECRET_KEY', '')
 PUBLISH_ASSOCIATED_ITEMS = True
 
 CONTENT_EXPIRY_MINUTES = 60 * 24 * 7  # 1w