From 3d080ea716589432c40d1c21fac5892d8ff39b18 Mon Sep 17 00:00:00 2001 From: Ian Tewksbury Date: Fri, 18 Dec 2020 14:14:39 -0500 Subject: [PATCH] Ploigos rename: - fix relative module paths to absolute --- src/ploigos_step_runner/__init__.py | 10 +++++----- src/ploigos_step_runner/config/decryptors/__init__.py | 2 +- src/ploigos_step_runner/step_implementers/__init__.py | 3 +-- .../container_image_static_compliance_scan/__init__.py | 3 ++- .../__init__.py | 3 ++- .../create_container_image/__init__.py | 2 +- .../step_implementers/deploy/__init__.py | 2 +- .../step_implementers/generate_metadata/__init__.py | 8 ++++---- .../step_implementers/package/__init__.py | 2 +- .../step_implementers/push_artifacts/__init__.py | 2 +- .../step_implementers/push_container_image/__init__.py | 2 +- .../step_implementers/shared/__init__.py | 4 ++-- .../step_implementers/sign_container_image/__init__.py | 4 ++-- .../step_implementers/static_code_analysis/__init__.py | 2 +- .../step_implementers/tag_source/__init__.py | 2 +- .../step_implementers/uat/__init__.py | 2 +- .../step_implementers/unit_test/__init__.py | 2 +- .../validate_environment_configuration/__init__.py | 6 ++++-- tox.ini | 1 + 19 files changed, 33 insertions(+), 29 deletions(-) diff --git a/src/ploigos_step_runner/__init__.py b/src/ploigos_step_runner/__init__.py index 1233747c..c9c5a3a6 100644 --- a/src/ploigos_step_runner/__init__.py +++ b/src/ploigos_step_runner/__init__.py @@ -793,8 +793,8 @@ import __main__ -from .exceptions import StepRunnerException -from .step_implementer import DefaultSteps, StepImplementer -from .step_result import StepResult -from .step_runner import StepRunner -from .workflow_result import WorkflowResult +from ploigos_step_runner.exceptions import StepRunnerException +from ploigos_step_runner.step_implementer import DefaultSteps, StepImplementer +from ploigos_step_runner.step_result import StepResult +from ploigos_step_runner.step_runner import StepRunner +from ploigos_step_runner.workflow_result import WorkflowResult diff --git a/src/ploigos_step_runner/config/decryptors/__init__.py b/src/ploigos_step_runner/config/decryptors/__init__.py index 181a5997..ce5bfd59 100644 --- a/src/ploigos_step_runner/config/decryptors/__init__.py +++ b/src/ploigos_step_runner/config/decryptors/__init__.py @@ -1,4 +1,4 @@ """Decryptors for configuration values. """ -from .sops import SOPS +from ploigos_step_runner.config.decryptors.sops import SOPS diff --git a/src/ploigos_step_runner/step_implementers/__init__.py b/src/ploigos_step_runner/step_implementers/__init__.py index cf84b425..97eef5a4 100644 --- a/src/ploigos_step_runner/step_implementers/__init__.py +++ b/src/ploigos_step_runner/step_implementers/__init__.py @@ -1,3 +1,2 @@ -""" -com.redhat.ploigos_step_runner.step_implementers +"""StepImplementer implementations. """ diff --git a/src/ploigos_step_runner/step_implementers/container_image_static_compliance_scan/__init__.py b/src/ploigos_step_runner/step_implementers/container_image_static_compliance_scan/__init__.py index cb0ef12f..4d7b54bf 100644 --- a/src/ploigos_step_runner/step_implementers/container_image_static_compliance_scan/__init__.py +++ b/src/ploigos_step_runner/step_implementers/container_image_static_compliance_scan/__init__.py @@ -1,4 +1,5 @@ """`StepImplementers` for the `container-image-static-compliance-scan` step. """ -from .openscap import OpenSCAP +from ploigos_step_runner.step_implementers.container_image_static_compliance_scan.\ + openscap import OpenSCAP diff --git a/src/ploigos_step_runner/step_implementers/container_image_static_vulnerability_scan/__init__.py b/src/ploigos_step_runner/step_implementers/container_image_static_vulnerability_scan/__init__.py index 77214f65..c78c93fe 100644 --- a/src/ploigos_step_runner/step_implementers/container_image_static_vulnerability_scan/__init__.py +++ b/src/ploigos_step_runner/step_implementers/container_image_static_vulnerability_scan/__init__.py @@ -1,4 +1,5 @@ """`StepImplementers` for the `container-image-static-vulnerability-scan` step. """ -from .openscap import OpenSCAP +from ploigos_step_runner.step_implementers.container_image_static_vulnerability_scan.\ + openscap import OpenSCAP diff --git a/src/ploigos_step_runner/step_implementers/create_container_image/__init__.py b/src/ploigos_step_runner/step_implementers/create_container_image/__init__.py index 50cf3dce..e88620b4 100644 --- a/src/ploigos_step_runner/step_implementers/create_container_image/__init__.py +++ b/src/ploigos_step_runner/step_implementers/create_container_image/__init__.py @@ -1,4 +1,4 @@ """`StepImplementers` for the `create-container-image` step. """ -from .buildah import Buildah +from ploigos_step_runner.step_implementers.create_container_image.buildah import Buildah diff --git a/src/ploigos_step_runner/step_implementers/deploy/__init__.py b/src/ploigos_step_runner/step_implementers/deploy/__init__.py index ff31c8e1..dd7d95e2 100644 --- a/src/ploigos_step_runner/step_implementers/deploy/__init__.py +++ b/src/ploigos_step_runner/step_implementers/deploy/__init__.py @@ -1,4 +1,4 @@ """`StepImplementers` for the `deploy` step. """ -from .argocd import ArgoCD +from ploigos_step_runner.step_implementers.deploy.argocd import ArgoCD diff --git a/src/ploigos_step_runner/step_implementers/generate_metadata/__init__.py b/src/ploigos_step_runner/step_implementers/generate_metadata/__init__.py index 07ce4f4e..ef25addb 100644 --- a/src/ploigos_step_runner/step_implementers/generate_metadata/__init__.py +++ b/src/ploigos_step_runner/step_implementers/generate_metadata/__init__.py @@ -1,7 +1,7 @@ """`StepImplementers` for the `generate-metadata` step. """ -from .git import Git -from .maven import Maven -from .npm import Npm -from .semantic_version import SemanticVersion +from ploigos_step_runner.step_implementers.generate_metadata.git import Git +from ploigos_step_runner.step_implementers.generate_metadata.maven import Maven +from ploigos_step_runner.step_implementers.generate_metadata.npm import Npm +from ploigos_step_runner.step_implementers.generate_metadata.semantic_version import SemanticVersion diff --git a/src/ploigos_step_runner/step_implementers/package/__init__.py b/src/ploigos_step_runner/step_implementers/package/__init__.py index 728a81c6..f3fb78ef 100644 --- a/src/ploigos_step_runner/step_implementers/package/__init__.py +++ b/src/ploigos_step_runner/step_implementers/package/__init__.py @@ -1,4 +1,4 @@ """`StepImplementers` for the `package` step. """ -from .maven import Maven +from ploigos_step_runner.step_implementers.package.maven import Maven diff --git a/src/ploigos_step_runner/step_implementers/push_artifacts/__init__.py b/src/ploigos_step_runner/step_implementers/push_artifacts/__init__.py index 7f3d6f3f..56a7907c 100644 --- a/src/ploigos_step_runner/step_implementers/push_artifacts/__init__.py +++ b/src/ploigos_step_runner/step_implementers/push_artifacts/__init__.py @@ -1,4 +1,4 @@ """`StepImplementers` for the `push-artifacts` step. """ -from .maven import Maven +from ploigos_step_runner.step_implementers.push_artifacts.maven import Maven diff --git a/src/ploigos_step_runner/step_implementers/push_container_image/__init__.py b/src/ploigos_step_runner/step_implementers/push_container_image/__init__.py index 0c07b178..919ac9ff 100644 --- a/src/ploigos_step_runner/step_implementers/push_container_image/__init__.py +++ b/src/ploigos_step_runner/step_implementers/push_container_image/__init__.py @@ -1,4 +1,4 @@ """`StepImplementers` for the `push-container-image` step. """ -from .skopeo import Skopeo +from ploigos_step_runner.step_implementers.push_container_image.skopeo import Skopeo diff --git a/src/ploigos_step_runner/step_implementers/shared/__init__.py b/src/ploigos_step_runner/step_implementers/shared/__init__.py index bef01bbd..58e55c19 100644 --- a/src/ploigos_step_runner/step_implementers/shared/__init__.py +++ b/src/ploigos_step_runner/step_implementers/shared/__init__.py @@ -1,5 +1,5 @@ """StepImplementer parent classes that are shared accross multiple steps. """ -from .maven_generic import MavenGeneric -from .openscap_generic import OpenSCAPGeneric +from ploigos_step_runner.step_implementers.shared.maven_generic import MavenGeneric +from ploigos_step_runner.step_implementers.shared.openscap_generic import OpenSCAPGeneric diff --git a/src/ploigos_step_runner/step_implementers/sign_container_image/__init__.py b/src/ploigos_step_runner/step_implementers/sign_container_image/__init__.py index 12eef099..c0f48e97 100644 --- a/src/ploigos_step_runner/step_implementers/sign_container_image/__init__.py +++ b/src/ploigos_step_runner/step_implementers/sign_container_image/__init__.py @@ -1,5 +1,5 @@ """`StepImplementers` for the `sign-container-image` step. """ -from .curl_push import CurlPush -from .podman_sign import PodmanSign +from ploigos_step_runner.step_implementers.sign_container_image.curl_push import CurlPush +from ploigos_step_runner.step_implementers.sign_container_image.podman_sign import PodmanSign diff --git a/src/ploigos_step_runner/step_implementers/static_code_analysis/__init__.py b/src/ploigos_step_runner/step_implementers/static_code_analysis/__init__.py index 2484bc95..9f49cb33 100644 --- a/src/ploigos_step_runner/step_implementers/static_code_analysis/__init__.py +++ b/src/ploigos_step_runner/step_implementers/static_code_analysis/__init__.py @@ -1,4 +1,4 @@ """`StepImplementers` for the `static-code-analysis` step. """ -from .sonarqube import SonarQube +from ploigos_step_runner.step_implementers.static_code_analysis.sonarqube import SonarQube diff --git a/src/ploigos_step_runner/step_implementers/tag_source/__init__.py b/src/ploigos_step_runner/step_implementers/tag_source/__init__.py index b0cfa020..3dc30c55 100644 --- a/src/ploigos_step_runner/step_implementers/tag_source/__init__.py +++ b/src/ploigos_step_runner/step_implementers/tag_source/__init__.py @@ -1,4 +1,4 @@ """`StepImplementers` for the `tag-source` step. """ -from .git import Git +from ploigos_step_runner.step_implementers.tag_source.git import Git diff --git a/src/ploigos_step_runner/step_implementers/uat/__init__.py b/src/ploigos_step_runner/step_implementers/uat/__init__.py index 443bbcba..edcefb6c 100644 --- a/src/ploigos_step_runner/step_implementers/uat/__init__.py +++ b/src/ploigos_step_runner/step_implementers/uat/__init__.py @@ -1,4 +1,4 @@ """`StepImplementers` for the `uat` (User Acceptance Tests) step. """ -from .maven_selenium_cucumber import MavenSeleniumCucumber +from ploigos_step_runner.step_implementers.uat.maven_selenium_cucumber import MavenSeleniumCucumber diff --git a/src/ploigos_step_runner/step_implementers/unit_test/__init__.py b/src/ploigos_step_runner/step_implementers/unit_test/__init__.py index ec82e1c0..efd857fa 100644 --- a/src/ploigos_step_runner/step_implementers/unit_test/__init__.py +++ b/src/ploigos_step_runner/step_implementers/unit_test/__init__.py @@ -1,3 +1,3 @@ """`StepImplementers` for the `unit-test` step. """ -from .maven import Maven +from ploigos_step_runner.step_implementers.unit_test.maven import Maven diff --git a/src/ploigos_step_runner/step_implementers/validate_environment_configuration/__init__.py b/src/ploigos_step_runner/step_implementers/validate_environment_configuration/__init__.py index 9eae9b2f..72e135df 100644 --- a/src/ploigos_step_runner/step_implementers/validate_environment_configuration/__init__.py +++ b/src/ploigos_step_runner/step_implementers/validate_environment_configuration/__init__.py @@ -1,4 +1,6 @@ """`StepImplementers` for the `validate-environment-configuration` step. """ -from .configlint import Configlint -from .configlint_from_argocd import ConfiglintFromArgocd +from ploigos_step_runner.step_implementers.validate_environment_configuration.\ + configlint import Configlint +from ploigos_step_runner.step_implementers.validate_environment_configuration.\ + configlint_from_argocd import ConfiglintFromArgocd diff --git a/tox.ini b/tox.ini index 91ae5686..5ed8fcfc 100644 --- a/tox.ini +++ b/tox.ini @@ -53,6 +53,7 @@ commands = coverage report --fail-under=100 [testenv:lint] +skip_install = True deps = pylint flake8