From f6bdaf59bf59d7e4d83f2568309aa0abecc14ad2 Mon Sep 17 00:00:00 2001 From: mprahl Date: Fri, 3 Jan 2020 16:44:12 -0500 Subject: [PATCH] Move mmd_resolver.py to web/mmd_resolver.py --- .../{ => web}/mmd_resolver.py | 25 +---------------- module_build_service/web/mse.py | 2 +- tests/{ => test_web}/test_mmd_resolver.py | 27 ++----------------- 3 files changed, 4 insertions(+), 50 deletions(-) rename module_build_service/{ => web}/mmd_resolver.py (96%) rename tests/{ => test_web}/test_mmd_resolver.py (93%) diff --git a/module_build_service/mmd_resolver.py b/module_build_service/web/mmd_resolver.py similarity index 96% rename from module_build_service/mmd_resolver.py rename to module_build_service/web/mmd_resolver.py index 774ba2ef..c425b9f4 100644 --- a/module_build_service/mmd_resolver.py +++ b/module_build_service/web/mmd_resolver.py @@ -1,28 +1,5 @@ # -*- coding: utf-8 -*- -# -# Copyright © 2018 Red Hat, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# Written by Jan Kaluža -# Igor Gnatenko - +# SPDX-License-Identifier: MIT import collections import itertools import solv diff --git a/module_build_service/web/mse.py b/module_build_service/web/mse.py index d5efdb92..82e2f6d0 100644 --- a/module_build_service/web/mse.py +++ b/module_build_service/web/mse.py @@ -5,7 +5,7 @@ from module_build_service.common.resolve import expand_single_mse_streams, get_b from module_build_service.common.utils import mmd_to_str from module_build_service.errors import StreamAmbigous from module_build_service.errors import UnprocessableEntity -from module_build_service.mmd_resolver import MMDResolver +from module_build_service.web.mmd_resolver import MMDResolver from module_build_service.web.utils import deps_to_dict from module_build_service.resolver import GenericResolver diff --git a/tests/test_mmd_resolver.py b/tests/test_web/test_mmd_resolver.py similarity index 93% rename from tests/test_mmd_resolver.py rename to tests/test_web/test_mmd_resolver.py index 38292c81..1e6c0879 100644 --- a/tests/test_mmd_resolver.py +++ b/tests/test_web/test_mmd_resolver.py @@ -1,33 +1,10 @@ # -*- coding: utf-8 -*- -# -# Copyright © 2018 Red Hat, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# Written by Jan Kaluža -# Igor Gnatenko - +# SPDX-License-Identifier: MIT import collections import pytest import solv -from module_build_service.mmd_resolver import MMDResolver +from module_build_service.web.mmd_resolver import MMDResolver from module_build_service import Modulemd