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 #1913 #2056

Merged
merged 4 commits into from
Jan 24, 2017
Merged

fix #1913 #2056

merged 4 commits into from
Jan 24, 2017

Conversation

antgonza
Copy link
Member

@antgonza antgonza commented Jan 21, 2017

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.07%) to 91.468% when pulling e006e20 on antgonza:fix-1913 into 599bcde on biocore:master.

Copy link
Contributor

@josenavas josenavas left a comment

Choose a reason for hiding this comment

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

Just one comment/question.

@@ -132,12 +116,30 @@ def load_template_to_dataframe(fn, strip_whitespace=True, index='sample_name'):
holdfile.insert(0, "%s\n" % '\t'.join(headers))
# The QIIME parser fixes the index and removes the #
index = 'SampleID'
else:
Copy link
Contributor

Choose a reason for hiding this comment

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

Any reason why these checks are done only if the file is not a mapping file? Note that users can upload a QIIME mapping file instead of sample + prep information, so I think it is better if these checks are always executed (as they're before).

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.07%) to 91.466% when pulling dfe2e83 on antgonza:fix-1913 into 599bcde on biocore:master.

@josenavas josenavas merged commit 15fcceb into qiita-spots:master Jan 24, 2017
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