Skip to content

Commit f6ceb4a

Browse files
author
Alan Christie
committed
Now uses decoder 1.6.1
Updated requirements Manifest file can now include data-manager directory
1 parent 8a4fca5 commit f6ceb4a

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

build-requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
pyroma == 3.2
2-
pytest == 6.2.5
3-
pytest-cov == 3.0.0
4-
mypy == 0.931
5-
pylint == 2.12.2
1+
pyroma
2+
pytest
3+
pytest-cov
4+
mypy
5+
pylint

jote/jote.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,10 @@ def _load(manifest_filename: str, skip_lint: bool)\
140140
If there was a problem loading the files an empty list and
141141
-ve count is returned.
142142
"""
143-
manifest_path: str = os.path.join(_DEFINITION_DIRECTORY, manifest_filename)
143+
# Prefix manifest filename with definition directory if required...
144+
manifest_path: str = manifest_filename\
145+
if manifest_filename.startswith(f'{_DEFINITION_DIRECTORY}/')\
146+
else os.path.join(_DEFINITION_DIRECTORY, manifest_filename)
144147
if not os.path.isfile(manifest_path):
145148
print(f'! The manifest file is missing ("{manifest_path}")')
146149
return [], -1
@@ -337,11 +340,14 @@ def _test(args: argparse.Namespace,
337340
# Does the test have a 'run-level' declaration?
338341
# If so, is it higher than the run-level specified?
339342
if 'run-level' in job_definition.tests[job_test_name]:
340-
run_level: int = job_definition.tests[job_test_name]['run-level']
343+
run_level = job_definition.tests[job_test_name]['run-level']
344+
print(f'> run-level={run_level}')
341345
if run_level > args.run_level:
342346
print(f'W Skipping test (test is "run-level: {run_level}")')
343347
tests_skipped += 1
344348
continue
349+
else:
350+
print('> run-level=Undefined')
345351

346352
# Render the command for this test.
347353

package-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# pip install -r package-requirements.txt
77

88
wheel == 0.37.1
9-
twine == 3.7.1
9+
twine == 3.8.0

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
docker-compose == 1.29.2
2-
im-data-manager-job-decoder == 1.5.1
2+
im-data-manager-job-decoder == 1.6.1
33
munch == 2.5.0
44
pyyaml == 5.4.1
55
yamllint == 1.26.3

0 commit comments

Comments
 (0)