Move `uses_shed.py to galaxy_test.driver`

to break circular dependency between galaxy-test-base and
galaxy-test-driver packages.

Also:
- Use f-string.
This commit is contained in:
Nicola Soranzo
2022-06-28 18:33:05 +01:00
parent 8c2ddf32ce
commit 7466ab89a6
10 changed files with 11 additions and 14 deletions
@@ -127,7 +127,7 @@ class UsesShed:
)
except AssertionError as e:
if "Error attempting to retrieve installation information from tool shed" in unicodify(e):
pytest.skip("Toolshed '%s' unavailable" % tool_shed_url)
pytest.skip(f"Toolshed '{tool_shed_url}' unavailable")
raise
def uninstall_repository(self, owner, name, changeset, tool_shed_url="https://toolshed.g2.bx.psu.edu"):
-2
View File
@@ -31,8 +31,6 @@ version = 22.5.0.dev0
[options]
include_package_data = True
install_requires =
galaxy-app
galaxy-data
galaxy-tool-util
galaxy-util
bioblend
+1 -2
View File
@@ -32,15 +32,14 @@ version = 22.5.0.dev0
include_package_data = True
install_requires =
galaxy-app
galaxy-config
galaxy-data
galaxy-test-base
galaxy-tool-util
galaxy-util
galaxy-webapps
galaxy-web-framework
nose
pytest
PyYAML
packages = find:
python_requires = >=3.7
+2 -2
View File
@@ -8,11 +8,11 @@ from galaxy_test.base.populators import (
DatasetPopulator,
skip_if_toolshed_down,
)
from galaxy_test.base.uses_shed import (
from galaxy_test.driver import integration_util
from galaxy_test.driver.uses_shed import (
CONDA_AUTO_INSTALL_JOB_TIMEOUT,
UsesShed,
)
from galaxy_test.driver import integration_util
FETCH_TOOL_ID = "toolshed.g2.bx.psu.edu/repos/devteam/data_manager_fetch_genome_dbkeys_all_fasta/data_manager_fetch_genome_all_fasta_dbkey/0.0.3"
FETCH_GENOME_DBKEYS_ALL_FASTA_INPUT = {
@@ -5,11 +5,11 @@ import string
from nose.plugins.skip import SkipTest
from galaxy_test.base.populators import DatasetPopulator
from galaxy_test.base.uses_shed import (
from galaxy_test.driver import integration_util
from galaxy_test.driver.uses_shed import (
CONDA_AUTO_INSTALL_JOB_TIMEOUT,
UsesShed,
)
from galaxy_test.driver import integration_util
FETCH_TOOL_ID = "toolshed.g2.bx.psu.edu/repos/devteam/data_manager_fetch_genome_dbkeys_all_fasta/data_manager_fetch_genome_all_fasta_dbkey/0.0.3"
FETCH_GENOME_DBKEYS_ALL_FASTA_INPUT = {
@@ -2,8 +2,8 @@ import os
from collections import namedtuple
from galaxy_test.base.populators import DatasetPopulator
from galaxy_test.base.uses_shed import UsesShed
from galaxy_test.driver import integration_util
from galaxy_test.driver.uses_shed import UsesShed
from tool_shed.util import hg_util
REPO_TYPE = namedtuple("REPO_TYPE", "name owner changeset")
+1 -1
View File
@@ -1,8 +1,8 @@
import os
from galaxy_test.base.populators import skip_if_toolshed_down
from galaxy_test.base.uses_shed import UsesShed
from galaxy_test.driver import integration_util
from galaxy_test.driver.uses_shed import UsesShed
class ToolShedToolTestIntegrationTestCase(integration_util.IntegrationTestCase, UsesShed):
+1 -1
View File
@@ -4,8 +4,8 @@ from galaxy_test.base.populators import (
DatasetPopulator,
WorkflowPopulator,
)
from galaxy_test.base.uses_shed import UsesShed
from galaxy_test.driver import integration_util
from galaxy_test.driver.uses_shed import UsesShed
class WorkflowInvocationTestCase(integration_util.IntegrationTestCase, UsesShed):
@@ -15,13 +15,13 @@ from galaxy.model import (
)
from galaxy.workflow.refactor.schema import RefactorActionExecutionMessageTypeEnum
from galaxy_test.base.populators import WorkflowPopulator
from galaxy_test.base.uses_shed import UsesShed
from galaxy_test.base.workflow_fixtures import (
WORKFLOW_NESTED_RUNTIME_PARAMETER,
WORKFLOW_NESTED_SIMPLE,
WORKFLOW_NESTED_WITH_MULTIPLE_VERSIONS_TOOL,
)
from galaxy_test.driver import integration_util
from galaxy_test.driver.uses_shed import UsesShed
REFACTORING_SIMPLE_TEST = """
class: GalaxyWorkflow
@@ -1,4 +1,4 @@
from galaxy_test.base.uses_shed import UsesShed
from galaxy_test.driver.uses_shed import UsesShed
from .framework import (
selenium_test,
SeleniumIntegrationTestCase,