Skip to content

Conversation

@antgonza
Copy link
Member

@antgonza antgonza commented Oct 6, 2015

This is based on #1481 so that should be merged first.

Here I'm fixing the last standing points in the joy list, so far:

  • Fix Store EBI submission files with the preprocessed data #1479
  • In the template documentation changing that sample description is a required field for Qiita deploy to a requirement for EBI, as this is required for submissions.
  • Removing 2 cfg variables that are not needed anymore with the new EBI system. Today we got a notification that the old system will be out in 2 months.
  • Changes so tests pass in the main branch.

@antgonza antgonza mentioned this pull request Oct 8, 2015
14 tasks
Copy link
Contributor

Choose a reason for hiding this comment

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

Why has this been moved from the sample template to the prep template? IIRC, there was a problem if we had duplicated columns between the sample template and the prep template, and the description was required already in the sample template. Also, I think the description applies to the "biological sample" (i.e. sample template) rather than to the preparation sample.

Copy link
Member Author

Choose a reason for hiding this comment

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

My error, this was meant to be in the required fields for EBI in the sample template, not the prep template, will change.

@ElDeveloper
Copy link
Contributor

I'm having a hard time figuring out what are the specifics that need review in this PR, maybe once #1490 is merged, it will be easier.

@antgonza
Copy link
Member Author

antgonza commented Oct 9, 2015

This is ready for final review. Note that this solves all the open issues in the joy list: #1451. Once this is merged, we just need to fix conflicts between master and the ebi-improvements branch ...

Copy link
Contributor

Choose a reason for hiding this comment

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

Do we still want these tests? Or should they be dropped?

@ElDeveloper
Copy link
Contributor

👍 done with my review!

Copy link
Contributor

Choose a reason for hiding this comment

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

Is it worth using moi's moi.job.system_call function? It does the stdout and stderr parsing for you and it will reduce code in here.

@ElDeveloper
Copy link
Contributor

👍 on my end, @josenavas, please merge once your review comments are addressed 👟

Copy link
Contributor

Choose a reason for hiding this comment

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

I think it may be useful to store the stderr too, in case that something unexpected happens (not only in EBI end)

Copy link
Contributor

Choose a reason for hiding this comment

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

This error message can be improved, as the error is that file is not a demux file.

Copy link
Contributor

Choose a reason for hiding this comment

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

If system_call raises, xml_content is not defined, and stderr doesn't contain the value from such call (it will have the value from the above call to system_call in the loop.

@josenavas
Copy link
Contributor

2 comments and tests are still failing. It looks like now you're installing ascp, so why is that test failing?

@antgonza
Copy link
Member Author

@josenavas this is ready. After your comments I realized that we weren't doing the same for all possible failures in commands.py, which I fixed. Also, fixed some warnings that were left over cause missing instrument_model.

@josenavas
Copy link
Contributor

Thanks @antgonza
awesome work!

josenavas added a commit that referenced this pull request Oct 10, 2015
@josenavas josenavas merged commit 0a47d89 into qiita-spots:ebi-improvements Oct 10, 2015
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