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 #1693 #1742

Merged
merged 4 commits into from
Apr 3, 2016
Merged

fix #1693 #1742

merged 4 commits into from
Apr 3, 2016

Conversation

antgonza
Copy link
Member

@antgonza antgonza commented Apr 2, 2016

No description provided.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 82.742% when pulling 354097b on antgonza:fix-1693 into d5c8d1c on biocore:master.

@@ -1011,6 +1011,10 @@ def _build_mapping_file(self, samples, rename_dup_samples=False):
samps = set(samps) - all_ids
all_ids.update(samps)

# appending the study title
qm['qiita_study_title'] = qdb.artifact.Artifact(
Copy link
Member

Choose a reason for hiding this comment

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

Historically (I think) the name of the column has varied from title to study_title, etc, do we want to add yet another column name? I think the answer maybe is yes, because some studies have a legacy title column that is inaccurate right?

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct. Basically, this way we make sure that legacy and new ones have it. Also the reason I prepended with qiita_

@ElDeveloper
Copy link
Member

👍 looks good, just one small question that shouldn't be blocking.

@antgonza
Copy link
Member Author

antgonza commented Apr 3, 2016

After going over the issues I realized that a few extra minor changes will also fix #1395 so decided to add them. Note that the delete of the prep template also had a small bug that is being fixed here.

@@ -1011,6 +1011,18 @@ def _build_mapping_file(self, samples, rename_dup_samples=False):
samps = set(samps) - all_ids
all_ids.update(samps)

# appending study metadata to the analsis
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo in comment

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixing.

@wasade
Copy link
Contributor

wasade commented Apr 3, 2016

Two small comments

qm['qiita_owner'] = '%s (%s)' % (study_owner.info['name'],
study_owner.email)
qm['qiita_principal_investigator'] = '%s (%s)' % (
pi.name, pi.email)
Copy link
Member

Choose a reason for hiding this comment

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

If we include the email, then we are absolutely including the @ symbol, which is an unsupported character as per the QIIME mapping file description, I think this is fine with just the PI's name.

Copy link
Member Author

Choose a reason for hiding this comment

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

Excellent point, removing.

@ElDeveloper
Copy link
Member

👍 ready for merge once tests pass.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 82.737% when pulling 0be11dc on antgonza:fix-1693 into d5c8d1c on biocore:master.

@ElDeveloper ElDeveloper merged commit 0183cb1 into qiita-spots:master Apr 3, 2016
@ackermag
Copy link

ackermag commented Apr 4, 2016

so delete is available?

@antgonza
Copy link
Member Author

antgonza commented Apr 4, 2016

Yup, note that I just realized that it's blocking; will need to fix that.

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

5 participants