Merge branch 'develop' for version 1.0.4

molbiodiv · Jul 28, 2017 · a86a51d · a86a51d
2 parents a91dccc + 63e8fa9
commit a86a51d
Show file tree

Hide file tree

Showing 12 changed files with 966 additions and 329 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 .idea/
 test/cover
 bower_components
+node_modules/
diff --git a/README.md b/README.md
@@ -56,6 +56,12 @@ api as a webservice to <http://localhost:8080/convert.php> (e.g.
 Changes
 -------
 
+### 1.0.4 (2017-07-28)
+
+-   Switch from bower to yarn
+-   Update dependencies
+-   Update of biojs-io-biom to version 1.0.9
+
 ### 1.0.3 (2017-03-29)
 
 -   Update of biojs-io-biom to version 1.0.7

diff --git a/bower.json b/bower.json
diff --git a/composer.json b/composer.json
@@ -10,8 +10,8 @@
     ],
     "require": {},
     "require-dev": {
-        "phpunit/phpunit": "^5.4",
-        "squizlabs/php_codesniffer": "2.6",
+        "phpunit/phpunit": "^6.2",
+        "squizlabs/php_codesniffer": "3.0",
         "satooshi/php-coveralls": "^1.0",
         "codeclimate/php-test-reporter": "dev-master"
     },