From cfd060a7c6a8c51dbd623f2e3a64ca7e88ed9c06 Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Thu, 22 Jun 2023 10:41:05 +0200
Subject: [PATCH] run precommit on all files
---
.gitignore | 2 +-
.gitlab-ci.yml | 5 ++---
install-dev23a.sh | 6 +++---
src/mpsd_software_manager/mpsd_software.py | 16 ++++++++--------
tests/test_mpsd_software.py | 2 +-
5 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3a1ec4c..bdecffe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ dev-23a/
*.log
dist/
build/
-*.egg-info/
\ No newline at end of file
+*.egg-info/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b70ecaf..c7020b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,11 +91,10 @@ test-bullseye:
image: debian:bullseye-slim
script:
- *prepare_debian
- - pytest -v -l
+ - pytest -v -l
test-bookworm:
stage: test
image: debian:bookworm-slim
script:
- *prepare_debian
- - pytest -v -l
-
+ - pytest -v -l
diff --git a/install-dev23a.sh b/install-dev23a.sh
index c01e10b..5a97c1a 100755
--- a/install-dev23a.sh
+++ b/install-dev23a.sh
@@ -1,21 +1,21 @@
#!/bin/bash
# Script to build all toolchains for this MPSD release ( 23a )
# Run this script inside the cloned folder for eg:
-# mpsddeb@mpsd-hpc-ibm-022:/opt_mpsd/linux-debian11/mpsd-software-environments$ ./install-dev23a.sh
+# mpsddeb@mpsd-hpc-ibm-022:/opt_mpsd/linux-debian11/mpsd-software-environments$ ./install-dev23a.sh
set -e
cd ..
mkdir -p dev-23a
cd dev-23a
# clone repo if it doesn't exist yet
-[ -d 'spack-environments' ] || git clone git@gitlab.gwdg.de:mpsd-cs/spack-environments.git
+[ -d 'spack-environments' ] || git clone git@gitlab.gwdg.de:mpsd-cs/spack-environments.git
pushd spack-environments
git checkout dev-23a
git pull
popd
mkdir -p sandybridge
cd sandybridge
-../spack-environments/spack_setup.sh -b global
+../spack-environments/spack_setup.sh -b global
../spack-environments/spack_setup.sh foss2021a-serial
../spack-environments/spack_setup.sh foss2021a-mpi
../spack-environments/spack_setup.sh foss2021a-cuda-mpi
diff --git a/src/mpsd_software_manager/mpsd_software.py b/src/mpsd_software_manager/mpsd_software.py
index b3b4da2..aa896e6 100755
--- a/src/mpsd_software_manager/mpsd_software.py
+++ b/src/mpsd_software_manager/mpsd_software.py
@@ -35,10 +35,10 @@ Build software as on MPSD HPC.
It follows recipes as used on the MPSD HPC system and the (spack-based)
Octopus buildbot. Compiled software is organised into MPSD software release
versions (such as `dev-23a`) and CPU microarchitecture (such as `sandybridge`).
-
+
Compiled packages and toolchains can be activated and used via `module load` as
on the HPC system.
-
+
Further documentation is available in the README.rst file, online at
https://gitlab.gwdg.de/mpsd-cs/mpsd-software-manager/-/blob/main/README.rst
@@ -56,17 +56,17 @@ Examples:
1. Query what package sets and toolchains are available for installation in
release dev-23a
-
+
$> {sys.argv[0]} available dev-23a
-
+
2. Install foss2022a-serial toolchain from the dev-23a release
-
+
$> {sys.argv[0]} install dev-23a foss2022a-serial
-
+
3. Check what package sets and toolchains are installed from release dev-23a
-
+
$> {sys.argv[0]} status dev-23a
-
+
The `status` command also displays the `module use` command needed to load
the created modules.
diff --git a/tests/test_mpsd_software.py b/tests/test_mpsd_software.py
index 6efde25..514c8e5 100644
--- a/tests/test_mpsd_software.py
+++ b/tests/test_mpsd_software.py
@@ -107,7 +107,7 @@ def test_run_method(tmp_path):
def test_prepare_environment(tmp_path):
"""Simulate running preparation of environment.
-
+
Simulate running ./install-software-environment.py --release dev-23a \
--target-directory /tmp/test_prepare_env
prepare_env is run when cmd is not specified, we can test cmd='prepare'
--
GitLab