Skip to content

Fix qiita all tests #1107

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

Merged
merged 14 commits into from
Apr 29, 2015

Conversation

josenavas
Copy link
Contributor

Build on top of #1106

Fixes all the tests in qiita_ware. Everything expected to pass now.

@josenavas josenavas added this to the Alpha 0.1 milestone Apr 25, 2015
@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 658a5b5 on josenavas:fix-qiita-ware-tests into * on biocore:relax-md-req*.

@josenavas josenavas mentioned this pull request Apr 27, 2015
@ElDeveloper
Copy link
Contributor

@antgonza, quick reminder, it would be great if we can get this reviewed ASAP. Tests should be running now and this time they should all pass.

@antgonza
Copy link
Member

👍 if tests pass.

@ElDeveloper
Copy link
Contributor

Same here 👍 if tests pass.

@ElDeveloper
Copy link
Contributor

@josenavas, there's a few legitimate failures, would you mind having a look?

@antgonza
Copy link
Member

Also, will it be possible to remove all QiitaDBWarning?

@josenavas
Copy link
Contributor Author

Thanks guys, I know the source of the problem. What I'm going to do is merge #1109 in here, as the code in there will help me to resolve this issue. Given that the 2 PR are small, I don't think it will blow up the size of the PR :-)

@ElDeveloper
Copy link
Contributor

Sounds like a good idea, would you mind closing 1109 then?

On (Apr-28-15|12:49), josenavas wrote:

Thanks guys, I know the source of the problem. What I'm going to do is merge #1109 in here, as the code in there will help me to resolve this issue. Given that the 2 PR are small, I don't think it will blow up the size of the PR :-)


Reply to this email directly or view it on GitHub:
#1107 (comment)

@josenavas
Copy link
Contributor Author

Tests should pass now. I'm currently working on removing all the warnings.

@josenavas
Copy link
Contributor Author

This should be good to go. This is the last PR os the functionality is in place. Note that the interface is still not limited, i.e. it still allows to submit to EBI although columns are missing. AFAIK, we decided that this will go in in alpha 0.2.


@property
def qiime_map_fp(self):
"""The QIIME mapping file path of the prep template
Copy link
Member

Choose a reason for hiding this comment

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

This is not really clear, could you rephrase?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

df = df[cols]
out_fp = path_builder("%s_MMF.txt" % prefix)
output_fps.append(out_fp)
if 'run_prefix' in qiime_map:
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't recall from the stack of pull requests that have been coming in, but there are tests for both of these branches? i.e. cases with run_prefix and cases without it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch, there was not. Adding right now.

Copy link
Contributor

Choose a reason for hiding this comment

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

Awesome, thanks!

On (Apr-28-15|17:16), josenavas wrote:

 path_builder = partial(join, out_dir)
  • for prefix, df in pt.groupby('run_prefix'):
  •    df = df[cols]
    
  •    out_fp = path_builder("%s_MMF.txt" % prefix)
    
  •    output_fps.append(out_fp)
    
  • if 'run_prefix' in qiime_map:

Good catch, there was not. Adding right now.


Reply to this email directly or view it on GitHub:
https://github.com/biocore/qiita/pull/1107/files#r29301671

@josenavas
Copy link
Contributor Author

Done, I needed to modify create_qiime_mapping_file to include the reverse linker primer as a controlled column too. Should be ready for another review.

That would mean that we will need to modify the restrictions at some point to include that column to disable some processing. We should discuss this tomorrow, but I don't think it should block the release since we are not using it in the current pipeline.

@ElDeveloper
Copy link
Contributor

It seems like there's some legitimate failures.

@ElDeveloper
Copy link
Contributor

@biocore/qiita-admin is everyone ok with this:

Done, I needed to modify create_qiime_mapping_file to include the reverse linker primer as a controlled column too. Should be ready for another review.

That would mean that we will need to modify the restrictions at some point to include that column to disable some processing. We should discuss this tomorrow, but I don't think it should block the release since we are not using it in the current pipeline.

@antgonza
Copy link
Member

I think this is a real bug as we should be doing this for all sff files that have the reverselinkerprimer ... not sure how difficult/easy is to fix

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling c30dd8c on josenavas:fix-qiita-ware-tests into * on biocore:relax-md-req*.

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling c30dd8c on josenavas:fix-qiita-ware-tests into * on biocore:relax-md-req*.

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling e5ae3e4 on josenavas:fix-qiita-ware-tests into * on biocore:relax-md-req*.

@josenavas
Copy link
Contributor Author

@ElDeveloper that was a complete WTF error hahaha it looks I removed some characters in the code while I was trying to type in another window.

@antgonza we currently do not support this type of processing. Actually, the fact of adding the ReverseLinkerPrimer has generated new QiitaDBWarnings that are going to require me be a bit smarter in the code, as that column is not always required by QIIME.

In my opinion, you're currently biased given the discussions at today's meeting. However, I think that processing should be discussed tomorrow at the meeting, as I don't think that we have time to make it to the release... Additionally, the new issues that you recently added are related to this and they've been added to the beta milestone. I think we can solve it for the alpha 0.2, but I don't think we are going to be able to add it, let's say, in the following 2 hours...

@antgonza
Copy link
Member

That fine, could you create an issue about this and assign it to the next release ?

@josenavas
Copy link
Contributor Author

Done: #1121

@antgonza
Copy link
Member

Thanks! However, there are still errors.

@josenavas
Copy link
Contributor Author

I just pushed the fix for them!!! You're 1 minute faster...

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 6c83ba4 on josenavas:fix-qiita-ware-tests into * on biocore:relax-md-req*.

@ElDeveloper
Copy link
Contributor

Thanks @josenavas

ElDeveloper added a commit that referenced this pull request Apr 29, 2015
@ElDeveloper ElDeveloper merged commit 7390538 into qiita-spots:relax-md-req Apr 29, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants