From 7d82cd85aaa231e88c7220cf74f6fa75b03bab77 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sep 27 2018 06:53:13 +0000 Subject: Merge #411 `Remove dead code` --- diff --git a/backend/backend/mockremote/builder.py b/backend/backend/mockremote/builder.py index 82d3349..dd795c4 100644 --- a/backend/backend/mockremote/builder.py +++ b/backend/backend/mockremote/builder.py @@ -1,7 +1,6 @@ import os import pipes from subprocess import Popen -from urllib.parse import urlparse from backend.vm_manage import PUBSUB_INTERRUPT_BUILDER diff --git a/backend/backend/sshcmd.py b/backend/backend/sshcmd.py index f2d0d50..8972cc9 100644 --- a/backend/backend/sshcmd.py +++ b/backend/backend/sshcmd.py @@ -1,7 +1,5 @@ import os import subprocess -import select -import socket class SSHConnectionError(Exception): pass diff --git a/cli/copr_cli/main.py b/cli/copr_cli/main.py index 9e00e0a..3620832 100644 --- a/cli/copr_cli/main.py +++ b/cli/copr_cli/main.py @@ -13,9 +13,9 @@ from collections import defaultdict import logging if six.PY2: - from urlparse import urlparse, urljoin + from urlparse import urljoin else: - from urllib.parse import urlparse, urljoin + from urllib.parse import urljoin if sys.version_info < (2, 7): class NullHandler(logging.Handler): @@ -28,7 +28,6 @@ log = logging.getLogger(__name__) log.addHandler(NullHandler()) from copr import CoprClient -from copr.client.responses import CoprResponse import copr.exceptions as copr_exceptions from copr.v3 import (Client, config_from_file, CoprException, CoprRequestException, CoprNoConfigException, diff --git a/dist-git/dist_git/helpers.py b/dist-git/dist_git/helpers.py index 976deb6..147d01f 100644 --- a/dist-git/dist_git/helpers.py +++ b/dist-git/dist_git/helpers.py @@ -5,7 +5,6 @@ import munch from .exceptions import FileDownloadException, RunCommandException, SrpmQueryException -from copr_common.enums import EnumType from configparser import ConfigParser from munch import Munch from requests import get diff --git a/dist-git/dist_git/import_task.py b/dist-git/dist_git/import_task.py index 606c037..b1a79ae 100644 --- a/dist-git/dist_git/import_task.py +++ b/dist-git/dist_git/import_task.py @@ -1,7 +1,5 @@ # coding: utf-8 -import json - from .exceptions import PackageImportException class ImportTask(object): diff --git a/frontend/coprs_frontend/alembic/fedora/versions/14d5bf9ab362_enable_rawhide.py b/frontend/coprs_frontend/alembic/fedora/versions/14d5bf9ab362_enable_rawhide.py index e5c15d7..e47e586 100644 --- a/frontend/coprs_frontend/alembic/fedora/versions/14d5bf9ab362_enable_rawhide.py +++ b/frontend/coprs_frontend/alembic/fedora/versions/14d5bf9ab362_enable_rawhide.py @@ -11,7 +11,6 @@ revision = '14d5bf9ab362' down_revision = '419a626c25e6' from alembic import op -import sqlalchemy as sa def upgrade(): diff --git a/frontend/coprs_frontend/alembic/fedora/versions/3341bf554454_add_mageia_chroots.py b/frontend/coprs_frontend/alembic/fedora/versions/3341bf554454_add_mageia_chroots.py index 0d0dfab..428b0b1 100644 --- a/frontend/coprs_frontend/alembic/fedora/versions/3341bf554454_add_mageia_chroots.py +++ b/frontend/coprs_frontend/alembic/fedora/versions/3341bf554454_add_mageia_chroots.py @@ -11,7 +11,6 @@ revision = '3341bf554454' down_revision = '94975badc43' from alembic import op -import sqlalchemy as sa def upgrade(): diff --git a/frontend/coprs_frontend/alembic/fedora/versions/419a626c25e6_rename_rawhide_to_f26.py b/frontend/coprs_frontend/alembic/fedora/versions/419a626c25e6_rename_rawhide_to_f26.py index 4bf115f..ce22fa4 100644 --- a/frontend/coprs_frontend/alembic/fedora/versions/419a626c25e6_rename_rawhide_to_f26.py +++ b/frontend/coprs_frontend/alembic/fedora/versions/419a626c25e6_rename_rawhide_to_f26.py @@ -11,7 +11,6 @@ revision = '419a626c25e6' down_revision = '8de41eec1d1' from alembic import op -import sqlalchemy as sa def upgrade(): diff --git a/frontend/coprs_frontend/alembic/fedora/versions/8de41eec1d1_enabling_fedora_25_chroots.py b/frontend/coprs_frontend/alembic/fedora/versions/8de41eec1d1_enabling_fedora_25_chroots.py index e0c5b0a..8cee392 100644 --- a/frontend/coprs_frontend/alembic/fedora/versions/8de41eec1d1_enabling_fedora_25_chroots.py +++ b/frontend/coprs_frontend/alembic/fedora/versions/8de41eec1d1_enabling_fedora_25_chroots.py @@ -11,7 +11,6 @@ revision = '8de41eec1d1' down_revision = '3341bf554454' from alembic import op -import sqlalchemy as sa def upgrade(): diff --git a/frontend/coprs_frontend/alembic/fedora/versions/94975badc43_fedora_22_chroots_deactivated.py b/frontend/coprs_frontend/alembic/fedora/versions/94975badc43_fedora_22_chroots_deactivated.py index e97fc50..0295a3d 100644 --- a/frontend/coprs_frontend/alembic/fedora/versions/94975badc43_fedora_22_chroots_deactivated.py +++ b/frontend/coprs_frontend/alembic/fedora/versions/94975badc43_fedora_22_chroots_deactivated.py @@ -11,7 +11,6 @@ revision = '94975badc43' down_revision = None from alembic import op -import sqlalchemy as sa def upgrade(): diff --git a/frontend/coprs_frontend/alembic/schema/versions/26bf5b9a4dd0_indeces_for_faster_build_selection.py b/frontend/coprs_frontend/alembic/schema/versions/26bf5b9a4dd0_indeces_for_faster_build_selection.py index fd46a5d..a90bd5e 100644 --- a/frontend/coprs_frontend/alembic/schema/versions/26bf5b9a4dd0_indeces_for_faster_build_selection.py +++ b/frontend/coprs_frontend/alembic/schema/versions/26bf5b9a4dd0_indeces_for_faster_build_selection.py @@ -11,7 +11,6 @@ revision = '26bf5b9a4dd0' down_revision = '3576fc77fb31' from alembic import op -import sqlalchemy as sa def upgrade(): diff --git a/frontend/coprs_frontend/alembic/schema/versions/4af9d157c4ea_add_unique_constraint_for_mock_chroots.py b/frontend/coprs_frontend/alembic/schema/versions/4af9d157c4ea_add_unique_constraint_for_mock_chroots.py index fb57e34..baf403b 100644 --- a/frontend/coprs_frontend/alembic/schema/versions/4af9d157c4ea_add_unique_constraint_for_mock_chroots.py +++ b/frontend/coprs_frontend/alembic/schema/versions/4af9d157c4ea_add_unique_constraint_for_mock_chroots.py @@ -11,7 +11,6 @@ revision = '4af9d157c4ea' down_revision = '3b67c52f5277' from alembic import op -import sqlalchemy as sa def upgrade(): op.create_unique_constraint('mock_chroot_uniq', 'mock_chroot', ['os_release', 'os_version', 'arch']) diff --git a/frontend/coprs_frontend/alembic/schema/versions/bf4b5dc74740_map_mock_croots_to_dits_git_branch.py b/frontend/coprs_frontend/alembic/schema/versions/bf4b5dc74740_map_mock_croots_to_dits_git_branch.py index bbce4e8..81d7e92 100644 --- a/frontend/coprs_frontend/alembic/schema/versions/bf4b5dc74740_map_mock_croots_to_dits_git_branch.py +++ b/frontend/coprs_frontend/alembic/schema/versions/bf4b5dc74740_map_mock_croots_to_dits_git_branch.py @@ -17,7 +17,7 @@ from sqlalchemy.orm import sessionmaker import sys, os sys.path.append(os.getcwd()) -from coprs.models import MockChroot, DistGitBranch +from coprs.models import MockChroot from coprs.helpers import chroot_to_branch from coprs.logic.coprs_logic import BranchesLogic diff --git a/frontend/coprs_frontend/alembic/schema/versions/c28451aaed50_fix_defaults.py b/frontend/coprs_frontend/alembic/schema/versions/c28451aaed50_fix_defaults.py index d549785..64db43b 100644 --- a/frontend/coprs_frontend/alembic/schema/versions/c28451aaed50_fix_defaults.py +++ b/frontend/coprs_frontend/alembic/schema/versions/c28451aaed50_fix_defaults.py @@ -11,7 +11,6 @@ revision = 'c28451aaed50' down_revision = '3637b9daf7e4' from alembic import op -import sqlalchemy as sa def upgrade(): diff --git a/frontend/coprs_frontend/alembic/schema/versions/e183e12563ee_add_index_to_module_id.py b/frontend/coprs_frontend/alembic/schema/versions/e183e12563ee_add_index_to_module_id.py index 14cfb79..ce5c3f0 100644 --- a/frontend/coprs_frontend/alembic/schema/versions/e183e12563ee_add_index_to_module_id.py +++ b/frontend/coprs_frontend/alembic/schema/versions/e183e12563ee_add_index_to_module_id.py @@ -11,7 +11,6 @@ revision = 'e183e12563ee' down_revision = '1f94b22f70a1' from alembic import op -import sqlalchemy as sa def upgrade(): diff --git a/frontend/coprs_frontend/alembic/schema/versions/f61a5c930abf_unique_constraint_on_modules.py b/frontend/coprs_frontend/alembic/schema/versions/f61a5c930abf_unique_constraint_on_modules.py index 4db06a3..5e4c322 100644 --- a/frontend/coprs_frontend/alembic/schema/versions/f61a5c930abf_unique_constraint_on_modules.py +++ b/frontend/coprs_frontend/alembic/schema/versions/f61a5c930abf_unique_constraint_on_modules.py @@ -11,7 +11,6 @@ revision = 'f61a5c930abf' down_revision = '3b0851cb25fc' from alembic import op -import sqlalchemy as sa def upgrade(): diff --git a/frontend/coprs_frontend/alembic/schema/versions/fdec9947f8a1_add_web_hook_source_type_index.py b/frontend/coprs_frontend/alembic/schema/versions/fdec9947f8a1_add_web_hook_source_type_index.py index 7e50b7e..35b40bd 100644 --- a/frontend/coprs_frontend/alembic/schema/versions/fdec9947f8a1_add_web_hook_source_type_index.py +++ b/frontend/coprs_frontend/alembic/schema/versions/fdec9947f8a1_add_web_hook_source_type_index.py @@ -11,7 +11,6 @@ revision = 'fdec9947f8a1' down_revision = '669ba46bf357' from alembic import op -import sqlalchemy as sa def upgrade(): diff --git a/frontend/coprs_frontend/coprs/forms.py b/frontend/coprs_frontend/coprs/forms.py index e04af5b..bdae1ca 100644 --- a/frontend/coprs_frontend/coprs/forms.py +++ b/frontend/coprs_frontend/coprs/forms.py @@ -5,22 +5,18 @@ import flask import wtforms import json -from flask_wtf.file import FileAllowed, FileRequired, FileField +from flask_wtf.file import FileRequired, FileField try: # get rid of deprecation warning with newer flask_wtf from flask_wtf import FlaskForm except ImportError: from flask_wtf import Form as FlaskForm -from jinja2 import Markup - from coprs import constants from coprs import helpers from coprs import models from coprs.logic.coprs_logic import CoprsLogic from coprs.logic.users_logic import UsersLogic -from coprs.logic.modules_logic import ModulesLogic -from coprs.models import Package from coprs import exceptions diff --git a/frontend/coprs_frontend/coprs/helpers.py b/frontend/coprs_frontend/coprs/helpers.py index 54b1e4f..ae78814 100644 --- a/frontend/coprs_frontend/coprs/helpers.py +++ b/frontend/coprs_frontend/coprs/helpers.py @@ -3,8 +3,7 @@ import random import string from six import with_metaclass -from six.moves.urllib.parse import urljoin, urlparse, parse_qs -from textwrap import dedent +from six.moves.urllib.parse import urlparse, parse_qs import re import flask @@ -353,38 +352,6 @@ def get_redis_connection(): return StrictRedis() -def dt_to_unixtime(dt): - """ - Converts datetime to unixtime - :param dt: DateTime instance - :rtype: float - """ - return float(dt.strftime('%s')) - - -def string_dt_to_unixtime(dt_string): - """ - Converts datetime to unixtime from string - :param dt_string: datetime string - :rtype: str - """ - return dt_to_unixtime(dt_parser.parse(dt_string)) - - -def is_ip_from_builder_net(ip): - """ - Checks is ip is owned by the builders network - :param str ip: IPv4 address - :return bool: True - """ - ip_addr = IPAddress(ip) - for subnet in app.config.get("BUILDER_IPS", ["127.0.0.1/24"]): - if ip_addr in IPNetwork(subnet): - return True - - return False - - def str2bool(v): if v is None: return False @@ -457,7 +424,14 @@ class LiteralDialect(DefaultDialect): def literal_query(statement): - """NOTE: This is entirely insecure. DO NOT execute the resulting strings.""" + """NOTE: This is entirely insecure. DO NOT execute the resulting strings. + This can be used for debuggin - it is not and should not be used in production + code. + + It is useful if you want to debug an sqlalchemy query, i.e. copy the + resulting SQL query into psql console and try to tweak it so that it + actually works or works faster. + """ import sqlalchemy.orm if isinstance(statement, sqlalchemy.orm.Query): statement = statement.statement diff --git a/frontend/coprs_frontend/coprs/logic/actions_logic.py b/frontend/coprs_frontend/coprs/logic/actions_logic.py index 3bf3493..1cebde7 100644 --- a/frontend/coprs_frontend/coprs/logic/actions_logic.py +++ b/frontend/coprs_frontend/coprs/logic/actions_logic.py @@ -1,14 +1,10 @@ import json import time -import base64 -import os from copr_common.enums import ActionTypeEnum, BackendResultEnum from coprs import db from coprs import models from coprs import helpers -from coprs import exceptions -from flask import url_for class ActionsLogic(object): diff --git a/frontend/coprs_frontend/coprs/logic/backend_logic.py b/frontend/coprs_frontend/coprs/logic/backend_logic.py index 972cd26..800b994 100644 --- a/frontend/coprs_frontend/coprs/logic/backend_logic.py +++ b/frontend/coprs_frontend/coprs/logic/backend_logic.py @@ -1,17 +1,6 @@ # coding: utf-8 -import json -from sqlalchemy import or_ -from sqlalchemy import and_ -from sqlalchemy.sql import false - from coprs import app -from coprs import db -from coprs import exceptions -from coprs import models -from coprs import helpers - -from coprs.logic.coprs_logic import MockChrootsLogic log = app.logger diff --git a/frontend/coprs_frontend/coprs/logic/builds_logic.py b/frontend/coprs_frontend/coprs/logic/builds_logic.py index 3a01d89..e8eab77 100644 --- a/frontend/coprs_frontend/coprs/logic/builds_logic.py +++ b/frontend/coprs_frontend/coprs/logic/builds_logic.py @@ -4,35 +4,29 @@ import json import os import pprint import time -import flask -import sqlite3 import requests -from flask import request from sqlalchemy.sql import text from sqlalchemy import or_ from sqlalchemy import and_ from sqlalchemy import func -from sqlalchemy.orm import joinedload -from sqlalchemy.orm.exc import NoResultFound from sqlalchemy.sql import false,true from werkzeug.utils import secure_filename -from sqlalchemy import desc, asc, bindparam, Integer, String -from collections import defaultdict +from sqlalchemy import bindparam, Integer, String from copr_common.enums import FailTypeEnum, StatusEnum from coprs import app from coprs import db -from coprs import exceptions from coprs import models from coprs import helpers from coprs.constants import DEFAULT_BUILD_TIMEOUT, MAX_BUILD_TIMEOUT -from coprs.exceptions import MalformedArgumentException, ActionInProgressException, InsufficientRightsException, UnrepeatableBuildException +from coprs.exceptions import MalformedArgumentException, ActionInProgressException, InsufficientRightsException, \ + UnrepeatableBuildException, RequestCannotBeExecuted from coprs.logic import coprs_logic from coprs.logic import users_logic from coprs.logic.actions_logic import ActionsLogic -from coprs.models import BuildChroot,Build,Package,MockChroot +from coprs.models import BuildChroot from .coprs_logic import MockChrootsLogic log = app.logger @@ -656,7 +650,7 @@ GROUP BY # todo: eliminate pkgs and this check if pkgs and (" " in pkgs or "\n" in pkgs or "\t" in pkgs or pkgs.strip() != pkgs): - raise exceptions.MalformedArgumentException("Trying to create a build using src_pkg " + raise MalformedArgumentException("Trying to create a build using src_pkg " "with bad characters. Forgot to split?") # just temporary to keep compatibility @@ -937,7 +931,7 @@ GROUP BY @classmethod def cancel_build(cls, user, build): if not user.can_build_in(build.copr): - raise exceptions.InsufficientRightsException( + raise InsufficientRightsException( "You are not allowed to cancel this build.") if not build.cancelable: if build.status == StatusEnum("starting"): @@ -945,7 +939,7 @@ GROUP BY err_msg = "Cannot cancel build {} in state 'starting'".format(build.id) else: err_msg = "Cannot cancel build {}".format(build.id) - raise exceptions.RequestCannotBeExecuted(err_msg) + raise RequestCannotBeExecuted(err_msg) if build.status == StatusEnum("running"): # otherwise the build is just in frontend ActionsLogic.send_cancel_build(build) @@ -965,11 +959,11 @@ GROUP BY :type build: models.Build """ if not user.can_edit(build.copr) or build.persistent: - raise exceptions.InsufficientRightsException( + raise InsufficientRightsException( "You are not allowed to delete build `{}`.".format(build.id)) if not build.finished: - raise exceptions.ActionInProgressException( + raise ActionInProgressException( "You can not delete build `{}` which is not finished.".format(build.id), "Unfinished build") diff --git a/frontend/coprs_frontend/coprs/logic/complex_logic.py b/frontend/coprs_frontend/coprs/logic/complex_logic.py index 3e568dc..68ba0ca 100644 --- a/frontend/coprs_frontend/coprs/logic/complex_logic.py +++ b/frontend/coprs_frontend/coprs/logic/complex_logic.py @@ -3,8 +3,6 @@ import time import flask import sqlalchemy -import os -import re from .. import db from .builds_logic import BuildsLogic @@ -18,7 +16,6 @@ from coprs.logic.actions_logic import ActionsLogic from coprs.logic.users_logic import UsersLogic from coprs.models import User, Copr from .coprs_logic import CoprsLogic, CoprDirsLogic, CoprChrootsLogic -from .. import helpers class ComplexLogic(object): diff --git a/frontend/coprs_frontend/coprs/logic/modules_logic.py b/frontend/coprs_frontend/coprs/logic/modules_logic.py index 5769d00..3be1fe6 100644 --- a/frontend/coprs_frontend/coprs/logic/modules_logic.py +++ b/frontend/coprs_frontend/coprs/logic/modules_logic.py @@ -1,7 +1,6 @@ import os import time import base64 -import json import requests from collections import defaultdict from sqlalchemy import and_ diff --git a/frontend/coprs_frontend/coprs/logic/packages_logic.py b/frontend/coprs_frontend/coprs/logic/packages_logic.py index 139f10c..3b922fc 100644 --- a/frontend/coprs_frontend/coprs/logic/packages_logic.py +++ b/frontend/coprs_frontend/coprs/logic/packages_logic.py @@ -1,24 +1,18 @@ import json -import time import re -from sqlalchemy import or_ -from sqlalchemy import and_, bindparam, Integer -from sqlalchemy.sql import false, true, text +from sqlalchemy import bindparam, Integer +from sqlalchemy.sql import true, text from coprs import app from coprs import db from coprs import exceptions from coprs import models from coprs import helpers -from coprs import forms -from coprs.logic import coprs_logic from coprs.logic import users_logic from coprs.logic import builds_logic -from coprs.constants import DEFAULT_BUILD_TIMEOUT - log = app.logger diff --git a/frontend/coprs_frontend/coprs/logic/stat_logic.py b/frontend/coprs_frontend/coprs/logic/stat_logic.py index 74512fb..3438cdc 100644 --- a/frontend/coprs_frontend/coprs/logic/stat_logic.py +++ b/frontend/coprs_frontend/coprs/logic/stat_logic.py @@ -1,6 +1,3 @@ -import time -import json - from collections import defaultdict from sqlalchemy.orm.exc import NoResultFound @@ -10,8 +7,7 @@ from coprs import db from coprs.models import CounterStat from coprs import helpers from coprs.helpers import REPO_DL_STAT_FMT, CHROOT_REPO_MD_DL_STAT_FMT, \ - CHROOT_RPMS_DL_STAT_FMT, PROJECT_RPMS_DL_STAT_FMT, is_ip_from_builder_net -from coprs.helpers import CounterStatType + CHROOT_RPMS_DL_STAT_FMT, PROJECT_RPMS_DL_STAT_FMT from coprs.rmodels import TimedStatEvents diff --git a/frontend/coprs_frontend/coprs/models.py b/frontend/coprs_frontend/coprs/models.py index bea4992..288061c 100644 --- a/frontend/coprs_frontend/coprs/models.py +++ b/frontend/coprs_frontend/coprs/models.py @@ -1,7 +1,6 @@ import copy import datetime import os -import flask import json import base64 import uuid @@ -19,7 +18,7 @@ from coprs import app import itertools import operator -from coprs.helpers import BuildSourceEnum, JSONEncodedDict +from coprs.helpers import JSONEncodedDict import gi gi.require_version('Modulemd', '1.0') diff --git a/frontend/coprs_frontend/coprs/rest_api/common.py b/frontend/coprs_frontend/coprs/rest_api/common.py index d1a9ad4..352a1ac 100644 --- a/frontend/coprs_frontend/coprs/rest_api/common.py +++ b/frontend/coprs_frontend/coprs/rest_api/common.py @@ -7,14 +7,13 @@ from logging import getLogger from flask import url_for import flask -from ..models import User, Copr, BuildChroot, Build from ..logic.users_logic import UsersLogic from ..logic.builds_logic import BuildsLogic from ..logic.coprs_logic import CoprsLogic from ..rest_api.schemas import BuildTaskSchema from ..rest_api.util import mm_serialize_one, get_one_safe -from .exceptions import AuthFailed, ObjectNotFoundError +from .exceptions import AuthFailed from .schemas import CoprChrootSchema, BuildSchema, ProjectSchema from .util import mm_serialize_one from coprs import app diff --git a/frontend/coprs_frontend/coprs/rest_api/resources/build_task.py b/frontend/coprs_frontend/coprs/rest_api/resources/build_task.py index 0931c62..74dbd48 100644 --- a/frontend/coprs_frontend/coprs/rest_api/resources/build_task.py +++ b/frontend/coprs_frontend/coprs/rest_api/resources/build_task.py @@ -2,17 +2,11 @@ from flask import url_for from flask_restful import Resource -from flask_restful import Resource, reqparse -from flask_restful.reqparse import Argument - -from marshmallow import pprint -from marshmallow import Schema, fields -from marshmallow import Schema, fields, validates_schema, ValidationError, validate from copr_common.enums import StatusEnum from coprs.rest_api.common import render_build_task from ...exceptions import MalformedArgumentException -from ...logic.builds_logic import BuildsLogic, BuildChrootsLogic +from ...logic.builds_logic import BuildChrootsLogic from ..exceptions import MalformedRequest from ..util import get_one_safe, get_request_parser diff --git a/frontend/coprs_frontend/coprs/rest_api/util.py b/frontend/coprs_frontend/coprs/rest_api/util.py index ef5a3e7..2aa4e4c 100644 --- a/frontend/coprs_frontend/coprs/rest_api/util.py +++ b/frontend/coprs_frontend/coprs/rest_api/util.py @@ -1,7 +1,6 @@ # coding: utf-8 import json -from flask import Response, url_for, Blueprint import sqlalchemy.orm.exc from flask_restful.reqparse import Argument, RequestParser diff --git a/frontend/coprs_frontend/coprs/rmodels.py b/frontend/coprs_frontend/coprs/rmodels.py index 3527773..45e1f8c 100644 --- a/frontend/coprs_frontend/coprs/rmodels.py +++ b/frontend/coprs_frontend/coprs/rmodels.py @@ -3,8 +3,7 @@ """ Models to redis entities """ import time from math import ceil -from datetime import datetime, timedelta -from redis import StrictRedis +from datetime import timedelta class GenericRedisModel(object): diff --git a/frontend/coprs_frontend/coprs/views/admin_ns/admin_general.py b/frontend/coprs_frontend/coprs/views/admin_ns/admin_general.py index 37e2052..044f6bb 100644 --- a/frontend/coprs_frontend/coprs/views/admin_ns/admin_general.py +++ b/frontend/coprs_frontend/coprs/views/admin_ns/admin_general.py @@ -5,7 +5,6 @@ import flask from copr_common.enums import RoleEnum from coprs import db -from coprs import helpers from coprs import models from coprs import forms diff --git a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py index 6ce5c13..024d10c 100755 --- a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py +++ b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py @@ -5,7 +5,6 @@ import os import flask import sqlalchemy import json -import requests from requests.exceptions import RequestException, InvalidSchema from wtforms import ValidationError @@ -21,9 +20,8 @@ from coprs.helpers import fix_protocol_for_backend, generate_build_config from coprs.logic.api_logic import MonitorWrapper from coprs.logic.builds_logic import BuildsLogic from coprs.logic.complex_logic import ComplexLogic -from coprs.logic.users_logic import UsersLogic from coprs.logic.packages_logic import PackagesLogic -from coprs.logic.modules_logic import ModulesLogic, ModuleProvider, ModuleBuildFacade +from coprs.logic.modules_logic import ModuleProvider, ModuleBuildFacade from coprs.views.misc import login_required, api_login_required @@ -32,7 +30,6 @@ from coprs.views.api_ns import api_ns from coprs.logic import builds_logic from coprs.logic import coprs_logic from coprs.logic.coprs_logic import CoprsLogic -from coprs.logic.actions_logic import ActionsLogic from coprs.exceptions import (ActionInProgressException, InsufficientRightsException, diff --git a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_build_chroots.py b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_build_chroots.py index 54ce436..5884974 100644 --- a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_build_chroots.py +++ b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_build_chroots.py @@ -2,8 +2,8 @@ import flask from . import query_params, pagination, Paginator, GET from coprs.views.apiv3_ns import apiv3_ns from coprs.helpers import generate_build_config, generate_additional_repos -from coprs import db, models, forms -from coprs.logic.builds_logic import BuildChrootsLogic, BuildsLogic +from coprs import models +from coprs.logic.builds_logic import BuildChrootsLogic from coprs.logic.coprs_logic import CoprChrootsLogic diff --git a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_builds.py b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_builds.py index df2dada..ecbbb71 100644 --- a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_builds.py +++ b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_builds.py @@ -2,12 +2,11 @@ import os import flask from werkzeug.datastructures import MultiDict from . import get_copr, file_upload, query_params, pagination, Paginator, json2form, GET, POST, PUT, DELETE -from .json2form import get_form_compatible_data, without_empty_fields +from .json2form import get_form_compatible_data from werkzeug import secure_filename from copr_common.enums import StatusEnum from coprs import db, forms, models -from coprs.exceptions import (ApiError, InsufficientRightsException, ActionInProgressException, - BadRequest, AccessRestricted) +from coprs.exceptions import (BadRequest, AccessRestricted) from coprs.views.misc import api_login_required from coprs.views.apiv3_ns import apiv3_ns from coprs.logic.complex_logic import ComplexLogic diff --git a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_modules.py b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_modules.py index b4b42db..1e94052 100644 --- a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_modules.py +++ b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_modules.py @@ -2,11 +2,11 @@ import flask import sqlalchemy from requests.exceptions import RequestException, InvalidSchema from wtforms import ValidationError -from . import query_params, get_copr, file_upload, POST -from coprs import db, models, forms +from . import get_copr, file_upload, POST +from coprs import db, forms from coprs.views.apiv3_ns import apiv3_ns from coprs.views.misc import api_login_required -from coprs.exceptions import ApiError, DuplicateException, BadRequest +from coprs.exceptions import DuplicateException, BadRequest from coprs.logic.modules_logic import ModuleProvider, ModuleBuildFacade diff --git a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_packages.py b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_packages.py index bf43054..c2d0c26 100644 --- a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_packages.py +++ b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_packages.py @@ -1,10 +1,7 @@ import flask -import wtforms from . import query_params, pagination, get_copr, Paginator, GET, POST, PUT, DELETE from .json2form import get_form_compatible_data, get_input -from coprs.exceptions import ApiError -from coprs.exceptions import (ApiError, InsufficientRightsException, ActionInProgressException, - NoPackageSourceException, ObjectNotFound, BadRequest) +from coprs.exceptions import (ObjectNotFound, BadRequest) from coprs.views.misc import api_login_required from coprs import db, models, forms from coprs.views.apiv3_ns import apiv3_ns diff --git a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_project_chroots.py b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_project_chroots.py index 439fb8b..7dfab4c 100644 --- a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_project_chroots.py +++ b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_project_chroots.py @@ -1,12 +1,12 @@ import flask -from . import query_params, get_copr, file_upload, GET, POST, PUT, DELETE +from . import query_params, get_copr, file_upload, GET, PUT from .json2form import get_form_compatible_data -from coprs.helpers import generate_build_config, generate_additional_repos +from coprs.helpers import generate_additional_repos from coprs.views.misc import api_login_required from coprs.views.apiv3_ns import apiv3_ns from coprs.logic.complex_logic import ComplexLogic -from coprs.exceptions import ApiError, ObjectNotFound, BadRequest -from coprs import db, models, forms +from coprs.exceptions import ObjectNotFound, BadRequest +from coprs import db, forms from coprs.logic.coprs_logic import CoprChrootsLogic diff --git a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_projects.py b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_projects.py index 22ff355..1e38e1d 100644 --- a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_projects.py +++ b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_projects.py @@ -1,4 +1,3 @@ -import os import flask from . import query_params, get_copr, pagination, Paginator, GET, POST, PUT, DELETE from .json2form import get_form_compatible_data, get_input_dict @@ -6,9 +5,8 @@ from coprs import db, models, forms from coprs.views.misc import api_login_required from coprs.views.apiv3_ns import apiv3_ns from coprs.logic.coprs_logic import CoprsLogic, CoprChrootsLogic, MockChrootsLogic -from coprs.logic.builds_logic import BuildsLogic from coprs.logic.complex_logic import ComplexLogic -from coprs.exceptions import (ApiError, DuplicateException, NonAdminCannotCreatePersistentProject, +from coprs.exceptions import (DuplicateException, NonAdminCannotCreatePersistentProject, NonAdminCannotDisableAutoPrunning, ActionInProgressException, InsufficientRightsException, BadRequest, ObjectNotFound) diff --git a/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py b/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py index ede5049..d926a1c 100644 --- a/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py +++ b/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py @@ -1,5 +1,4 @@ import flask -import time import sqlalchemy from copr_common.enums import StatusEnum @@ -8,9 +7,8 @@ from coprs import helpers from coprs import models from coprs import exceptions from coprs.logic import actions_logic -from coprs.logic.builds_logic import BuildsLogic, BuildChrootsLogic +from coprs.logic.builds_logic import BuildsLogic from coprs.logic.complex_logic import ComplexLogic -from coprs.logic.coprs_logic import CoprChrootsLogic from coprs.logic.packages_logic import PackagesLogic from coprs.views import misc @@ -18,7 +16,6 @@ from coprs.views.backend_ns import backend_ns from sqlalchemy.sql import false, true import json -import urllib import logging log = logging.getLogger(__name__) diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py index 8cda42a..b12fb2f 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py @@ -1,12 +1,5 @@ import flask -from flask import request, render_template, url_for, stream_with_context -import re -import os -import shutil -import tempfile - -from functools import wraps -from werkzeug import secure_filename +from flask import request, render_template, stream_with_context from copr_common.enums import StatusEnum from coprs import app @@ -15,11 +8,10 @@ from coprs import forms from coprs import helpers from coprs.logic import builds_logic -from coprs.logic import coprs_logic from coprs.logic.builds_logic import BuildsLogic from coprs.logic.complex_logic import ComplexLogic -from coprs.views.misc import (login_required, page_not_found, req_with_copr, +from coprs.views.misc import (login_required, req_with_copr, req_with_copr, send_build_icon) from coprs.views.coprs_ns import coprs_ns diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_chroots.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_chroots.py index 1929233..dcac554 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_chroots.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_chroots.py @@ -1,8 +1,5 @@ -from io import BytesIO -from zlib import compress, decompress - import flask -from flask import Response, url_for, render_template +from flask import Response, render_template from coprs import db from coprs import forms @@ -13,7 +10,7 @@ from coprs.logic.complex_logic import ComplexLogic from coprs.logic.coprs_logic import CoprChrootsLogic from coprs.views.coprs_ns.coprs_general import url_for_copr_edit -from coprs.views.misc import login_required, page_not_found, req_with_copr, req_with_copr +from coprs.views.misc import login_required, req_with_copr, req_with_copr from coprs.views.coprs_ns import coprs_ns diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py index 41c3f6a..33c8c17 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py @@ -3,7 +3,6 @@ import os import time import fnmatch -import uuid import subprocess import json @@ -11,11 +10,7 @@ from six.moves.urllib.parse import urljoin import flask from flask import render_template, url_for, stream_with_context -import platform -import smtplib -import tempfile import sqlalchemy -from email.mime.text import MIMEText from itertools import groupby from wtforms import ValidationError @@ -33,7 +28,6 @@ from coprs import helpers from coprs import models from coprs.exceptions import ObjectNotFound from coprs.logic.coprs_logic import CoprsLogic -from coprs.logic.packages_logic import PackagesLogic from coprs.logic.stat_logic import CounterStatLogic from coprs.logic.modules_logic import ModulesLogic, ModulemdGenerator, ModuleBuildFacade from coprs.rmodels import TimedStatEvents @@ -44,11 +38,10 @@ from coprs.logic.complex_logic import ComplexLogic from coprs.views.misc import login_required, page_not_found, req_with_copr, req_with_copr, generic_error from coprs.views.coprs_ns import coprs_ns -from coprs.views.groups_ns import groups_ns from coprs.logic import builds_logic, coprs_logic, actions_logic, users_logic -from coprs.helpers import parse_package_name, generate_repo_url, CHROOT_RPMS_DL_STAT_FMT, CHROOT_REPO_MD_DL_STAT_FMT, \ - str2bool, url_for_copr_view, REPO_DL_STAT_FMT, CounterStatType +from coprs.helpers import generate_repo_url, CHROOT_RPMS_DL_STAT_FMT, \ + url_for_copr_view, REPO_DL_STAT_FMT, CounterStatType def url_for_copr_details(copr): return url_for_copr_view( @@ -297,11 +290,6 @@ def render_copr_detail(copr): form = forms.CoprLegalFlagForm() repos_info = {} for chroot in copr.active_chroots: - # chroot_rpms_dl_stat_key = CHROOT_REPO_MD_DL_STAT_FMT.format( - # copr_user=copr.user.name, - # copr_project_name=copr.name, - # copr_chroot=chroot.name, - # ) chroot_rpms_dl_stat_key = CHROOT_RPMS_DL_STAT_FMT.format( copr_user=copr.owner_name, copr_project_name=copr.name, diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_packages.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_packages.py index e868e57..80fa8bc 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_packages.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_packages.py @@ -1,7 +1,6 @@ import flask -import json -from flask import Response, stream_with_context, url_for +from flask import stream_with_context from flask import send_file from coprs import app from coprs import db @@ -9,12 +8,12 @@ from coprs import forms from coprs import helpers from coprs.views.coprs_ns import coprs_ns from coprs.views.coprs_ns.coprs_builds import render_add_build_scm, render_add_build_pypi, render_add_build_custom -from coprs.views.misc import login_required, page_not_found, req_with_copr, req_with_copr, send_build_icon +from coprs.views.misc import login_required, req_with_copr, req_with_copr, send_build_icon from coprs.logic.complex_logic import ComplexLogic from coprs.logic.packages_logic import PackagesLogic from coprs.logic.users_logic import UsersLogic -from coprs.exceptions import (ActionInProgressException,ObjectNotFound, NoPackageSourceException, - InsufficientRightsException,UnknownSourceTypeException,MalformedArgumentException) +from coprs.exceptions import (ActionInProgressException, ObjectNotFound, NoPackageSourceException, + InsufficientRightsException, MalformedArgumentException) @coprs_ns.route("///packages/") diff --git a/frontend/coprs_frontend/coprs/views/webhooks_ns/webhooks_general.py b/frontend/coprs_frontend/coprs/views/webhooks_ns/webhooks_general.py index 652e926..bc41db5 100644 --- a/frontend/coprs_frontend/coprs/views/webhooks_ns/webhooks_general.py +++ b/frontend/coprs_frontend/coprs/views/webhooks_ns/webhooks_general.py @@ -2,14 +2,12 @@ import flask from functools import wraps from coprs import db, app -from coprs import helpers from coprs.logic.builds_logic import BuildsLogic from coprs.logic.complex_logic import ComplexLogic -from coprs.logic.coprs_logic import CoprsLogic from coprs.logic.packages_logic import PackagesLogic -from coprs.exceptions import ObjectNotFound, AccessRestricted +from coprs.exceptions import ObjectNotFound from coprs.views.webhooks_ns import webhooks_ns from coprs.views.misc import page_not_found, access_restricted @@ -17,7 +15,6 @@ from coprs.views.misc import page_not_found, access_restricted import logging import os import tempfile -import re import shutil log = logging.getLogger(__name__) diff --git a/frontend/coprs_frontend/manage.py b/frontend/coprs_frontend/manage.py index 6b9204f..972b533 100755 --- a/frontend/coprs_frontend/manage.py +++ b/frontend/coprs_frontend/manage.py @@ -3,7 +3,6 @@ import argparse import os import subprocess -import datetime import sqlalchemy import time diff --git a/frontend/coprs_frontend/run/check_for_anitya_version_updates.py b/frontend/coprs_frontend/run/check_for_anitya_version_updates.py index 40424a4..d7d4206 100755 --- a/frontend/coprs_frontend/run/check_for_anitya_version_updates.py +++ b/frontend/coprs_frontend/run/check_for_anitya_version_updates.py @@ -5,17 +5,14 @@ import argparse import sys import os import json -import time import re import logging -from flask_sqlalchemy import SQLAlchemy -from sqlalchemy.sql import text sys.path.append( os.path.dirname(os.path.dirname(os.path.realpath(__file__))) ) -from coprs import db, app, helpers, models +from coprs import db, app, helpers from coprs.logic.builds_logic import BuildsLogic from coprs.logic.coprs_logic import CoprsLogic diff --git a/frontend/coprs_frontend/run/pagure-events.py b/frontend/coprs_frontend/run/pagure-events.py index 3fed0e3..609674d 100755 --- a/frontend/coprs_frontend/run/pagure-events.py +++ b/frontend/coprs_frontend/run/pagure-events.py @@ -14,8 +14,8 @@ sys.path.append( os.path.dirname(os.path.dirname(os.path.realpath(__file__))) ) -from coprs import db, app, models -from coprs.logic.coprs_logic import CoprsLogic, CoprDirsLogic +from coprs import db, app +from coprs.logic.coprs_logic import CoprDirsLogic from coprs.logic.builds_logic import BuildsLogic from coprs.logic.complex_logic import ComplexLogic from coprs.logic.packages_logic import PackagesLogic diff --git a/frontend/coprs_frontend/tests/coprs_test_case.py b/frontend/coprs_frontend/tests/coprs_test_case.py index 7ac81b3..469dea8 100644 --- a/frontend/coprs_frontend/tests/coprs_test_case.py +++ b/frontend/coprs_frontend/tests/coprs_test_case.py @@ -1,16 +1,13 @@ import base64 -from collections import defaultdict import json import os import time -import glob from functools import wraps import datetime import uuid import pytest import decorator -import shutil import coprs @@ -20,7 +17,6 @@ from coprs import models from coprs.logic.coprs_logic import BranchesLogic from unittest import mock -from unittest.mock import MagicMock class CoprsTestCase(object): diff --git a/frontend/coprs_frontend/tests/test_api/test_build_r.py b/frontend/coprs_frontend/tests/test_api/test_build_r.py index 178b976..a9ca9d0 100644 --- a/frontend/coprs_frontend/tests/test_api/test_build_r.py +++ b/frontend/coprs_frontend/tests/test_api/test_build_r.py @@ -3,12 +3,9 @@ from io import BytesIO import json import math import random -from marshmallow import pprint from copr_common.enums import StatusEnum -from coprs.helpers import BuildSourceEnum from coprs.logic.actions_logic import ActionsLogic -from coprs.logic.coprs_logic import CoprsLogic from coprs.logic.builds_logic import BuildsLogic from tests.coprs_test_case import CoprsTestCase diff --git a/frontend/coprs_frontend/tests/test_api/test_build_task_r.py b/frontend/coprs_frontend/tests/test_api/test_build_task_r.py index 68fd667..f8cf390 100644 --- a/frontend/coprs_frontend/tests/test_api/test_build_task_r.py +++ b/frontend/coprs_frontend/tests/test_api/test_build_task_r.py @@ -2,17 +2,11 @@ import copy import json -from marshmallow import pprint from six.moves.urllib.parse import urlparse, parse_qs -import pytest -import sqlalchemy - from copr_common.enums import StatusEnum -from coprs.logic.users_logic import UsersLogic -from coprs.logic.coprs_logic import CoprsLogic -from tests.coprs_test_case import CoprsTestCase, TransactionDecorator +from tests.coprs_test_case import CoprsTestCase class TestBuildTaskResource(CoprsTestCase): diff --git a/frontend/coprs_frontend/tests/test_api/test_mock_chroot_r.py b/frontend/coprs_frontend/tests/test_api/test_mock_chroot_r.py index 16d6c3f..0efc137 100644 --- a/frontend/coprs_frontend/tests/test_api/test_mock_chroot_r.py +++ b/frontend/coprs_frontend/tests/test_api/test_mock_chroot_r.py @@ -1,15 +1,8 @@ # coding: utf-8 import json -from marshmallow import pprint -import pytest -import sqlalchemy - -from coprs.logic.users_logic import UsersLogic -from coprs.logic.coprs_logic import CoprsLogic - -from tests.coprs_test_case import CoprsTestCase, TransactionDecorator +from tests.coprs_test_case import CoprsTestCase class TestMockChrootResource(CoprsTestCase): diff --git a/frontend/coprs_frontend/tests/test_api/test_project_chroot_r.py b/frontend/coprs_frontend/tests/test_api/test_project_chroot_r.py index f18db77..682d5fa 100644 --- a/frontend/coprs_frontend/tests/test_api/test_project_chroot_r.py +++ b/frontend/coprs_frontend/tests/test_api/test_project_chroot_r.py @@ -1,16 +1,8 @@ # coding: utf-8 -import base64 -import copy import json -import pytest -import sqlalchemy - -from coprs.logic.users_logic import UsersLogic -from coprs.logic.coprs_logic import CoprsLogic - -from tests.coprs_test_case import CoprsTestCase, TransactionDecorator +from tests.coprs_test_case import CoprsTestCase class TestProjectChrootResource(CoprsTestCase): diff --git a/frontend/coprs_frontend/tests/test_api/test_project_r.py b/frontend/coprs_frontend/tests/test_api/test_project_r.py index 0b986d1..834a6d0 100644 --- a/frontend/coprs_frontend/tests/test_api/test_project_r.py +++ b/frontend/coprs_frontend/tests/test_api/test_project_r.py @@ -1,23 +1,18 @@ # coding: utf-8 -import base64 import copy import json -from marshmallow import pprint from flask_whooshee import Whooshee -import pytest -import sqlalchemy from coprs.logic.builds_logic import BuildsLogic from coprs.logic.actions_logic import ActionsLogic -from coprs.logic.users_logic import UsersLogic from coprs.logic.coprs_logic import CoprsLogic from coprs.models import Copr from coprs.whoosheers import CoprWhoosheer from coprs import app -from tests.coprs_test_case import CoprsTestCase, TransactionDecorator +from tests.coprs_test_case import CoprsTestCase class TestProjectResource(CoprsTestCase): diff --git a/frontend/coprs_frontend/tests/test_apiv3/test_builds.py b/frontend/coprs_frontend/tests/test_apiv3/test_builds.py index a19ccac..10c9490 100644 --- a/frontend/coprs_frontend/tests/test_apiv3/test_builds.py +++ b/frontend/coprs_frontend/tests/test_apiv3/test_builds.py @@ -1,4 +1,3 @@ -import json from tests.coprs_test_case import CoprsTestCase diff --git a/frontend/coprs_frontend/tests/test_helpers.py b/frontend/coprs_frontend/tests/test_helpers.py index 7727f9d..88b2d12 100644 --- a/frontend/coprs_frontend/tests/test_helpers.py +++ b/frontend/coprs_frontend/tests/test_helpers.py @@ -1,6 +1,6 @@ from copy import deepcopy from unittest import mock -from flask import Flask, current_app +from flask import Flask from coprs import app from coprs.helpers import parse_package_name, generate_repo_url, \ diff --git a/frontend/coprs_frontend/tests/test_logic/test_builds_logic.py b/frontend/coprs_frontend/tests/test_logic/test_builds_logic.py index 8928e73..31d8db4 100644 --- a/frontend/coprs_frontend/tests/test_logic/test_builds_logic.py +++ b/frontend/coprs_frontend/tests/test_logic/test_builds_logic.py @@ -3,17 +3,15 @@ import json import pytest import time -import os from sqlalchemy.orm.exc import NoResultFound -from coprs import helpers, models +from coprs import models from coprs.constants import MAX_BUILD_TIMEOUT from copr_common.enums import StatusEnum from coprs.exceptions import ActionInProgressException, InsufficientRightsException, MalformedArgumentException from coprs.logic.actions_logic import ActionsLogic from coprs.logic.builds_logic import BuildsLogic -from coprs.logic.builds_logic import BuildsMonitorLogic from tests.coprs_test_case import CoprsTestCase diff --git a/frontend/coprs_frontend/tests/test_logic/test_coprs_logic.py b/frontend/coprs_frontend/tests/test_logic/test_coprs_logic.py index e36c594..595ac7a 100644 --- a/frontend/coprs_frontend/tests/test_logic/test_coprs_logic.py +++ b/frontend/coprs_frontend/tests/test_logic/test_coprs_logic.py @@ -1,18 +1,14 @@ import json -import pytest -import subprocess from flask_whooshee import Whooshee from copr_common.enums import ActionTypeEnum from coprs import app -from coprs.exceptions import ActionInProgressException from coprs.logic.actions_logic import ActionsLogic from coprs.logic.coprs_logic import CoprsLogic from coprs import models from coprs.whoosheers import CoprWhoosheer -from coprs.logic.users_logic import UsersLogic from tests.coprs_test_case import CoprsTestCase diff --git a/frontend/coprs_frontend/tests/test_logic/test_modules_logic.py b/frontend/coprs_frontend/tests/test_logic/test_modules_logic.py index ad0fb10..4964060 100644 --- a/frontend/coprs_frontend/tests/test_logic/test_modules_logic.py +++ b/frontend/coprs_frontend/tests/test_logic/test_modules_logic.py @@ -1,5 +1,4 @@ import yaml -from munch import Munch from unittest import mock from tests.coprs_test_case import CoprsTestCase diff --git a/frontend/coprs_frontend/tests/test_logic/test_stat_logic.py b/frontend/coprs_frontend/tests/test_logic/test_stat_logic.py index 989508d..16d48fc 100644 --- a/frontend/coprs_frontend/tests/test_logic/test_stat_logic.py +++ b/frontend/coprs_frontend/tests/test_logic/test_stat_logic.py @@ -1,11 +1,8 @@ # coding: utf-8 import pytest -from coprs.exceptions import ActionInProgressException -from coprs.logic.coprs_logic import CoprsLogic from coprs.logic.stat_logic import CounterStatLogic from coprs.helpers import CounterStatType -from coprs import models from tests.coprs_test_case import CoprsTestCase diff --git a/frontend/coprs_frontend/tests/test_logic/test_users_logic.py b/frontend/coprs_frontend/tests/test_logic/test_users_logic.py index 4308714..cecdaa3 100644 --- a/frontend/coprs_frontend/tests/test_logic/test_users_logic.py +++ b/frontend/coprs_frontend/tests/test_logic/test_users_logic.py @@ -1,7 +1,6 @@ -import flask import json from coprs import app -from coprs.logic.users_logic import UsersLogic, UserDataDumper +from coprs.logic.users_logic import UserDataDumper from tests.coprs_test_case import CoprsTestCase diff --git a/frontend/coprs_frontend/tests/test_models.py b/frontend/coprs_frontend/tests/test_models.py index 32db961..f910b0f 100644 --- a/frontend/coprs_frontend/tests/test_models.py +++ b/frontend/coprs_frontend/tests/test_models.py @@ -1,6 +1,3 @@ -from copy import deepcopy -from unittest import mock - from tests.coprs_test_case import CoprsTestCase diff --git a/frontend/coprs_frontend/tests/test_rmodels.py b/frontend/coprs_frontend/tests/test_rmodels.py index 2052219..8f41e67 100644 --- a/frontend/coprs_frontend/tests/test_rmodels.py +++ b/frontend/coprs_frontend/tests/test_rmodels.py @@ -1,7 +1,6 @@ # coding: utf-8 import time -import pytest from redis import StrictRedis, ConnectionError diff --git a/frontend/coprs_frontend/tests/test_views/test_api_ns/test_api_general.py b/frontend/coprs_frontend/tests/test_views/test_api_ns/test_api_general.py index 2b0e436..0730597 100644 --- a/frontend/coprs_frontend/tests/test_views/test_api_ns/test_api_general.py +++ b/frontend/coprs_frontend/tests/test_views/test_api_ns/test_api_general.py @@ -4,13 +4,9 @@ import json import pytest import sqlalchemy -from coprs.logic.users_logic import UsersLogic from coprs.logic.coprs_logic import CoprsLogic from tests.coprs_test_case import CoprsTestCase, TransactionDecorator -import tempfile -import os - class TestCreateCopr(CoprsTestCase): copr_name = "copr_api_1" instructions = "1234" diff --git a/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py b/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py index 9970661..6dbe97f 100644 --- a/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py +++ b/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py @@ -1,5 +1,4 @@ import json -import os from copr_common.enums import StatusEnum from coprs import models diff --git a/frontend/coprs_frontend/tests/test_webhooks.py b/frontend/coprs_frontend/tests/test_webhooks.py index d7580f5..ea0c8c8 100644 --- a/frontend/coprs_frontend/tests/test_webhooks.py +++ b/frontend/coprs_frontend/tests/test_webhooks.py @@ -1,6 +1,5 @@ import os import json -import requests from tests.coprs_test_case import CoprsTestCase diff --git a/python/copr/client/client.py b/python/copr/client/client.py index 4f554a5..e6a2372 100644 --- a/python/copr/client/client.py +++ b/python/copr/client/client.py @@ -22,9 +22,9 @@ from requests_toolbelt.multipart.encoder import (MultipartEncoder, # urlparse from six is not available on el7 # because it requires at least python-six-1.4.1 if sys.version_info[0] == 2: - from urlparse import urlparse, urljoin + from urlparse import urlparse else: - from urllib.parse import urlparse, urljoin + from urllib.parse import urlparse if sys.version_info < (2, 7): class NullHandler(logging.Handler): @@ -41,7 +41,7 @@ from ..exceptions import CoprConfigException, CoprNoConfException, \ CoprUnknownResponseException from .responses import ProjectHandle, \ - CoprResponse, BuildHandle, BaseHandle, ProjectChrootHandle, PackageHandle + CoprResponse, BuildHandle, BaseHandle, ProjectChrootHandle from .parsers import fabric_simple_fields_parser, ProjectListParser, \ CommonMsgErrorOutParser, NewBuildListParser, ProjectChrootsParser, \ diff --git a/python/copr/client/responses.py b/python/copr/client/responses.py index dcfbf93..db23016 100644 --- a/python/copr/client/responses.py +++ b/python/copr/client/responses.py @@ -11,7 +11,6 @@ from __future__ import division from __future__ import absolute_import import weakref -import json # # TODO: Add Response for collections? diff --git a/python/copr/client_v2/handlers.py b/python/copr/client_v2/handlers.py index 3f90868..75f7f99 100644 --- a/python/copr/client_v2/handlers.py +++ b/python/copr/client_v2/handlers.py @@ -4,8 +4,7 @@ import json import os from copr.client_v2.net_client import RequestError, MultiPartTuple -from copr.client_v2.schemas import ProjectCreateSchema -from .entities import ProjectChrootEntity, ProjectEntity, ProjectCreateEntity +from .entities import ProjectChrootEntity, ProjectCreateEntity from .resources import Project, OperationResult, ProjectList, ProjectChroot, ProjectChrootList, Build, BuildList, \ MockChroot, MockChrootList, BuildTask, BuildTaskList diff --git a/python/copr/v3/proxies/project.py b/python/copr/v3/proxies/project.py index 6e2dc7a..0af9223 100644 --- a/python/copr/v3/proxies/project.py +++ b/python/copr/v3/proxies/project.py @@ -1,9 +1,7 @@ from __future__ import absolute_import -import os from . import BaseProxy -from ..requests import Request, munchify, FileRequest, POST -from ..exceptions import CoprValidationException +from ..requests import Request, munchify, POST class ProjectProxy(BaseProxy): diff --git a/rpmbuild/copr_rpmbuild/builders/mock.py b/rpmbuild/copr_rpmbuild/builders/mock.py index cce43da..3032db5 100644 --- a/rpmbuild/copr_rpmbuild/builders/mock.py +++ b/rpmbuild/copr_rpmbuild/builders/mock.py @@ -5,8 +5,7 @@ import shutil import subprocess from jinja2 import Environment, FileSystemLoader -from ..helpers import run_cmd, locate_spec, locate_srpm, CONF_DIRS, \ - get_mock_uniqueext, GentlyTimeoutedPopen +from ..helpers import locate_spec, locate_srpm, CONF_DIRS, get_mock_uniqueext log = logging.getLogger("__main__") diff --git a/rpmbuild/copr_rpmbuild/helpers.py b/rpmbuild/copr_rpmbuild/helpers.py index 576f24a..e01119b 100644 --- a/rpmbuild/copr_rpmbuild/helpers.py +++ b/rpmbuild/copr_rpmbuild/helpers.py @@ -6,10 +6,7 @@ import glob import os import sys import re -import shutil -import fileinput import configparser -import pprint import datetime import pipes from threading import Timer diff --git a/rpmbuild/copr_rpmbuild/providers/custom.py b/rpmbuild/copr_rpmbuild/providers/custom.py index ea72e4d..fccac62 100644 --- a/rpmbuild/copr_rpmbuild/providers/custom.py +++ b/rpmbuild/copr_rpmbuild/providers/custom.py @@ -1,10 +1,6 @@ import os -import json import logging import shutil -import tempfile -import subprocess -import glob import requests from copr_rpmbuild import helpers diff --git a/rpmbuild/copr_rpmbuild/providers/scm.py b/rpmbuild/copr_rpmbuild/providers/scm.py index 04f8b7d..432485d 100644 --- a/rpmbuild/copr_rpmbuild/providers/scm.py +++ b/rpmbuild/copr_rpmbuild/providers/scm.py @@ -1,16 +1,12 @@ import os import re import logging -import munch -import shutil -import tarfile import re -import tempfile from copr_rpmbuild import helpers from jinja2 import Environment, FileSystemLoader -from ..helpers import run_cmd, SourceType, CONF_DIRS, get_mock_uniqueext +from ..helpers import run_cmd, CONF_DIRS, get_mock_uniqueext from .base import Provider try: