Skip to content

Commit c07b104

Browse files
Merge pull request #2 from martinkilbinger/log
tests checking
2 parents f69568e + c3fdbad commit c07b104

6 files changed

Lines changed: 72 additions & 121 deletions

File tree

configure.sh

Lines changed: 0 additions & 111 deletions
This file was deleted.

cs_util/logging.py

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
"""LOGGING.
2+
3+
:Description: This script contains utility methods for job execution and progress logging.
4+
5+
:Author: Martin Kilbinger <martin.kilblinger@cea.fr>
6+
7+
"""
8+
9+
10+
import sys
11+
12+
13+
def log_command(argv, name=None, close_no_return=True):
14+
"""Log Command.
15+
16+
Write command with arguments to a file or stdout.
17+
Choose name = 'sys.stdout' or 'sys.stderr' for output on sceen.
18+
19+
MKDEBUG copied from shapepipe:cfis
20+
21+
Parameters
22+
----------
23+
argv : list
24+
Command line arguments
25+
name : str
26+
Output file name (default: 'log_<command>')
27+
close_no_return : bool
28+
If True (default), close log file. If False, keep log file open
29+
and return file handler
30+
31+
Returns
32+
-------
33+
filehandler
34+
log file handler (if close_no_return is False)
35+
36+
"""
37+
if name is None:
38+
name = 'log_' + os.path.basename(argv[0])
39+
40+
if name == 'sys.stdout':
41+
f = sys.stdout
42+
elif name == 'sys.stderr':
43+
f = sys.stderr
44+
else:
45+
f = open(name, 'w')
46+
47+
for a in argv:
48+
49+
# Quote argument if special characters
50+
if '[' in a or ']' in a:
51+
a = f'\"{a}\"'
52+
53+
print(a, end='', file=f)
54+
print(' ', end='', file=f)
55+
56+
print('', file=f)
57+
58+
if not close_no_return:
59+
return f
60+
61+
if name != 'sys.stdout' and name != 'sys.stderr':
62+
f.close()

develop.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
coverage
2-
nose
2+
isort
3+
jinja2==3.0
4+
numpydoc
35
pytest
46
pytest-cov
5-
pytest-pep8
6-
pytest-emoji
7-
pytest-flake8
8-
wemake-python-styleguide
7+
pytest-pycodestyle
8+
pytest-pydocstyle

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
astropy
2+
datetime
13
importlib_metadata
24
numpy
3-
astropy
45
matplotlib
56
pycodestyle==2.9.0
67
vos
7-
datetime

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ testpaths =
2222
scripts
2323
addopts =
2424
--verbose
25-
--emoji
26-
--flake8
2725
--cov=cs_util
2826
--cov-report=term
2927
--cov-report=xml
3028
--junitxml=pytest.xml
29+
#--emoji
30+
#--flake8

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Set the package release version
88
major = 0
99
minor = 0
10-
patch = 0
10+
patch = 1
1111

1212
# Set the package details
1313
name = 'cs_util'

0 commit comments

Comments
 (0)