Update dependencies,Travis CI and version.

Update dependencies and version. Travis changes. Update dependencies and version. travis travis
SciRuby · Mar 10, 2016 · 6d047ff · 6d047ff
1 parent c6b2432
commit 6d047ff
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,11 @@
 language:
   ruby
 
-env:
-  - CPLUS_INCLUDE_PATH=/usr/include/atlas C_INCLUDE_PATH=/usr/include/atlas
-
 rvm:
-  - '1.9.3'
   - '2.0'
   - '2.1'
   - '2.2'
+  - '2.3.0'
 
 matrix:
   fast_finish:
@@ -18,11 +15,9 @@ script: "bundle exec rake test"
 
 install:
   - gem install bundler
-  - ./.build.sh
   - bundle install
 
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -qq libatlas-base-dev
   - sudo apt-get install -y libgsl0-dev r-base r-base-dev
   - sudo Rscript -e "install.packages(c('Rserve','irr'),,'http://cran.us.r-project.org')"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,27 +2,11 @@
 
 ## Installing statsample development dependencies
 
-If you want to run the full test suite, you will need the latest unreleased nmatrix and gsl-nmatrix ruby gems. They will be released upstream soon but please follow this procdure for now.
+Keep in mind that either nmatrix OR rb-gsl are NOT NECESSARY for using statsample. They are just required for an optional speed up. 
 
-Keep in mind that either nmatrix OR gsl-nmatrix are NOT NECESSARY for using statsample. They are just required for an optional speed up. 
+Statsample also works with [rb-gsl](https://github.com/sciruby/rb-gsl).
 
-Statsample also works with [rb-gsl](https://github.com/blackwinter/rb-gsl), though installing that will cause a problem if you have any nmatrix dependent code because narray and nmatrix have a namespace problem.
-
-To install dependencies, execute the following commands:
-
-  `export CPLUS_INCLUDE_PATH=/usr/include/atlas` 
-  `export C_INCLUDE_PATH=/usr/include/atlas`
-  `sudo apt-get update -qq`
-  `sudo apt-get install -qq libatlas-base-dev`
-  `sudo apt-get --purge remove liblapack-dev liblapack3 liblapack3gf`
-  `sudo apt-get install -y libgsl0-dev r-base r-base-dev`
-  `sudo Rscript -e "install.packages(c('Rserve','irr'),,'http://cran.us.r-project.org')"`
-
-Then execute the .build.sh script to clone and install the latest nmatrix and gsl-nmatrix on your system:
-
-  `./.build.sh`
-
-Then finally install remaining dependencies:
+Install dependencies:
 
   `bundle install`
 

diff --git a/History.txt b/History.txt
@@ -1,3 +1,6 @@
+=== 2.0.2 / 2016-03-11
+  * Update dependencies.
+
 === 2.0.1 / 2015-08-19
   * Cleaned legacy containers in favor of `Daru::DataFrame` and `Daru::Vector`.
 

diff --git a/lib/statsample/version.rb b/lib/statsample/version.rb
@@ -1,3 +1,3 @@
 module Statsample
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end
diff --git a/statsample.gemspec b/statsample.gemspec
@@ -61,7 +61,7 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
   s.add_runtime_dependency 'daru', '~> 0.1'
-  s.add_runtime_dependency 'spreadsheet', '~> 1.0.3'
+  s.add_runtime_dependency 'spreadsheet', '~> 1.1'
   s.add_runtime_dependency 'reportbuilder', '~> 1.4'
   s.add_runtime_dependency 'minimization', '~> 0.2'
   s.add_runtime_dependency 'dirty-memoize', '~> 0.0.4'
@@ -79,6 +79,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', '~> 5.7'
   s.add_development_dependency 'gettext', '~> 3.1'
   s.add_development_dependency 'mocha', '~> 1.1'
-  s.add_development_dependency 'nmatrix', '~> 0.1.0'
+  s.add_development_dependency 'nmatrix', '~> 0.2.1'
   s.add_development_dependency 'rb-gsl', '~> 1.16'
 end