From 4d09f684122d2f7379ca32c16e0645523e23ce77 Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Tue, 26 Mar 2024 17:58:31 +0100 Subject: [PATCH] update server --- server/data/ui_config.json | 5 ++-- server/requirements.in | 2 +- server/requirements.txt | 50 ++++++++++++++++++++++++-------------- 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/server/data/ui_config.json b/server/data/ui_config.json index 6e15eaf..dcede6e 100644 --- a/server/data/ui_config.json +++ b/server/data/ui_config.json @@ -73,7 +73,7 @@ }, { "_id": "home", - "init_version": 6, + "init_version": 7, "list": { "wordcount": { "displayed": true @@ -131,7 +131,8 @@ "embargo" ] }, - "search": true + "search": true, + "personal_home_card_type": "6-text-only" }, { "_id": "agenda", diff --git a/server/requirements.in b/server/requirements.in index f118eba..e4e0b7c 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -1 +1 @@ -git+https://github.com/superdesk/newsroom-core.git@release/2.6#egg=Newsroom-Core +git+https://github.com/superdesk/newsroom-core.git@develop#egg=Newsroom-Core diff --git a/server/requirements.txt b/server/requirements.txt index 7e86d6e..979102f 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -30,13 +30,14 @@ billiard==3.6.4.0 blinker==1.7.0 # via # elastic-apm + # flask # flask-mail # raven # sentry-sdk # superdesk-core -boto3==1.34.66 +boto3==1.34.70 # via superdesk-core -botocore==1.34.66 +botocore==1.34.70 # via # boto3 # s3transfer @@ -63,7 +64,9 @@ cffi==1.16.0 # bcrypt # cryptography chardet==5.2.0 - # via superdesk-core + # via + # reportlab + # superdesk-core charset-normalizer==3.3.2 # via requests ciso8601==2.3.1 @@ -78,7 +81,7 @@ click==8.1.7 # newsroom-core # pyhanko # superdesk-core -click-didyoumean==0.3.0 +click-didyoumean==0.3.1 # via celery click-plugins==1.1.1 # via celery @@ -98,6 +101,8 @@ deepdiff==6.7.1 # via superdesk-planning deprecated==1.2.14 # via limits +dnspython==2.6.1 + # via email-validator draftjs-exporter[lxml]==2.1.7 # via superdesk-core ecs-logging==2.1.0 @@ -108,10 +113,14 @@ elasticsearch==7.13.4 # via # eve-elastic # superdesk-core +email-validator==2.1.1 + # via wtforms eve==1.1.2 # via superdesk-core eve-elastic==7.4.1 - # via superdesk-core + # via + # newsroom-core + # superdesk-core events==0.3 # via eve feedparser==6.0.11 @@ -142,19 +151,19 @@ flask-mail==0.9.1 # via superdesk-core flask-oidc-ex==0.5.5 # via superdesk-core -flask-pymongo==0.5.2 +flask-pymongo==2.3.0 # via newsroom-core flask-script==2.0.6 # via superdesk-core flask-webpack==0.1.0 # via newsroom-core -flask-wtf==0.14.3 +flask-wtf==1.2.1 # via newsroom-core future==1.0.0 # via python-twitter -google-auth==2.6.6 +google-auth==2.29.0 # via newsroom-core -gunicorn==20.0.4 +gunicorn==21.2.0 # via newsroom-core hachoir==3.0a3 # via superdesk-core @@ -169,8 +178,10 @@ httplib2==0.22.0 icalendar==4.0.9 # via superdesk-planning idna==3.6 - # via requests -importlib-resources==6.3.2 + # via + # email-validator + # requests +importlib-resources==6.4.0 # via limits isodate==0.6.1 # via python3-saml @@ -213,11 +224,12 @@ markupsafe==2.0.1 # jinja2 # newsroom-core # superdesk-core + # wtforms mongolock==1.3.4 # via superdesk-core natsort==8.4.0 # via croniter -newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@release/2.6 +newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@develop # via -r requirements.in oauth2client==4.1.3 # via flask-oidc-ex @@ -228,7 +240,9 @@ ordered-set==4.1.0 oscrypto==1.3.0 # via pyhanko-certvalidator packaging==24.0 - # via limits + # via + # gunicorn + # limits pillow==9.2.0 # via # reportlab @@ -289,7 +303,7 @@ python-magic==0.4.27 # via superdesk-core python-twitter==3.5 # via superdesk-core -python3-saml==1.15.0 +python3-saml==1.16.0 # via newsroom-core pytz==2024.1 # via @@ -327,7 +341,7 @@ requests==2.31.0 # python-twitter # requests-oauthlib # superdesk-core -requests-oauthlib==1.4.0 +requests-oauthlib==2.0.0 # via python-twitter rsa==4.9 # via @@ -335,7 +349,7 @@ rsa==4.9 # oauth2client s3transfer==0.10.1 # via boto3 -sentry-sdk[flask]==1.5.12 +sentry-sdk[flask]==1.9.0 # via newsroom-core sgmllib3k==1.0.0 # via feedparser @@ -346,7 +360,6 @@ six==1.16.0 # bcrypt # flask-limiter # flask-oidc-ex - # google-auth # html5lib # isodate # oauth2client @@ -406,10 +419,11 @@ wrapt==1.14.1 # via # deprecated # elastic-apm -wtforms==2.2.1 +wtforms[email]==3.1.2 # via # flask-wtf # newsroom-core + # wtforms xhtml2pdf==0.2.11 # via newsroom-core xmlsec==1.3.13