Unverified Commit 6159fe2c authored by Nicola Soranzo's avatar Nicola Soranzo Committed by GitHub
Browse files

Merge pull request #14018 from nuwang/fix_missing_webapp_packages

parents b924a864 4a779c44

lib/galaxy/util/bool_expressions.py

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ from typing import ( 
from pyparsing import (

    alphanums,

    CaselessKeyword,

    Forward,

    infixNotation,

    Keyword,

    opAssoc,
@@ -132,7 +131,7 @@ class BooleanExpressionEvaluator: 
        action.evaluator = evaluator

        boolOperand = TRUE | FALSE | Word(token_format or DEFAULT_TOKEN_FORMAT)

        boolOperand.setParseAction(action)

        self.boolExpr: Forward = infixNotation(

        self.boolExpr: ParserElement = infixNotation(

            boolOperand,

            [

                (NOT_OP, 1, opAssoc.RIGHT, BoolNot),

packages/app/requirements.txt

+1 −0
Original line number Diff line number Diff line
@@ -19,3 +19,4 @@ refgenconf>=0.7.0,<0.10.0 # https://github.com/galaxyproject/galaxy/issues/11601 
Fabric3

lagom

fs

Whoosh

packages/app/setup.py

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,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',

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)