diff --git a/docker/coexecutor/Dockerfile b/docker/coexecutor/Dockerfile index 7d55e69a58bce36a1379b3d089153b4d15434ba7..a97ce20ee089cef7c94e4de979878264718a13d0 100644 --- a/docker/coexecutor/Dockerfile +++ b/docker/coexecutor/Dockerfile @@ -19,4 +19,4 @@ RUN pip install -U pip && pip install wheel kombu pykube poster ADD pulsar_app-*.dev0-py2.py3-none-any.whl /pulsar_app-*.dev0-py2.py3-none-any.whl -RUN pip install /pulsar_app-*.dev0-py2.py3-none-any.whl +RUN pip install /pulsar_app-*.dev0-py2.py3-none-any.whl[galaxy_extended_metadata] diff --git a/pulsar/client/staging/__init__.py b/pulsar/client/staging/__init__.py index 86cb2158ae011d1bb3d611838baf197ac93b694c..00e16c5d19ac66f239e4115d2333970a202026ec 100644 --- a/pulsar/client/staging/__init__.py +++ b/pulsar/client/staging/__init__.py @@ -14,7 +14,7 @@ from galaxy.util.bunch import Bunch from ..util import PathHelper COMMAND_VERSION_FILENAME = "COMMAND_VERSION" -DEFAULT_DYNAMIC_COLLECTION_PATTERN = [r"primary_.*|galaxy.json|metadata_.*|dataset_\d+\.dat|__instrument_.*|dataset_\d+_files.+"] +DEFAULT_DYNAMIC_COLLECTION_PATTERN = [r"primary_.*|galaxy.json|metadata_.*|dataset_\d+\.dat|__instrument_.*|dataset_\d+_files.+|outputs_populated/.*"] class ClientJobDescription(object): diff --git a/setup.py b/setup.py index d9cd7db624063e00910beb3b099fe6422205f348..8e9c406ed0fc7babdc6eb896f68546a0273c2cb7 100644 --- a/setup.py +++ b/setup.py @@ -111,6 +111,7 @@ setup( install_requires=requirements, extras_require={ ':python_version=="2.7"': py27_requirements, + 'galaxy_extended_metadata': ['galaxy-job-execution>=19.9.0.dev0'], }, license="Apache License 2.0", zip_safe=False,