From a8d24b663f2d0e7f3b22b897b1528801d1b809cb Mon Sep 17 00:00:00 2001
From: Douglas Raillard <douglas.raillard@arm.com>
Date: Wed, 11 Sep 2024 15:35:38 +0100
Subject: [PATCH 1/3] doc: Remove unused values from plot_conf.yml

Remove unused kwargs from the conf as it is misleading.
---
 doc/plot_conf.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/doc/plot_conf.yml b/doc/plot_conf.yml
index 7cecd4281..024f50960 100644
--- a/doc/plot_conf.yml
+++ b/doc/plot_conf.yml
@@ -76,12 +76,7 @@ doc-plot-conf:
     plots:
         # Default values for the other entries
         default:
-            plat_info: *plat_info0
             trace: *trace0
-            wlgen_profile: *wlgen_profile0
-            task: *task0
-            cpu: *cpu0
-            cluster: *cluster0
 
         TasksAnalysis.plot_task_residency:
             kwargs:
-- 
GitLab


From b66a6f9d358bbbf597f734d800782e9a9f83d177 Mon Sep 17 00:00:00 2001
From: Douglas Raillard <douglas.raillard@arm.com>
Date: Wed, 11 Sep 2024 15:55:19 +0100
Subject: [PATCH 2/3] lisa: Add pyproject.toml

FIX

Fix the pip warning explained here:
https://github.com/pypa/pip/issues/11457

By following this procedure:
https://github.com/pypa/pip/issues/11457#issuecomment-2339037577
---
 lisa/_version.py | 35 +++++++++++++++++++++++++++++++++++
 lisa/version.py  | 13 ++-----------
 pyproject.toml   |  3 +++
 setup.py         |  2 +-
 4 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 lisa/_version.py
 create mode 100644 pyproject.toml

diff --git a/lisa/_version.py b/lisa/_version.py
new file mode 100644
index 000000000..5b852d6bb
--- /dev/null
+++ b/lisa/_version.py
@@ -0,0 +1,35 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (C) 2024, ARM Limited and contributors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+# THIS MODULE MUST BE EXECUTABLE ON ITS OWN WITHOUT DEPENDING ON ANYTHING
+# PROVIDED BY LISA.
+#
+# This way, setup.py can run before the lisa package becomes importable.
+
+
+import os
+
+version_tuple = (3, 1, 0)
+
+def format_version(version):
+    return '.'.join(str(part) for part in version)
+
+def parse_version(version):
+    return tuple(int(part) for part in version.split('.'))
+
+__version__ = format_version(version_tuple)
diff --git a/lisa/version.py b/lisa/version.py
index b80e22b82..2bd332303 100644
--- a/lisa/version.py
+++ b/lisa/version.py
@@ -22,19 +22,9 @@ import os
 import hashlib
 from subprocess import CalledProcessError
 
+from lisa._version import version_tuple, __version__, format_version, parse_version
 from lisa._git import get_sha1, get_uncommited_patch
 
-version_tuple = (3, 1, 0)
-
-def format_version(version):
-    return '.'.join(str(part) for part in version)
-
-
-def parse_version(version):
-    return tuple(int(part) for part in version.split('.'))
-
-__version__ = format_version(version_tuple)
-
 def _compute_version_token():
     plain_version_token = f'v{format_version(version_tuple)}'
 
@@ -67,6 +57,7 @@ def _compute_version_token():
     else:
         return plain_version_token
 
+
 VERSION_TOKEN = _compute_version_token()
 """
 Unique token related to code version.
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 000000000..a07c4ad34
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools >= 74.1.2"]
+build-backend = "setuptools.build_meta"
diff --git a/setup.py b/setup.py
index 536f6831b..8d67b6544 100755
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ with open('README.rst', 'r') as f:
 with open('LICENSE.txt', 'r') as f:
     license_txt = f.read()
 
-with open("lisa/version.py") as f:
+with open("lisa/_version.py") as f:
     version_globals = dict()
     exec(f.read(), version_globals)
     lisa_version = version_globals['__version__']
-- 
GitLab


From 9294b0c2db4531c8a2b6fc46434d33c4b0788698 Mon Sep 17 00:00:00 2001
From: Douglas Raillard <douglas.raillard@arm.com>
Date: Wed, 11 Sep 2024 17:03:47 +0100
Subject: [PATCH 3/3] doc/doc_requirements.txt: Update sphinx version

Update Sphinx version used in readthedocs.
---
 doc/doc_requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/doc_requirements.txt b/doc/doc_requirements.txt
index 211b0ca1b..6c1da952b 100644
--- a/doc/doc_requirements.txt
+++ b/doc/doc_requirements.txt
@@ -1,5 +1,5 @@
 
-sphinx==6.1.3
+sphinx==8.0.2
 
 # A streamlined version of devmode_requirements.txt for doc building
 -e ./tools/exekall
-- 
GitLab