From 50a722794c95a20e9187f98a04f7b1cc182c5923 Mon Sep 17 00:00:00 2001 From: Clemens Date: Fri, 31 Mar 2023 14:59:37 +0200 Subject: [PATCH] Resolved some pylint issues --- src/main/python/ddadevops/application.py | 4 ++-- src/main/python/ddadevops/c4k_mixin.py | 2 +- src/main/python/ddadevops/devops_build.py | 4 ++-- src/main/python/ddadevops/devops_image_build.py | 2 +- src/main/python/ddadevops/infrastructure.py | 4 ++-- src/main/python/ddadevops/python_util.py | 1 - 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/python/ddadevops/application.py b/src/main/python/ddadevops/application.py index 631cab2..976aa44 100644 --- a/src/main/python/ddadevops/application.py +++ b/src/main/python/ddadevops/application.py @@ -1,5 +1,5 @@ -from .domain import Devops, Image -from .infrastructure import FileApi, ResourceApi, ImageApi, ExecutionApi +from .domain import Image +from .infrastructure import FileApi, ResourceApi, ImageApi class ImageBuildService: diff --git a/src/main/python/ddadevops/c4k_mixin.py b/src/main/python/ddadevops/c4k_mixin.py index 8999146..61edc8c 100644 --- a/src/main/python/ddadevops/c4k_mixin.py +++ b/src/main/python/ddadevops/c4k_mixin.py @@ -2,7 +2,7 @@ import deprecation from .domain import C4k, DnsRecord from .devops_build import DevopsBuild from .credential import gopass_field_from_path, gopass_password_from_path -from .infrastructure import ProjectRepository, FileApi, ExecutionApi +from .infrastructure import ExecutionApi @deprecation.deprecated(deprecated_in="3.2") diff --git a/src/main/python/ddadevops/devops_build.py b/src/main/python/ddadevops/devops_build.py index 1db8826..497a715 100644 --- a/src/main/python/ddadevops/devops_build.py +++ b/src/main/python/ddadevops/devops_build.py @@ -1,6 +1,6 @@ -import deprecation from typing import Optional from subprocess import run, CalledProcessError +import deprecation from .domain import Devops from .infrastructure import ProjectRepository, FileApi @@ -50,7 +50,7 @@ class DevopsBuild: ) else: raise Exception("Build parameters could not be set!") - + self.repo.set_devops(self.project, devops) self.repo.set_build(self.project, self) diff --git a/src/main/python/ddadevops/devops_image_build.py b/src/main/python/ddadevops/devops_image_build.py index 520aa57..7ef19f0 100644 --- a/src/main/python/ddadevops/devops_image_build.py +++ b/src/main/python/ddadevops/devops_image_build.py @@ -1,5 +1,5 @@ -import deprecation from typing import Optional +import deprecation from .domain import Image from .application import ImageBuildService from .devops_build import DevopsBuild, create_devops_build_config diff --git a/src/main/python/ddadevops/infrastructure.py b/src/main/python/ddadevops/infrastructure.py index 04b6b3f..196b076 100644 --- a/src/main/python/ddadevops/infrastructure.py +++ b/src/main/python/ddadevops/infrastructure.py @@ -1,11 +1,11 @@ from pathlib import Path from sys import stdout -from pkg_resources import resource_string from os import chmod from subprocess import run +from pkg_resources import resource_string import yaml from .domain import Devops, Image, C4k -from .python_util import execute, execute_live +from .python_util import execute class ProjectRepository: diff --git a/src/main/python/ddadevops/python_util.py b/src/main/python/ddadevops/python_util.py index 3b06fee..204ee4d 100644 --- a/src/main/python/ddadevops/python_util.py +++ b/src/main/python/ddadevops/python_util.py @@ -1,5 +1,4 @@ from subprocess import check_output, Popen, PIPE -import sys def execute(cmd, shell=False): output = check_output(cmd, encoding='UTF-8', shell=shell)