From c343d4483dd2ced5df583c5e0376cff704beab3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ja=C5=A1ek?= Date: Fri, 27 Oct 2023 13:20:54 +0200 Subject: [PATCH] use released version of superdesk and planning (#641) * use release for superdesk core and planning * update reportlab version * fix print report error * fix failing test --- newsroom/news_api/news/atom/atom.py | 1 + newsroom/templates/reports_print.html | 2 +- requirements.txt | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/newsroom/news_api/news/atom/atom.py b/newsroom/news_api/news/atom/atom.py index 8098c0c7b..17f20b221 100644 --- a/newsroom/news_api/news/atom/atom.py +++ b/newsroom/news_api/news/atom/atom.py @@ -147,6 +147,7 @@ def _format_update_date(date): "assets.get_item", asset_id=src.get("media"), _external=True, + _scheme="https", ) html_updated = True if html_updated: diff --git a/newsroom/templates/reports_print.html b/newsroom/templates/reports_print.html index 7c601fd5d..206d4afd2 100644 --- a/newsroom/templates/reports_print.html +++ b/newsroom/templates/reports_print.html @@ -12,7 +12,7 @@

{{ data.get('name') }}

{{ javascript_tag('%s_js' % setting_type) | safe }} diff --git a/requirements.txt b/requirements.txt index b55d7ff22..4f8ff3f69 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ python3-saml>=1.15,<1.16 # Fix an issue between xhtml2pdf v0.2.4 and reportlab v3.6.7 # https://github.com/xhtml2pdf/xhtml2pdf/issues/589 -reportlab==3.6.6 +reportlab>=3.6.11,<3.7 -superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@develop -superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@develop +superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.7.0-rc1 +superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@v2.7.0-rc1