Commit dc3bff48 authored by Matthias Bernt's avatar Matthias Bernt
Browse files

Revert "Fix `test_mulled_build.py::test_mulled_build_files_cli` with `use_mamba=True`" 

This reverts commit 0c09d02d.
parent 6c281d2c

lib/galaxy/tool_util/deps/mulled/invfile.lua

+2 −3
Original line number Diff line number Diff line
@@ -88,14 +88,13 @@ inv.task('build') 
    .using(conda_image)

        .withHostConfig({binds = bind_args})

        .run('/bin/sh', '-c', preinstall

            .. conda_bin .. ' create --quiet --yes -p /usr/local/env --copy  && '

            .. conda_bin .. ' install '

            .. channel_args .. ' '

            .. target_args

            .. ' --strict-channel-priority -p /usr/local/env --copy --yes '

            .. ' --strict-channel-priority -p /usr/local --copy --yes '

            .. verbose

            .. postinstall)

    .wrap('build/dist/env')

    .wrap('build/dist')

        .at('/usr/local')

        .inImage(destination_base_image)

        .as(repo)

lib/galaxy/tool_util/deps/mulled/mulled_search.py

+1 −2
Original line number Diff line number Diff line
@@ -148,8 +148,7 @@ class CondaSearch: 
            elif header_found:

                lines_fields.append(line.split())

        return [

            {"package": line_fields[0], "version": line_fields[1], "build": line_fields[2]}

            for line_fields in lines_fields

            {"package": line_fields[0], "version": line_fields[1], "build": line_fields[2]} for line_fields in lines_fields

        ]