diff --git a/doc/doc_requirements.txt b/doc/doc_requirements.txt index 211b0ca1b9096dc774e51b65ef8c8c1954e1d2b7..6c1da952b7820397cacacfb0b98717529e36e3ec 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 diff --git a/doc/plot_conf.yml b/doc/plot_conf.yml index 7cecd4281ae22a1ca622ecf450f2ff1de4464ed6..024f509601d159d6cbab8af9065d83795f836269 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: diff --git a/lisa/_version.py b/lisa/_version.py new file mode 100644 index 0000000000000000000000000000000000000000..5b852d6bb9911bc63eefcc9200a516138df77a8c --- /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 b80e22b8214e817c8abdff3298d14484ea48a1a6..2bd332303bd95d10fbbdda09df58ef87341c38cb 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 0000000000000000000000000000000000000000..a07c4ad345eca95ba324eeba413959480b361676 --- /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 536f6831b5aa60c59536240a36ad1954a6e1ed6f..8d67b6544fda74f5f98b32a77a9b679572009227 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__']