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

Support (only) current htcondor #4320

Merged
merged 4 commits into from
Jan 23, 2023
Merged

Support (only) current htcondor #4320

merged 4 commits into from
Jan 23, 2023

Conversation

adamnovak
Copy link
Member

This should fix #4315.

Is there a good way to tell Pip that we haven't tested with htcondor 11+, so we don't know that we'll work on those not-yet-released versions, but also we don't know that we won't work, and having released Toil X.X.X we won't be able to go back and change it to allow newer htcondor versions that might work, so do something sensible?

Changelog Entry

To be copied to the draft changelog by merger:

  • Require htcondor 10 exaclty

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.

@adamnovak
Copy link
Member Author

@DailyDreaming I'm going to merge this without waiting for review since it's small and we need it to fix CI. Can you have a look and let me know if you think there's anything we need to fix later?

@adamnovak adamnovak merged commit 67d30af into master Jan 23, 2023
@DailyDreaming DailyDreaming deleted the issues/4315-bump-htcondor branch February 3, 2023 21:18
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.

@adamnovak This looks good to me. Thanks for fixing CI.

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.

htcondor extra not installable with Toil > 5.5
2 participants