diff --git a/komodo/cli.py b/komodo/cli.py index 3c2b67a3f..502afad51 100755 --- a/komodo/cli.py +++ b/komodo/cli.py @@ -20,7 +20,7 @@ ) from komodo.shebang import fixup_python_shebangs from komodo.shell import pushd, shell -from komodo.yaml_file_type import YamlFile +from komodo.yaml_file_types import YamlFile def create_enable_scripts(komodo_prefix: str, komodo_release: str) -> None: diff --git a/komodo/fetch.py b/komodo/fetch.py index 530e3cfdb..67aceabfb 100644 --- a/komodo/fetch.py +++ b/komodo/fetch.py @@ -14,7 +14,7 @@ strip_version, ) from komodo.shell import pushd, shell -from komodo.yaml_file_type import YamlFile +from komodo.yaml_file_types import YamlFile def eprint(*args, **kwargs): diff --git a/komodo/lint_package_status.py b/komodo/lint_package_status.py index 3cb9d40ac..4e8593c49 100644 --- a/komodo/lint_package_status.py +++ b/komodo/lint_package_status.py @@ -2,7 +2,7 @@ import argparse -from komodo.yaml_file_type import YamlFile +from komodo.yaml_file_types import YamlFile VALID_VISIBILITY = ["public", "private"] VALID_IMPORTANCE = ["low", "medium", "high"] diff --git a/komodo/show_version.py b/komodo/show_version.py index e35ad73b0..f6c533757 100644 --- a/komodo/show_version.py +++ b/komodo/show_version.py @@ -10,7 +10,7 @@ import yaml -from komodo.yaml_file_type import ManifestFile +from komodo.yaml_file_types import ManifestFile def get_release() -> str: diff --git a/komodo/snyk_reporting.py b/komodo/snyk_reporting.py index ea66dbe55..bcc9f011a 100644 --- a/komodo/snyk_reporting.py +++ b/komodo/snyk_reporting.py @@ -8,7 +8,7 @@ from snyk.managers import OrganizationManager from snyk.models import Vulnerability -from komodo.yaml_file_type import ReleaseDir, ReleaseFile, YamlFile +from komodo.yaml_file_types import ReleaseDir, ReleaseFile, YamlFile _CONSOLE_VULNERABILITY_FORMAT = """\t{id} \t\tPackage: {package} diff --git a/komodo/yaml_file_type.py b/komodo/yaml_file_types.py similarity index 100% rename from komodo/yaml_file_type.py rename to komodo/yaml_file_types.py diff --git a/tests/test_show_version.py b/tests/test_show_version.py index 73f05908e..e86395067 100644 --- a/tests/test_show_version.py +++ b/tests/test_show_version.py @@ -73,13 +73,13 @@ def test_get_version_with_filepath(mock_version_manifest): the file directly. Note that the file loading _and validation_ is handled by - komodo.yaml_file_type.ManifestFile, hence the different args for `open()`. + komodo.yaml_file_types.ManifestFile, hence the different args for `open()`. """ fname = "/foo/bar/komodo-release-0.0.1-py38/komodo-release-0.0.1-py38" args = parse_args(["foo", "--manifest-file", fname]) assert get_version(args.package, manifest=args.manifest_file) == "1.2.3" - # Goes through argparse.FileType via komodo.yaml_file_type.ManifestFile. + # Goes through argparse.FileType via komodo.yaml_file_types.ManifestFile. mock_version_manifest.assert_called_once_with(fname, "r", -1, None, None) @@ -95,7 +95,7 @@ def test_get_version_fails_with_release_file(mock_release_file): _ = parse_args(["foo", "--manifest-file", fname]) assert "does not appear to be a manifest file" in str(exception_info.value) - # Goes through argparse.FileType via komodo.yaml_file_type.ManifestFile. + # Goes through argparse.FileType via komodo.yaml_file_types.ManifestFile. mock_release_file.assert_called_once_with(fname, "r", -1, None, None)