From 74dd53c1962e943a7090048a1e3c05b707fb6b31 Mon Sep 17 00:00:00 2001 From: Nick De Villiers Date: Fri, 11 Oct 2024 13:49:30 +0100 Subject: [PATCH 1/2] chore(deps): Upgrade canonicalwebteam.search to 2.1.0 WD-15013 --- .gitignore | 1 + requirements.txt | 4 ++-- webapp/views/docs.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index baeeacac..bd866391 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ Thumbs.db .LSOverride .spelling .vscode +*.swp # [cache] Cache and backup *.bak diff --git a/requirements.txt b/requirements.txt index bfd0ed64..ebcc68b0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ -canonicalwebteam.flask_base==1.1.0 +canonicalwebteam.flask_base==2.0.0 canonicalwebteam.blog==6.4.0 canonicalwebteam.discourse==5.5.0 canonicalwebteam.http==1.0.4 canonicalwebteam.templatefinder==1.0.0 -canonicalwebteam.search==1.3.0 +canonicalwebteam.search==2.1.0 canonicalwebteam.image-template==1.3.1 feedparser==6.0.11 requests-cache==0.9.8 diff --git a/webapp/views/docs.py b/webapp/views/docs.py index 69c5fbe0..5bfeb577 100644 --- a/webapp/views/docs.py +++ b/webapp/views/docs.py @@ -10,7 +10,6 @@ DISCOURSE_API_KEY = getenv("DISCOURSE_API_KEY") DISCOURSE_API_USERNAME = getenv("DISCOURSE_API_USERNAME") - def init_docs(app, url_prefix: str, session) -> Docs: """Initialise Docs attaching to Discourse.""" discourse_docs = Docs( @@ -36,6 +35,7 @@ def init_docs(app, url_prefix: str, session) -> Docs: "/docs/search", "docs-search", build_search_view( + app=app, session=session, site="maas.io/docs", template_path="docs/search.html", From f75dcf641d29e552c1dda42177f5a5ce4d9653d9 Mon Sep 17 00:00:00 2001 From: Nick De Villiers Date: Fri, 11 Oct 2024 14:02:45 +0100 Subject: [PATCH 2/2] fix lint --- webapp/app.py | 1 + webapp/views/docs.py | 1 + 2 files changed, 2 insertions(+) diff --git a/webapp/app.py b/webapp/app.py index 9ffa9144..016845b3 100644 --- a/webapp/app.py +++ b/webapp/app.py @@ -1,6 +1,7 @@ """ A Flask application for maas.io """ + from datetime import timedelta import flask diff --git a/webapp/views/docs.py b/webapp/views/docs.py index 5bfeb577..8b7bd0bc 100644 --- a/webapp/views/docs.py +++ b/webapp/views/docs.py @@ -10,6 +10,7 @@ DISCOURSE_API_KEY = getenv("DISCOURSE_API_KEY") DISCOURSE_API_USERNAME = getenv("DISCOURSE_API_USERNAME") + def init_docs(app, url_prefix: str, session) -> Docs: """Initialise Docs attaching to Discourse.""" discourse_docs = Docs(