Unverified Commit 6a00e754 authored by Nicola Soranzo's avatar Nicola Soranzo
Browse files

Merge branch 'release_21.09' into release_22.01

parents 55a8ab11 c5527edd

packages/app/setup.py

+2 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ PACKAGES = [ 
    "galaxy.tools.data",

    "galaxy.tools.data_manager",

    "galaxy.tools.error_reports",

    "galaxy.tools.error_reports.plugins",

    "galaxy.tools.expressions",

    "galaxy.tools.filters",

    "galaxy.tools.imp_exp",
@@ -68,9 +69,9 @@ PACKAGES = [ 
    "galaxy.tool_shed.galaxy_install.tool_dependencies",

    "galaxy.tool_shed.galaxy_install.tool_dependencies.recipe",

    "galaxy.tool_shed.galaxy_install.tools",

    "galaxy.tool_shed.util",

    "galaxy.tool_shed.metadata",

    "galaxy.tool_shed.tools",

    "galaxy.tool_shed.util",

    "galaxy.tours",

    "galaxy.visualization",

    "galaxy.visualization.data_providers",

packages/tool_util/setup.py

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ TEST_DIR = 'tests' 
PACKAGES = [

    'galaxy',

    'galaxy.tool_util',

    'galaxy.tool_util.biotools',

    'galaxy.tool_util.client',

    'galaxy.tool_util.cwl',

    'galaxy.tool_util.deps',

packages/webapps/setup.py

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ PACKAGES = [ 
    'tool_shed.tools',

    'tool_shed.util',

    'tool_shed.utility_containers',

    'tool_shed.webapp',

    'tool_shed.webapp.api',

    'tool_shed.webapp.controllers',

    'tool_shed.webapp.framework',

test/integration/objectstore/_base.py

+5 −4
Original line number Diff line number Diff line
@@ -38,10 +38,11 @@ def start_minio(container_name): 
        '-d',

        '--name',

        container_name,

        '--rm',

        'minio/minio:latest',

        'server',

        '/tmp/data']

        "--rm",

        "minio/minio:latest",

        "server",

        "/data",

    ]

    subprocess.check_call(minio_start_args)