Skip to content

Commit

Permalink
Merge branch 'develop' for version 1.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
iimog committed Mar 21, 2017
2 parents 06c7570 + 0200753 commit e6ab96b
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 9 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,9 @@ var biomString = biom.toString();

## Changes

### v1.0.7 <small>(2017-03-21)</small>
- Add 'Table' to cv for type. Improves interoperability with python tool.

### v1.0.6 <small>(2016-12-22)</small>
- Add filter function
- Add norm function
Expand Down
6 changes: 3 additions & 3 deletions build/biom.js

Large diffs are not rendered by default.

Binary file modified build/biom.min.gz.js
Binary file not shown.
2 changes: 1 addition & 1 deletion build/biom.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/biojs-io-biom.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var _ = require('lodash');
* Version
* @type {string} version of this module
*/
var VERSION = exports.VERSION = '1.0.6';
var VERSION = exports.VERSION = '1.0.7';

/**
* Default Biom Object for empty initialization
Expand Down Expand Up @@ -63,7 +63,7 @@ var DEFAULT_BIOM = exports.DEFAULT_BIOM = {
* Controlled vocabulary for the type field of biom objects
* @type {string[]}
*/
var TYPE_CV = exports.TYPE_CV = ['OTU table', 'Pathway table', 'Function table', 'Ortholog table', 'Gene table', 'Metabolite table', 'Taxon table'];
var TYPE_CV = exports.TYPE_CV = ['OTU table', 'Pathway table', 'Function table', 'Ortholog table', 'Gene table', 'Metabolite table', 'Taxon table', 'Table'];

/**
* Controlled vocabulary for the matrix_type field of biom objects
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "biojs-io-biom",
"description": "Parses biom files",
"version": "1.0.6",
"version": "1.0.7",
"homepage": "https://github.com/molbiodiv/biojs-io-biom",
"author": {
"name": "Markus J. Ankenbrand",
Expand Down
5 changes: 3 additions & 2 deletions src/biojs-io-biom.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const _ = require('lodash');
* Version
* @type {string} version of this module
*/
export const VERSION = '1.0.6';
export const VERSION = '1.0.7';

/**
* Default Biom Object for empty initialization
Expand Down Expand Up @@ -58,7 +58,8 @@ export const TYPE_CV = [
'Ortholog table',
'Gene table',
'Metabolite table',
'Taxon table'
'Taxon table',
'Table'
];

/**
Expand Down

0 comments on commit e6ab96b

Please sign in to comment.