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.

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

Fix --custom-net mutual exclusivity bug. #4458

Conversation

misterbrandonwalker
Copy link
Contributor

Dont let --user-space-docker-cmd and --custom-net be mutually exclusive, for example user-space-docker-cmd docker is compatible with custom-net. Otherwise get this error, toil-cwl-runner: error: argument --user-space-docker-cmd: not allowed with argument --custom-net.

Changelog Entry

To be copied to the draft changelog by merger:

  • PR submitter writes their recommendation for a changelog entry here

Reviewer Checklist

  • Make sure it is coming from issues/XXXX-fix-the-thing in the Toil repo, or from an external repo.
    • If it is coming from an external repo, make sure to pull it in for CI with:
      contrib/admin/test-pr otheruser theirbranchname issues/XXXX-fix-the-thing
      
    • If there is no associated issue, create one.
  • Read through the code changes. Make sure that it doesn't have:
    • Addition of trailing whitespace.
    • New variable or member names in camelCase that want to be in snake_case.
    • New functions without type hints.
    • New functions or classes without informative docstrings.
    • Changes to semantics not reflected in the relevant docstrings.
    • New or changed command line options for Toil workflows that are not reflected in docs/running/{cliOptions,cwl,wdl}.rst
    • New features without tests.
  • Comment on the lines of code where problems exist with a review comment. You can shift-click the line numbers in the diff to select multiple lines.
  • Finish the review with an overall description of your opinion.

Merger Checklist

  • Make sure the PR passes tests.
  • Make sure the PR has been reviewed since its last modification. If not, review it.
  • Merge with the Github "Squash and merge" feature.
    • If there are multiple authors' commits, add Co-authored-by to give credit to all contributing authors.
  • Copy its recommended changelog entry to the Draft Changelog.
  • Append the issue number in parentheses to the changelog entry.

src/toil/cwl/cwltoil.py Outdated Show resolved Hide resolved
src/toil/cwl/cwltoil.py Outdated Show resolved Hide resolved
Copy link
Contributor

@mr-c mr-c left a comment

Choose a reason for hiding this comment

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

Good idea; thanks!

@misterbrandonwalker
Copy link
Contributor Author

Thanks! Accidentally left the profiler content in.

misterbrandonwalker and others added 3 commits April 28, 2023 20:56
…ve. Otherwise get this error, toil-cwl-runner: error: argument --user-space-docker-cmd: not allowed with argument --custom-net.
Co-authored-by: Michael R. Crusoe <[email protected]>
Co-authored-by: Michael R. Crusoe <[email protected]>
Copy link
Member

@DailyDreaming DailyDreaming left a comment

Choose a reason for hiding this comment

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

LGTM. Thank you @bdw2292 .

@DailyDreaming DailyDreaming requested a review from mr-c May 1, 2023 20:51
@adamnovak adamnovak mentioned this pull request May 4, 2023
@adamnovak
Copy link
Member

I merged this in #4464.

@adamnovak adamnovak closed this May 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants