-
Notifications
You must be signed in to change notification settings - Fork 295
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
Fixed check_file_status error #860
Conversation
check_fiel_status requires two arguments: file_path and force. find-knots.py only gave the first argument, this update adds in the force argument.
Can one of the admins verify this patch? |
1 similar comment
Can one of the admins verify this patch? |
Jenkins, okay to test |
Jenkins, test this please |
Thanks @TheOneHyer! Can you fill out this checklist? http://khmer.readthedocs.org/en/latest/dev/coding-guidelines-and-review.html#checklist |
Can one of the admins verify this patch? |
1 similar comment
Can one of the admins verify this patch? |
This was missed due to #358 |
Change log entry for "Fixed check_file_status error dib-lab#860"
*Note: The proposed change was made on the lab server at the lab where I work, I do not have write permission to program files on the server yet (I am undergoing sys admin training and will have permissions soon). My personal machine is not powerful enough to run khmer on metagenomic data in a time effective manner. Thus I have not personally tested the change on any real data (I did email the current sys admin the fix but he did not want to implement because mr-c gave ged-jenkins permission to test and he figured you guys would do a better job testing the script). |
@TheOneHyer Thanks for completing the checklist. To add the ChangeLog you can make additional commits to the branch this pull request is from: the 'master' branch of your fork of the repository. |
Jenkins, ok to test |
Change log entry for "Fixed check_file_status error dib-lab#860"
I've moved my ChangeLog to this pull and closed (#891). I apologize about my sloppiness, I'm quite new to GitHub. |
@TheOneHyer It is no problem! Have you seen http://khmer.readthedocs.org/en/latest/dev/getting-started.html ? |
Can you make your branch mergable? We've updated the master branch since you started. If you've been following http://khmer.readthedocs.org/en/latest/dev/getting-started.html then the following commands should work:
You may need to manually fix a few conflicts using |
Conflicts: ChangeLog
ChangeLog updated to match find-knots.py fix
ready for review! |
Deleted extra entry in ChangeLog
Fixed Bad Line
Jenkins, test this please |
I tested this by executing the |
@@ -55,6 +55,11 @@ | |||
* tests/test_{counting_single,subset_graph}.py: make explicit the use of | |||
floor division behavior. | |||
|
|||
2015-03-07 Alex Hyer <theonehyer@gmail.com> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since your pull request will be the latest addition to the project when we merge it should be at the top of the file with a date newer than the preceding entry.
@TheOneHyer Once you get your ChangeLog entry moved to the top of the file I'll merge this. Thank you for catching and fixing this bug! |
ChangeLog Entry moved
ready for review! |
@TheOneHyer, Congratulations on your first commit to the khmer project! Your name will be included in the release notes for the next version and you'll be listed amongst our other contributors in the next software release paper. |
check_file_status requires two arguments: file_path and force. find-knots.py only gave the first argument, this update adds in the force argument.