From 38fa0d2caf461eeb0f570d4a968850635f759791 Mon Sep 17 00:00:00 2001
From: Hans Fangohr <hans.fangohr@mpsd.mpg.de>
Date: Wed, 31 May 2023 10:32:51 +0200
Subject: [PATCH] fix pydoc style after manual merge
---
mpsd-software-environment.py | 6 +++---
tests.py | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/mpsd-software-environment.py b/mpsd-software-environment.py
index 8dbfe1f..a88b5bd 100755
--- a/mpsd-software-environment.py
+++ b/mpsd-software-environment.py
@@ -54,10 +54,10 @@ class os_chdir:
def run(*args, counter=[0], **kwargs):
"""
- Call subprocess.run(*args, **kwargs) and print logging data.
+ Call subprocess.run and print logging data.
- Conveniene function to call `subprocess.run` and provide some metadata
- about the call.
+ Conveniene function to call `subprocess.run(*args, **kwargs)`
+ and provide some metadata about the call.
Parameters
----------
diff --git a/tests.py b/tests.py
index 2ec9e88..d2bf60c 100644
--- a/tests.py
+++ b/tests.py
@@ -65,6 +65,7 @@ def test_os_chdir(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