diff --git a/module_build_service/builder/CoprModuleBuilder.py b/module_build_service/builder/CoprModuleBuilder.py index 2fdd2db7..4918a68d 100644 --- a/module_build_service/builder/CoprModuleBuilder.py +++ b/module_build_service/builder/CoprModuleBuilder.py @@ -28,39 +28,23 @@ # their tag names. # TODO: Ensure the RPM %dist tag is set according to the policy. -import six -from abc import ABCMeta, abstractmethod import logging import os - -from mock import Mock -from kobo.shortcuts import run import koji import tempfile -import glob -import datetime -import time -import random -import string -import kobo.rpmlib -import xmlrpclib -import shutil -import subprocess import threading -import munch -from OpenSSL.SSL import SysCallError +from copr.client import CoprClient +from copr.exceptions import CoprRequestException -from module_build_service import conf, log, db +from module_build_service import log from module_build_service.models import ModuleBuild -from module_build_service import pdc import module_build_service.scm import module_build_service.utils import module_build_service.scheduler import module_build_service.scheduler.consumer -from requests.exceptions import ConnectionError -from base import GenericBuilder, _execute_cmd, build_from_scm +from base import GenericBuilder, build_from_scm from KojiModuleBuilder import KojiModuleBuilder logging.basicConfig(level=logging.DEBUG) diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py index c087e549..abd92b5f 100644 --- a/module_build_service/builder/KojiModuleBuilder.py +++ b/module_build_service/builder/KojiModuleBuilder.py @@ -28,12 +28,8 @@ # their tag names. # TODO: Ensure the RPM %dist tag is set according to the policy. -import six -from abc import ABCMeta, abstractmethod import logging import os - -from mock import Mock from kobo.shortcuts import run import koji import tempfile @@ -44,22 +40,17 @@ import random import string import kobo.rpmlib import xmlrpclib -import shutil -import subprocess import threading import munch from OpenSSL.SSL import SysCallError from module_build_service import conf, log, db -from module_build_service.models import ModuleBuild -from module_build_service import pdc import module_build_service.scm import module_build_service.utils import module_build_service.scheduler import module_build_service.scheduler.consumer -from requests.exceptions import ConnectionError from base import GenericBuilder logging.basicConfig(level=logging.DEBUG) diff --git a/module_build_service/builder/MockModuleBuilder.py b/module_build_service/builder/MockModuleBuilder.py index ff822889..a328782c 100644 --- a/module_build_service/builder/MockModuleBuilder.py +++ b/module_build_service/builder/MockModuleBuilder.py @@ -28,38 +28,20 @@ # their tag names. # TODO: Ensure the RPM %dist tag is set according to the policy. -import six -from abc import ABCMeta, abstractmethod import logging import os - -from mock import Mock -from kobo.shortcuts import run import koji -import tempfile -import glob -import datetime -import time -import random -import string import kobo.rpmlib -import xmlrpclib import shutil import subprocess import threading -import munch -from OpenSSL.SSL import SysCallError - from module_build_service import conf, log, db -from module_build_service.models import ModuleBuild -from module_build_service import pdc import module_build_service.scm import module_build_service.utils import module_build_service.scheduler import module_build_service.scheduler.consumer -from requests.exceptions import ConnectionError from base import GenericBuilder, _execute_cmd, build_from_scm from KojiModuleBuilder import KojiModuleBuilder diff --git a/module_build_service/builder/base.py b/module_build_service/builder/base.py index f763dfec..252212ca 100644 --- a/module_build_service/builder/base.py +++ b/module_build_service/builder/base.py @@ -32,27 +32,12 @@ import six from abc import ABCMeta, abstractmethod import logging import os - -from mock import Mock -from kobo.shortcuts import run import koji import tempfile -import glob -import datetime -import time -import random -import string -import kobo.rpmlib -import xmlrpclib import shutil import subprocess -import threading - -import munch -from OpenSSL.SSL import SysCallError from module_build_service import conf, log, db -from module_build_service.models import ModuleBuild from module_build_service import pdc import module_build_service.scm import module_build_service.utils