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

Mothur datatypes: fix metadata failure for large count tables #3706

Merged
merged 2 commits into from Mar 6, 2017

Conversation

Projects
None yet
4 participants
@shiltemann
Copy link
Member

commented Mar 3, 2017

No description provided.

@@ -270,7 +270,8 @@ def set_meta(self, dataset, overwrite=True, **kwd):
dataset.metadata.column_names = self.column_names
dataset.metadata.column_types = self.column_types
dataset.metadata.comment_lines = self.comment_lines
dataset.metadata.data_lines -= self.comment_lines
if isinstance(dataset.metadata.datalines, int):

This comment has been minimized.

Copy link
@nsoranzo

nsoranzo Mar 3, 2017

Member

s/datalines/data_lines/ I suppose

@@ -735,7 +736,8 @@ def set_meta(self, dataset, overwrite=True, skip=1, max_data_lines=None, **kwd):
dataset.metadata.groups = colnames[2:]

dataset.metadata.comment_lines = 1
dataset.metadata.data_lines -= 1
if isinstance(dataset.metadata.datalines, int):

This comment has been minimized.

Copy link
@nsoranzo

nsoranzo Mar 3, 2017

Member

Same as above.

@galaxybot galaxybot added the triage label Mar 3, 2017

@galaxybot galaxybot added this to the 17.05 milestone Mar 3, 2017

@shiltemann

This comment has been minimized.

Copy link
Member Author

commented Mar 3, 2017

@jmchilton jmchilton merged commit b769da1 into galaxyproject:dev Mar 6, 2017

4 of 5 checks passed

api test Build finished. 263 tests run, 0 skipped, 1 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 140 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 24 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 580 tests run, 0 skipped, 0 failed.
Details
@jmchilton

This comment has been minimized.

Copy link
Member

commented Mar 6, 2017

Thanks @shiltemann. The failing API test case is unrelated and would have been fixed by #3668.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.