Skip to content
Snippets Groups Projects
Commit 1c3897b1 authored by Hans Fangohr's avatar Hans Fangohr
Browse files

Merge branch 'linux-debian11' into 'towards-conventional-doc-strings'

# Conflicts:
#   mpsd-software-environment.py
parents 865bb6f7 89b01a7e
No related branches found
No related tags found
2 merge requests!19Move linux-debian11 into main,!11Making docstrings comply with numpydoc
Pipeline #368340 passed
...@@ -188,14 +188,14 @@ def get_release_info(mpsd_release: str, script_dir: Path) -> Tuple[str, str, Lis ...@@ -188,14 +188,14 @@ def get_release_info(mpsd_release: str, script_dir: Path) -> Tuple[str, str, Lis
Raises Raises
------ ------
Exception : FileNotFoundError :
If the release directory does not exist. Run `create_dir_structure()` If the release directory does not exist. Run `create_dir_structure()`
first. first.
""" """
# Get the info for release # Get the info for release
release_base_dir = script_dir / mpsd_release release_base_dir = script_dir / mpsd_release
if not os.path.exists(release_base_dir): if not os.path.exists(release_base_dir):
raise Exception( raise FileNotFoundError(
"Release directory does not exist. Run create_dir_structure() first." "Release directory does not exist. Run create_dir_structure() first."
) )
with os_chdir(release_base_dir): with os_chdir(release_base_dir):
...@@ -271,7 +271,7 @@ def install_environment( ...@@ -271,7 +271,7 @@ def install_environment(
cache when installing toolchains. Defaults to False. cache when installing toolchains. Defaults to False.
Raises: Raises:
Exception: If a requested toolchain is not available in the specified release. ValueError: If a requested toolchain is not available in the specified release.
Returns: Returns:
None None
...@@ -309,7 +309,7 @@ def install_environment( ...@@ -309,7 +309,7 @@ def install_environment(
for toolchain in toolchains: for toolchain in toolchains:
if toolchain not in available_toolchains: if toolchain not in available_toolchains:
raise Exception( raise ValueError(
f"Toolchain '{toolchain}' is not available in release {mpsd_release}." f"Toolchain '{toolchain}' is not available in release {mpsd_release}."
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment