From 9713184b03bb64dd3d42a58eb4c129da70adc0cb Mon Sep 17 00:00:00 2001 From: Sergey Golitsynskiy Date: Sat, 6 Jul 2019 17:07:26 +0200 Subject: [PATCH] Move tools/verify/ into tool_util/verify/ Ref: https://github.com/galaxyproject/galaxy/issues/8073 --- lib/galaxy/{tools => tool_util}/verify/__init__.py | 0 lib/galaxy/{tools => tool_util}/verify/asserts/__init__.py | 0 lib/galaxy/{tools => tool_util}/verify/asserts/archive.py | 0 lib/galaxy/{tools => tool_util}/verify/asserts/hdf5.py | 0 lib/galaxy/{tools => tool_util}/verify/asserts/tabular.py | 0 lib/galaxy/{tools => tool_util}/verify/asserts/text.py | 0 lib/galaxy/{tools => tool_util}/verify/asserts/xml.py | 0 lib/galaxy/{tools => tool_util}/verify/interactor.py | 0 lib/galaxy/{tools => tool_util}/verify/script.py | 5 ++++- lib/galaxy/{tools => tool_util}/verify/test_data.py | 0 lib/galaxy/tools/test.py | 2 +- test/api/test_tools_upload.py | 2 +- test/base/driver_util.py | 2 +- test/base/integration_util.py | 2 +- test/base/interactor.py | 2 +- test/base/populators.py | 2 +- test/base/testcase.py | 2 +- test/functional/test_toolbox.py | 2 +- test/unit/test_verify.py | 2 +- 19 files changed, 13 insertions(+), 10 deletions(-) rename lib/galaxy/{tools => tool_util}/verify/__init__.py (100%) rename lib/galaxy/{tools => tool_util}/verify/asserts/__init__.py (100%) rename lib/galaxy/{tools => tool_util}/verify/asserts/archive.py (100%) rename lib/galaxy/{tools => tool_util}/verify/asserts/hdf5.py (100%) rename lib/galaxy/{tools => tool_util}/verify/asserts/tabular.py (100%) rename lib/galaxy/{tools => tool_util}/verify/asserts/text.py (100%) rename lib/galaxy/{tools => tool_util}/verify/asserts/xml.py (100%) rename lib/galaxy/{tools => tool_util}/verify/interactor.py (100%) rename lib/galaxy/{tools => tool_util}/verify/script.py (98%) rename lib/galaxy/{tools => tool_util}/verify/test_data.py (100%) diff --git a/lib/galaxy/tools/verify/__init__.py b/lib/galaxy/tool_util/verify/__init__.py similarity index 100% rename from lib/galaxy/tools/verify/__init__.py rename to lib/galaxy/tool_util/verify/__init__.py diff --git a/lib/galaxy/tools/verify/asserts/__init__.py b/lib/galaxy/tool_util/verify/asserts/__init__.py similarity index 100% rename from lib/galaxy/tools/verify/asserts/__init__.py rename to lib/galaxy/tool_util/verify/asserts/__init__.py diff --git a/lib/galaxy/tools/verify/asserts/archive.py b/lib/galaxy/tool_util/verify/asserts/archive.py similarity index 100% rename from lib/galaxy/tools/verify/asserts/archive.py rename to lib/galaxy/tool_util/verify/asserts/archive.py diff --git a/lib/galaxy/tools/verify/asserts/hdf5.py b/lib/galaxy/tool_util/verify/asserts/hdf5.py similarity index 100% rename from lib/galaxy/tools/verify/asserts/hdf5.py rename to lib/galaxy/tool_util/verify/asserts/hdf5.py diff --git a/lib/galaxy/tools/verify/asserts/tabular.py b/lib/galaxy/tool_util/verify/asserts/tabular.py similarity index 100% rename from lib/galaxy/tools/verify/asserts/tabular.py rename to lib/galaxy/tool_util/verify/asserts/tabular.py diff --git a/lib/galaxy/tools/verify/asserts/text.py b/lib/galaxy/tool_util/verify/asserts/text.py similarity index 100% rename from lib/galaxy/tools/verify/asserts/text.py rename to lib/galaxy/tool_util/verify/asserts/text.py diff --git a/lib/galaxy/tools/verify/asserts/xml.py b/lib/galaxy/tool_util/verify/asserts/xml.py similarity index 100% rename from lib/galaxy/tools/verify/asserts/xml.py rename to lib/galaxy/tool_util/verify/asserts/xml.py diff --git a/lib/galaxy/tools/verify/interactor.py b/lib/galaxy/tool_util/verify/interactor.py similarity index 100% rename from lib/galaxy/tools/verify/interactor.py rename to lib/galaxy/tool_util/verify/interactor.py diff --git a/lib/galaxy/tools/verify/script.py b/lib/galaxy/tool_util/verify/script.py similarity index 98% rename from lib/galaxy/tools/verify/script.py rename to lib/galaxy/tool_util/verify/script.py index d4d36ad15e1..cf6121395f1 100644 --- a/lib/galaxy/tools/verify/script.py +++ b/lib/galaxy/tool_util/verify/script.py @@ -5,7 +5,10 @@ import argparse import json import sys -from galaxy.tools.verify.interactor import GalaxyInteractorApi, verify_tool +from .interactor import ( + GalaxyInteractorApi, + verify_tool, +) DESCRIPTION = """Script to quickly run a tool test against a running Galaxy instance.""" ALL_TESTS = "*all_tests*" diff --git a/lib/galaxy/tools/verify/test_data.py b/lib/galaxy/tool_util/verify/test_data.py similarity index 100% rename from lib/galaxy/tools/verify/test_data.py rename to lib/galaxy/tool_util/verify/test_data.py diff --git a/lib/galaxy/tools/test.py b/lib/galaxy/tools/test.py index 03ddd53df46..3124c984c3d 100644 --- a/lib/galaxy/tools/test.py +++ b/lib/galaxy/tools/test.py @@ -4,9 +4,9 @@ import os.path from six import string_types +from galaxy.tool_util.verify.interactor import ToolTestDescription import galaxy.tools.parameters.basic import galaxy.tools.parameters.grouping -from galaxy.tools.verify.interactor import ToolTestDescription from galaxy.util import ( string_as_bool, unicodify, diff --git a/test/api/test_tools_upload.py b/test/api/test_tools_upload.py index b1ffc6f307a..cd6415c497a 100644 --- a/test/api/test_tools_upload.py +++ b/test/api/test_tools_upload.py @@ -12,7 +12,7 @@ from base.populators import ( uses_test_history, ) -from galaxy.tools.verify.test_data import TestDataResolver +from galaxy.tool_util.verify.test_data import TestDataResolver class ToolsUploadTestCase(api.ApiTestCase): diff --git a/test/base/driver_util.py b/test/base/driver_util.py index 5760732471f..f4591e2812a 100644 --- a/test/base/driver_util.py +++ b/test/base/driver_util.py @@ -34,7 +34,7 @@ from galaxy.app import UniverseApplication as GalaxyUniverseApplication from galaxy.config import LOGGING_CONFIG_DEFAULT from galaxy.model import mapping from galaxy.model.tool_shed_install import mapping as toolshed_mapping -from galaxy.tools.verify.interactor import GalaxyInteractorApi, verify_tool +from galaxy.tool_util.verify.interactor import GalaxyInteractorApi, verify_tool from galaxy.util import asbool, download_to_file from galaxy.util.properties import load_app_properties from galaxy.web import buildapp diff --git a/test/base/integration_util.py b/test/base/integration_util.py index 24724825829..699c98888cc 100644 --- a/test/base/integration_util.py +++ b/test/base/integration_util.py @@ -10,7 +10,7 @@ from unittest import skip, SkipTest, TestCase import pytest from galaxy.tool_util.deps.commands import which -from galaxy.tools.verify.test_data import TestDataResolver +from galaxy.tool_util.verify.test_data import TestDataResolver from .api import UsesApiTestCaseMixin from .driver_util import GalaxyTestDriver diff --git a/test/base/interactor.py b/test/base/interactor.py index 7ccb068cad9..b8166375302 100644 --- a/test/base/interactor.py +++ b/test/base/interactor.py @@ -1,4 +1,4 @@ -from galaxy.tools.verify.interactor import GalaxyInteractorApi +from galaxy.tool_util.verify.interactor import GalaxyInteractorApi class TestCaseGalaxyInteractor(GalaxyInteractorApi): diff --git a/test/base/populators.py b/test/base/populators.py index 0ee8b19d416..46169a4d715 100644 --- a/test/base/populators.py +++ b/test/base/populators.py @@ -23,7 +23,7 @@ from gxformat2 import ( from pkg_resources import resource_string from six import StringIO -from galaxy.tools.verify.test_data import TestDataResolver +from galaxy.tool_util.verify.test_data import TestDataResolver from galaxy.util import unicodify from . import api_asserts diff --git a/test/base/testcase.py b/test/base/testcase.py index c73824250f6..3e063148fc0 100644 --- a/test/base/testcase.py +++ b/test/base/testcase.py @@ -5,7 +5,7 @@ import os import unittest from galaxy.security import idencoding -from galaxy.tools.verify.test_data import TestDataResolver +from galaxy.tool_util.verify.test_data import TestDataResolver from .driver_util import GalaxyTestDriver, setup_keep_outdir, target_url_parts log = logging.getLogger(__name__) diff --git a/test/functional/test_toolbox.py b/test/functional/test_toolbox.py index 7531e68b4a4..6dd7a3cda58 100644 --- a/test/functional/test_toolbox.py +++ b/test/functional/test_toolbox.py @@ -11,8 +11,8 @@ except ImportError: from base.driver_util import setup_keep_outdir, target_url_parts from base.instrument import register_job_data from base.testcase import FunctionalTestCase # noqa: I100,I201,I202 +from galaxy.tool_util.verify.interactor import GalaxyInteractorApi, verify_tool # noqa: I201 from galaxy.tools import DataManagerTool # noqa: I201 -from galaxy.tools.verify.interactor import GalaxyInteractorApi, verify_tool # noqa: I201 log = logging.getLogger(__name__) diff --git a/test/unit/test_verify.py b/test/unit/test_verify.py index 8de580cec5b..54a234590ee 100644 --- a/test/unit/test_verify.py +++ b/test/unit/test_verify.py @@ -4,7 +4,7 @@ import tempfile import pytest -from galaxy.tools.verify import ( +from galaxy.tool_util.verify import ( files_contains, files_diff, files_re_match,