Move db_session.py to scheduler/db_session.py

module_build_service/builder/KojiContentGenerator.py

@@ -24,7 +24,7 @@ import pungi.arch
 from module_build_service import conf, log, build_logs, Modulemd
 from module_build_service.common.koji import get_session, koji_retrying_multicall_map
 from module_build_service.common.utils import load_mmd, mmd_to_str, to_text_type
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.scm import SCM
 
 logging.basicConfig(level=logging.DEBUG)

module_build_service/builder/KojiModuleBuilder.py

@@ -24,7 +24,7 @@ import textwrap
 from module_build_service import log, conf, models
 from module_build_service.builder.utils import execute_cmd, get_rpm_release, validate_koji_tag
 from module_build_service.common.retry import retry
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.builder import GenericBuilder
 from module_build_service.builder.KojiContentGenerator import KojiContentGenerator
 from module_build_service.common.koji import (

module_build_service/builder/MockModuleBuilder.py

@@ -23,7 +23,7 @@ from module_build_service.builder.utils import (
     get_koji_config,
     validate_koji_tag,
 )
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder
 from module_build_service.scheduler import events
 from module_build_service import models

module_build_service/manage.py

@@ -15,7 +15,7 @@ from module_build_service.builder.MockModuleBuilder import (
     import_builds_from_local_dnf_repos, load_local_builds
 )
 from module_build_service.common.utils import load_mmd_file, import_mmd
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.errors import StreamAmbigous
 import module_build_service.messaging
 import module_build_service.scheduler.consumer

module_build_service/route.py

@@ -4,7 +4,7 @@
 import inspect
 
 from module_build_service import conf, log, models
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.scheduler.handlers.greenwave import get_corresponding_module_build
 
 

module_build_service/scheduler/batches.py

@@ -4,7 +4,7 @@ import threading
 import concurrent.futures
 
 from module_build_service import conf, log, models
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.scheduler import events
 from module_build_service.scheduler.reuse import get_reusable_components, reuse_component
 

module_build_service/scheduler/consumer.py

@@ -23,7 +23,7 @@ import module_build_service.messaging
 import module_build_service.monitor as monitor
 
 from module_build_service import models, log, conf
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.errors import IgnoreMessage
 from module_build_service.messaging import default_messaging_backend
 from module_build_service.scheduler import events

module_build_service/scheduler/default_modules.py

@@ -16,7 +16,7 @@ from module_build_service.common.resolve import (
     expand_single_mse_streams, get_compatible_base_module_mmds
 )
 from module_build_service.common.retry import retry
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.errors import UnprocessableEntity
 from module_build_service.resolver.base import GenericResolver
 

module_build_service/scheduler/handlers/components.py

@@ -9,7 +9,7 @@ from module_build_service import celery_app, conf, models, log
 from module_build_service.builder import GenericBuilder
 from module_build_service.common.koji import get_session
 from module_build_service.common.utils import mmd_to_str
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.scheduler import events
 from module_build_service.scheduler.batches import continue_batch_build
 

module_build_service/scheduler/handlers/greenwave.py

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 from module_build_service import celery_app, conf, log
 from module_build_service.common.koji import get_session
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.models import ModuleBuild, BUILD_STATES
 from module_build_service.scheduler import events
 

module_build_service/scheduler/handlers/modules.py

@@ -13,7 +13,7 @@ from module_build_service.scheduler.submit import (
     record_filtered_rpms,
     record_module_build_arches
 )
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.builder import GenericBuilder
 from module_build_service.errors import UnprocessableEntity, Forbidden, ValidationError
 from module_build_service.scheduler.default_modules import (

module_build_service/scheduler/handlers/repos.py

@@ -7,7 +7,7 @@ from datetime import datetime
 from module_build_service import celery_app, conf, models, log
 from module_build_service.builder import GenericBuilder
 from module_build_service.scheduler.batches import start_next_batch_build
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.scheduler import events
 
 logging.basicConfig(level=logging.DEBUG)

module_build_service/scheduler/handlers/tags.py

@@ -5,7 +5,7 @@
 import logging
 import koji
 from module_build_service import celery_app, conf, models, log
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.builder import GenericBuilder
 from module_build_service.scheduler import events
 

module_build_service/scheduler/local.py

@@ -4,7 +4,7 @@
 import logging
 from module_build_service import models
 
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.scheduler.handlers.modules import init as modules_init_handler
 from module_build_service.scheduler.handlers.modules import wait as modules_wait_handler
 from module_build_service.scheduler.handlers.modules import done as modules_done_handler

module_build_service/scheduler/producer.py

@@ -12,7 +12,7 @@ import module_build_service.scheduler.consumer
 from module_build_service import celery_app, conf, models, log
 from module_build_service.builder import GenericBuilder
 from module_build_service.common.koji import get_session
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.scheduler.batches import (
     at_concurrent_component_threshold,
     start_next_batch_build,

module_build_service/scheduler/reuse.py

@@ -3,7 +3,7 @@
 import kobo.rpmlib
 
 from module_build_service import log, models, conf
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.resolver import GenericResolver
 from module_build_service.scheduler import events
 from module_build_service.common.resolve import get_base_module_mmds

module_build_service/scheduler/submit.py

@@ -10,7 +10,7 @@ import kobo.rpmlib
 from module_build_service import conf, log, models, Modulemd
 from module_build_service.common.submit import fetch_mmd
 from module_build_service.common.utils import to_text_type
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.errors import ValidationError, UnprocessableEntity, Forbidden
 import module_build_service.scm
 

module_build_service/scheduler/ursine.py

@@ -4,7 +4,7 @@ import re
 
 from module_build_service import conf, log
 from module_build_service.common.koji import get_session
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.resolver import GenericResolver
 
 

tests/__init__.py

@@ -20,7 +20,7 @@ from module_build_service.models import (
     BUILD_STATES,
 )
 from module_build_service import Modulemd
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 
 
 base_dir = os.path.dirname(__file__)

tests/conftest.py

@@ -10,7 +10,7 @@ import module_build_service
 from module_build_service.builder.utils import get_rpm_release
 from module_build_service.common.utils import load_mmd, mmd_to_str
 from module_build_service.models import BUILD_STATES
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from tests import clean_database, read_staged_data, module_build_from_modulemd
 
 BASE_DIR = os.path.dirname(__file__)

tests/test_build/test_build.py

@@ -20,7 +20,7 @@ import module_build_service.scheduler.consumer
 import module_build_service.scheduler.handlers.repos
 from module_build_service.errors import Forbidden
 from module_build_service import app, models, conf, build_logs, log
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.scheduler import events
 from module_build_service.scheduler.handlers.tags import tagged as tagged_handler
 from module_build_service.scheduler.handlers.components import (
@@ -1149,7 +1149,7 @@ class TestBuild(BaseTestBuild):
 
         FakeModuleBuilder.on_buildroot_add_artifacts_cb = on_buildroot_add_artifacts_cb
 
-        from module_build_service.db_session import db_session
+        from module_build_service.scheduler.db_session import db_session
 
         # Create a dedicated database session for scheduler to avoid hang
         self.run_scheduler(
@@ -1190,7 +1190,7 @@ class TestBuild(BaseTestBuild):
         """
         # Firstly, remove all existing module-build-macros component builds
 
-        from module_build_service.db_session import db_session
+        from module_build_service.scheduler.db_session import db_session
 
         macros_cb_query = db_session.query(models.ComponentBuild).filter_by(
             package="module-build-macros")

tests/test_builder/test_base.py

@@ -8,7 +8,7 @@ import module_build_service.resolver
 
 from tests import init_data
 
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.builder import GenericBuilder
 from mock import patch
 

tests/test_builder/test_builder_utils.py

@@ -8,7 +8,7 @@ import pytest
 
 from module_build_service import conf, models
 from module_build_service.builder import utils
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.errors import ProgrammingError, ValidationError
 from module_build_service.common.utils import load_mmd, import_mmd, mmd_to_str
 from tests import init_data, read_staged_data, scheduler_init_data

tests/test_builder/test_koji.py

@@ -15,7 +15,7 @@ import module_build_service.scheduler.handlers.repos
 import module_build_service.models
 from module_build_service import conf, Modulemd
 from module_build_service.common.utils import mmd_to_str
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder
 from module_build_service.builder import GenericBuilder
 from module_build_service.scheduler import events

tests/test_builder/test_mock.py

@@ -12,7 +12,7 @@ import pytest
 
 from module_build_service import conf, models
 from module_build_service.common.utils import load_mmd, mmd_to_str
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.models import ModuleBuild, ComponentBuild
 from module_build_service.builder.MockModuleBuilder import (
     import_fake_base_module,

tests/test_common/test_resolve.py

@@ -6,7 +6,7 @@ import pytest
 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, models
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from tests import clean_database, make_module_in_db, init_data, read_staged_data
 
 

tests/test_common/test_utils.py

@@ -4,7 +4,7 @@ import pytest
 
 from module_build_service import models
 from module_build_service.common.utils import import_mmd, load_mmd
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.errors import UnprocessableEntity
 from tests import clean_database, read_staged_data
 

tests/test_content_generator.py

@@ -9,7 +9,7 @@ from os import path
 
 from module_build_service import models, conf, build_logs, Modulemd
 from module_build_service.common.utils import load_mmd, load_mmd_file, mmd_to_str
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 
 from mock import patch, Mock, call, mock_open
 import kobo.rpmlib

tests/test_logger.py

@@ -6,7 +6,7 @@ import shutil
 import tempfile
 
 from module_build_service import log, models
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.logger import ModuleBuildLogs
 from module_build_service.scheduler.consumer import MBSConsumer
 from tests import init_data

tests/test_manage.py

@@ -4,7 +4,7 @@ import pytest
 from mock import patch
 
 from module_build_service import app, models
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.manage import manager_wrapper, retire
 from module_build_service.models import BUILD_STATES, ModuleBuild
 from module_build_service.web.utils import deps_to_dict

tests/test_models/test_models.py

@@ -5,7 +5,7 @@ import pytest
 from mock import patch
 from module_build_service import conf
 from module_build_service.common.utils import load_mmd, mmd_to_str
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.models import ComponentBuild, ComponentBuildTrace, ModuleBuild
 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

tests/test_monitor.py

@@ -9,7 +9,7 @@ from six.moves import reload_module
 
 import module_build_service.monitor
 from module_build_service import app, conf, models
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from tests import init_data, make_module_in_db
 
 num_of_metrics = 18

tests/test_resolver/test_db.py

@@ -11,7 +11,7 @@ from module_build_service import conf, models, Modulemd
 from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
 from module_build_service.models import ModuleBuild
 from module_build_service.errors import UnprocessableEntity
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.builder.MockModuleBuilder import load_local_builds
 import tests
 

tests/test_resolver/test_koji.py

@@ -8,7 +8,7 @@ from module_build_service import conf
 from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
 import module_build_service.resolver as mbs_resolver
 import tests
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.models import ModuleBuild, BUILD_STATES
 
 

tests/test_resolver/test_local.py

@@ -6,7 +6,7 @@ from datetime import datetime
 from module_build_service import conf
 from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
 import module_build_service.resolver as mbs_resolver
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.models import ModuleBuild
 import tests
 

tests/test_resolver/test_mbs.py

@@ -6,7 +6,7 @@ from module_build_service import app, conf
 from module_build_service.builder.MockModuleBuilder import load_local_builds
 from module_build_service.common.utils import load_mmd, mmd_to_str
 import module_build_service.resolver as mbs_resolver
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 import module_build_service.models
 import tests
 

tests/test_scheduler/test_batches.py

@@ -5,7 +5,7 @@ from module_build_service import models, conf
 import mock
 import koji
 import pytest
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.builder import GenericBuilder
 from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder
 from module_build_service.scheduler import events

tests/test_scheduler/test_default_modules.py

@@ -9,7 +9,7 @@ import pytest
 
 from module_build_service import conf
 from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.errors import UnprocessableEntity
 from module_build_service.models import ModuleBuild
 from module_build_service.scheduler import default_modules

tests/test_scheduler/test_greenwave_handler.py

@@ -7,7 +7,7 @@ from sqlalchemy import func
 
 import module_build_service.common.config
 from module_build_service import conf
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.models import BUILD_STATES, ModuleBuild
 from module_build_service.scheduler.consumer import MBSConsumer
 from module_build_service.scheduler.handlers.greenwave import get_corresponding_module_build

tests/test_scheduler/test_module_init.py

@@ -10,7 +10,7 @@ from tests.test_views.test_views import FakeSCM
 import module_build_service.messaging
 import module_build_service.scheduler.handlers.modules
 from module_build_service import build_logs, conf
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.models import ModuleBuild
 
 

tests/test_scheduler/test_module_wait.py

@@ -10,7 +10,7 @@ import pytest
 from tests import scheduler_init_data
 import module_build_service.resolver
 from module_build_service import build_logs, conf, Modulemd
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.models import ComponentBuild, ModuleBuild
 
 base_dir = os.path.dirname(os.path.dirname(__file__))

tests/test_scheduler/test_poller.py

@@ -7,7 +7,7 @@ from module_build_service import models, conf
 from tests import clean_database, make_module_in_db
 import mock
 import koji
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.scheduler import producer
 from datetime import datetime, timedelta
 

tests/test_scheduler/test_repo_done.py

@@ -5,7 +5,7 @@ import mock
 import module_build_service.messaging
 import module_build_service.scheduler.handlers.repos
 import module_build_service.models
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.models import ComponentBuild
 from tests import scheduler_init_data
 

tests/test_scheduler/test_reuse.py

@@ -6,7 +6,7 @@ from sqlalchemy.orm.session import make_transient
 
 from module_build_service import models, Modulemd
 from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.scheduler.reuse import get_reusable_component, get_reusable_module
 from tests import clean_database, read_staged_data
 

tests/test_scheduler/test_submit.py

@@ -6,7 +6,7 @@ import mock
 import pytest
 
 from module_build_service.common.utils import load_mmd, load_mmd_file, mmd_to_str
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 import module_build_service.scm
 from module_build_service import app, models, conf
 from module_build_service.errors import UnprocessableEntity

tests/test_scheduler/test_tag_tagged.py

@@ -10,7 +10,7 @@ import module_build_service.scheduler.handlers.repos
 import module_build_service.scheduler.handlers.tags
 import module_build_service.models
 
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 
 import koji
 

tests/test_views/test_views.py

@@ -29,7 +29,7 @@ from tests import (
     time_assert,
 )
 from tests.test_scm import base_dir as scm_base_dir
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.errors import UnprocessableEntity
 from module_build_service.models import ModuleBuild, BUILD_STATES, ComponentBuild
 from module_build_service import app, version

tests/test_web/test_mse.py

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 import pytest
 
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.errors import StreamAmbigous
 from module_build_service.web.mse import (
     expand_mse_streams, generate_expanded_mmds, get_mmds_required_by_module_recursively

tests/test_web/test_submit.py

@@ -11,7 +11,7 @@ from werkzeug.datastructures import FileStorage
 
 from module_build_service import models
 from module_build_service.common.utils import mmd_to_str
-from module_build_service.db_session import db_session
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.errors import ValidationError
 from module_build_service.web.submit import (
     get_prefixed_version, submit_module_build, submit_module_build_from_yaml