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

Mothur: fixed issues with chimera tools #448

Closed
wants to merge 0 commits into from

Conversation

oxyko
Copy link

@oxyko oxyko commented Dec 1, 2015

Issue described in #419. Also, added test data and test for chimera.slayer. But test is commented out, because planemo wasn't able to run it. Will need to revisit it once mothur wrapper tests are in good shape.

@martenson
Copy link
Member

Thanks for the contribution @oxyko
Is it possible to trim the testing dataset to be less than 25k lines? It would help preventing this repo from growing too big.

@oxyko
Copy link
Author

oxyko commented Dec 1, 2015

Will do.

@bgruening
Copy link
Member

@oxyko this file is still 17.000 lines, is this correct?
tools/mothur/tools/mothur/test-data/chimera_test_in.fasta

@bgruening
Copy link
Member

Can you please rebase/squash against master to get rid of the large file from the git history? Thanks!

Let me know if you need help with squashing commits.

@martenson
Copy link
Member

@oxyko
Copy link
Author

oxyko commented Dec 2, 2015

I've removed the test files and tried the rebase/squash, but I'm afraid I'm in a bit of a mess and my HEAD is now detached. Could you see if you can bring in the current pull as it is? If not, I'll do the hard reset on mothur branch, redo the changes and do a new pull request.

@bgruening
Copy link
Member

I guess we can merge this branch and ry to rebase the master mothur branch before merging into main. @martenson does this sound reasonable? If so please feel free to merge.

@oxyko
Copy link
Author

oxyko commented Dec 2, 2015

Thanks guys! I'll try and be more careful with rebasing and test data size next time.

@martenson
Copy link
Member

@bgruening I tried to do the rebase locally and it is not easy. If you see the diff in GitHub you will notice that only one or two commits are actually being shown - all other changes are both commited and then reverted resulting in every commit having conflicts while rebasing (e.g. all the whitespace changes are missing). This needs some handwork :/

@oxyko
Copy link
Author

oxyko commented Dec 2, 2015

OK, doing a hard reset on mothur and re-applying the changes.

@bgruening
Copy link
Member

@oxyko thanks. Just to explain the mess. We try to keep this repository as small as possible, hence we try to keep test data small.
@martenson thanks for investing!

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.

None yet

3 participants