Rearrange the imports to meet the style guide

This also includes `from __future__ import absolute_import`
in every file so that the imports are consistent in Python 2 and 3.
The Python 2 tests fail without this.
This commit is contained in:
mprahl
2020-01-06 11:19:47 -05:00
parent 0c8227679c
commit 81f2bffdda
95 changed files with 411 additions and 279 deletions

View File

@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
import os.path
from module_build_service import conf

View File

@@ -1,5 +1,7 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
import mock
from module_build_service.common.koji import get_session

View File

@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
import os
from os import path
import shutil
@@ -7,9 +8,9 @@ import tempfile
from module_build_service import log
from module_build_service.common import models
from module_build_service.scheduler.db_session import db_session
from module_build_service.common.logger import ModuleBuildLogs
from module_build_service.scheduler.consumer import MBSConsumer
from module_build_service.scheduler.db_session import db_session
from tests import init_data

View File

@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
from module_build_service.common import messaging
from module_build_service.scheduler.parser import FedmsgMessageParser

View File

@@ -1,14 +1,21 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
import pytest
from __future__ import absolute_import
from mock import patch
import pytest
from module_build_service import conf
from module_build_service.common.models import ComponentBuild, ComponentBuildTrace, ModuleBuild
from module_build_service.common.utils import load_mmd, mmd_to_str
from module_build_service.scheduler.db_session import db_session
from tests import init_data as init_data_contexts, clean_database, read_staged_data
from tests import make_module_in_db, module_build_from_modulemd
from tests import (
clean_database,
init_data as init_data_contexts,
make_module_in_db,
module_build_from_modulemd,
read_staged_data,
)
@pytest.mark.usefixtures("model_tests_init_data")

View File

@@ -1,15 +1,16 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
import os
import mock
import pytest
import requests
import mock
from six.moves import reload_module
import module_build_service.common.monitor
from module_build_service import app, conf
from module_build_service.common import models
import module_build_service.common.monitor
from module_build_service.scheduler.db_session import db_session
from tests import init_data, make_module_in_db

View File

@@ -1,12 +1,14 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
from mock import patch, PropertyMock
import pytest
from module_build_service import Modulemd
from module_build_service.common import models
from module_build_service.common.utils import load_mmd
from module_build_service.common.resolve import get_base_module_mmds
from module_build_service import Modulemd
from module_build_service.scheduler.db_session import db_session
from tests import clean_database, make_module_in_db, init_data, read_staged_data

View File

@@ -1,13 +1,14 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
import os
import shutil
import tempfile
import pytest
import module_build_service.common.scm
from module_build_service.common.errors import ValidationError, UnprocessableEntity
import module_build_service.common.scm
base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir, "scm_data"))
repo_url = "file://" + base_dir + "/testrepo"

View File

@@ -1,5 +1,7 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
import mock
from module_build_service.common.submit import _is_eol_in_pdc

View File

@@ -1,11 +1,13 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
import pytest
from module_build_service.common import models
from module_build_service.common.errors import UnprocessableEntity
from module_build_service.common.utils import import_mmd, load_mmd
from module_build_service.scheduler.db_session import db_session
from module_build_service.common.errors import UnprocessableEntity
from tests import clean_database, read_staged_data