From 2aa82001b5a872b29a8dc45dbabf17ecf7cacc82 Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Thu, 8 Feb 2024 16:36:01 +0100
Subject: [PATCH] DOC: Unrelated misc.
---
.gitlab-ci.yml | 2 +-
src/linkahead/apiutils.py | 4 ++--
src/linkahead/common/models.py | 5 +++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dfe61ff4..1ce007dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -148,7 +148,7 @@ pages_prepare: &pages_prepare
refs:
- /^release-.*$/i
script:
- - echo "Deploying"
+ - echo "Deploying documentation"
- make doc
- cp -r build/doc/html public
artifacts:
diff --git a/src/linkahead/apiutils.py b/src/linkahead/apiutils.py
index 39f97fcd..bef01201 100644
--- a/src/linkahead/apiutils.py
+++ b/src/linkahead/apiutils.py
@@ -501,11 +501,11 @@ def describe_diff(olddiff, newdiff, name=None, as_update=True):
if len(olddiff["parents"]) > 0:
description += ("Parents that are only in the old version:\n"
- + ", ".join(olddiff["parents"]))
+ + ", ".join(olddiff["parents"]) + "\n")
if len(newdiff["parents"]) > 0:
description += ("Parents that are only in the new version:\n"
- + ", ".join(olddiff["parents"]))
+ + ", ".join(olddiff["parents"]) + "\n")
for prop in list(set(list(olddiff["properties"].keys())
+ list(newdiff["properties"].keys()))):
diff --git a/src/linkahead/common/models.py b/src/linkahead/common/models.py
index 38c13490..e53dfd85 100644
--- a/src/linkahead/common/models.py
+++ b/src/linkahead/common/models.py
@@ -4510,8 +4510,9 @@ def execute_query(q, unique=False, raise_exception_on_error=True, cache=True,
Whether an exception should be raised when there are errors in the
resulting entities. Defaults to True.
cache : bool
- Whether to use the query server-side cache (equivalent to adding a
- "cache" flag). Defaults to True.
+ Whether to use the server's query cache (equivalent to adding a
+ "cache" flag) to the Query object. Defaults to True. Not to be
+ confused with the ``cached`` module.
flags : dict of str
Flags to be added to the request.
page_length : int
--
GitLab