diff --git a/Pipfile b/Pipfile index 7d5e8e0..5cc103c 100644 --- a/Pipfile +++ b/Pipfile @@ -31,7 +31,7 @@ psutil = "~=5.9.0" python_version = "3.10" [scripts] -check = "pipenv check -i 39253 -i 39621 -i 41002 -i 50916 -i 51457" +check = "pipenv check -i 39253 -i 39621 -i 41002 -i 50916 -i 51457 -i 61416" tests = "pytest --cov=. --cov-report=xml --no-cov-on-fail -m 'not uses_copyright_material'" tests-nogame = "pytest --cov=. --cov-report=xml --no-cov-on-fail -m 'not uses_copyright_material and not requires_game'" tests-nocov = "pytest -m 'not uses_copyright_material'" diff --git a/automate/manifest.py b/automate/manifest.py index d5c21f9..411ee3c 100644 --- a/automate/manifest.py +++ b/automate/manifest.py @@ -8,7 +8,9 @@ from utils.log import get_logger MANIFEST_FILENAME = '_manifest.json' -SHRINK_MOD_REGEX = r"{\n\s+(.+: .*),\n\s+(.+: .*),\n\s+(.+: .*)\n\s+}" +SHRINK_MOD_REGEX3 = r"{\n\s+(.+: .*),\n\s+(.+: .*),\n\s+(.+: .*)\n\s+}" +SHRINK_MOD_REGEX4 = r"{\n\s+(.+: .*),\n\s+(.+: .*),\n\s+(.+: .*),\n\s+(.+: .*)\n\s+}" +SHRINK_MOD_REGEX5 = r"{\n\s+(.+: .*),\n\s+(.+: .*),\n\s+(.+: .*),\n\s+(.+: .*),\n\s+(.+: .*)\n\s+}" __all__ = [ 'update_manifest', @@ -39,7 +41,9 @@ def _write_manifest(filename: Path, data: Dict[str, Any]): filename.parent.mkdir(parents=True, exist_ok=True) with open(filename, 'wt', encoding='utf-8', newline='\n') as f: content = json.dumps(data, indent='\t') - content = re.sub(SHRINK_MOD_REGEX, r'{ \1, \2, \3 }', content) + content = re.sub(SHRINK_MOD_REGEX3, r'{ \1, \2, \3 }', content) + content = re.sub(SHRINK_MOD_REGEX4, r'{ \1, \2, \3, \4 }', content) + content = re.sub(SHRINK_MOD_REGEX5, r'{ \1, \2, \3, \4, \5 }', content) f.write(content)