Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #17631: Make it possible to use custom invfile.lua if needed #17693

Merged
merged 3 commits into from
Mar 13, 2024
Merged

Issue #17631: Make it possible to use custom invfile.lua if needed #17693

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df43961
Issue #17631: Make it possible to use custom invfile.lua if needed
martin-g Mar 13, 2024
f2fc73a
Issue #17631: Apply suggestion by @mvdbeek
martin-g Mar 13, 2024
7d7997b
Add --involucro-lua-file command line argument
mvdbeek Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/galaxy/tool_util/deps/mulled/mulled_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

log = logging.getLogger(__name__)

DIRNAME = os.path.dirname(__file__)
DIRNAME = os.environ.get("INVFILE_DIRNAME", os.path.dirname(__file__))
Copy link
Member

@mvdbeek mvdbeek Mar 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems fine, but maybe we can be more direct here ?

Suggested change
DIRNAME = os.environ.get("INVFILE_DIRNAME", os.path.dirname(__file__))
INVFILE = os.environ.get("INVFILE", os.path.join(os.path.dirname(__file__), "invfile.lua"))

and then change line 269 to use that variable directly ?

It might also be nice to add this to the argparse parse in add_build_arguments and pass that on to mull_targets ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've applied your suggestion!

But I'm afraid I don't follow you about add_build_arguments and mull_targets

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've pushed a commit adding --involucro-lua-file, which defaults to INVFILE. That way users see it as a possible option when running mulled-build --help

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! Thanks!

DEFAULT_BASE_IMAGE = os.environ.get("DEFAULT_BASE_IMAGE", "quay.io/bioconda/base-glibc-busybox-bash:latest")
DEFAULT_EXTENDED_BASE_IMAGE = os.environ.get(
"DEFAULT_EXTENDED_BASE_IMAGE", "quay.io/bioconda/base-glibc-debian-bash:latest"
Expand Down
Loading