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

Metadata object #93

Merged
merged 21 commits into from
Jun 18, 2014
Merged

Metadata object #93

merged 21 commits into from
Jun 18, 2014

Conversation

josenavas
Copy link
Contributor

Aaaaand the last important object is in!! I was struggling with a couple of errors and a merge conflict, but it is finally here!!

The whole idea of the Sample/Prep templates objects is to behave as a dict of dicts, in which the first level of keys are the sample ids and the second one are the metadata category headers.

Anyone available to review this??

@coveralls
Copy link

Coverage Status

Coverage increased (+8.71%) when pulling 743349a on josenavas:metadata into d08c7dc on biocore:master.

@josenavas
Copy link
Contributor Author

Yay!!! Test passed and our coverage is in green!! 91%!!!


def __eq__(self, other):
r"""Self and other are equal based on type and ids"""
if type(self) != type(other):
Copy link
Member

Choose a reason for hiding this comment

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

I think isinstance would work great here.

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

@ElDeveloper
Copy link
Member

Couple of minor comments, excited to try this out!

@josenavas
Copy link
Contributor Author

Thanks @ElDeveloper !!
I think I've addressed all your comments

@rob-knight
Copy link

Congratulations!

On Jun 17, 2014, at 8:23 PM, "josenavas" <notifications@github.commailto:notifications@github.com> wrote:

Aaaaand the last important object is in!! I was struggling with a couple of errors and a merge conflict, but it is finally here!!

The whole idea of the Sample/Prep templates objects is to behave as a dict of dicts, in which the first level of keys are the sample ids and the second one are the metadata category headers.

Anyone available to review this??


You can merge this Pull Request by running

git pull https://github.com/josenavas/QiiTa metadata

Or view, comment on, or merge it at:

#93

Commit Summary

  • Initial changes
  • Merge branch 'master' of github.com:qiime/QiiTa into metadata
  • Fixing documentation format
  • Skeletonize tests
  • Merge branch 'master' of github.com:qiime/QiiTa into metadata
  • Merge branch 'master' of github.com:qiime/QiiTa into metadata
  • Adding pandas as a dependency
  • Adding a bit more code
  • Merge branch 'master' of github.com:qiime/QiiTa into metadata
  • Adding a bit more code
  • Solving merge conflicts
  • Create function and mapping functions stubbed
  • Finishing up the MetadataTemplate and related objects. Yayyyy
  • Cleaning up env
  • Fixing environment cleanup
  • I hate merge conflicts so much! grrrrr

File Changes

Patch Links:


Reply to this email directly or view it on GitHubhttps://github.com//pull/93.

@teravest
Copy link
Contributor

👍 after tests pass

teravest added a commit that referenced this pull request Jun 18, 2014
@teravest teravest merged commit ef03929 into qiita-spots:master Jun 18, 2014
@coveralls
Copy link

Coverage Status

Coverage increased (+8.56%) when pulling f657a1e on josenavas:metadata into f505bf0 on biocore:master.

@josenavas josenavas deleted the metadata branch June 21, 2014 04:10
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