Merge branch 'develop' for version 1.0.7

molbiodiv · Mar 21, 2017 · e6ab96b · e6ab96b
2 parents 06c7570 + 0200753
commit e6ab96b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -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

diff --git a/build/biom.js b/build/biom.js
diff --git a/build/biom.min.gz.js b/build/biom.min.gz.js
diff --git a/build/biom.min.js b/build/biom.min.js
diff --git a/lib/biojs-io-biom.js b/lib/biojs-io-biom.js
@@ -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
@@ -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

diff --git a/package.json b/package.json
@@ -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",

diff --git a/src/biojs-io-biom.js b/src/biojs-io-biom.js
@@ -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
@@ -58,7 +58,8 @@ export const TYPE_CV = [
     'Ortholog table',
     'Gene table',
     'Metabolite table',
-    'Taxon table'
+    'Taxon table',
+    'Table'
 ];
 
 /**