Skip to content

Commit 8ca8ad9

Browse files
authored
Gem update (#533)
* update gemspec and travis * update for latest ruby * rubocopping
1 parent 81a6d69 commit 8ca8ad9

File tree

10 files changed

+85
-87
lines changed

10 files changed

+85
-87
lines changed

.travis.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ language:
22
ruby
33

44
rvm:
5-
- '2.0'
6-
- '2.1'
7-
- '2.2'
8-
- '2.3.0'
9-
- '2.4.0'
5+
- '2.5.1'
6+
- '2.7.1'
107

118
matrix:
129
allow_failures:
@@ -22,10 +19,7 @@ script:
2219
- bundle exec yard-junk
2320

2421
install:
25-
- if [ $TRAVIS_RUBY_VERSION == '2.2' ] || [ $TRAVIS_RUBY_VERSION == '2.1' ] || [ $TRAVIS_RUBY_VERSION == '2.0' ];
26-
then gem install bundler -v '~> 1.6';
27-
else gem install bundler;
28-
fi
22+
- gem install bundler
2923
- gem install rainbow -v '2.2.1'
3024
- bundle install
3125

daru.gemspec

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ Gem::Specification.new do |spec|
2727
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
2828
spec.require_paths = ["lib"]
2929

30-
spec.add_runtime_dependency 'backports'
31-
3230
# it is required by NMatrix, yet we want to specify clearly which minimal version is OK
33-
spec.add_runtime_dependency 'packable', '~> 1.3.9'
31+
spec.add_runtime_dependency 'packable', '~> 1.3.13'
3432

3533
spec.add_development_dependency 'spreadsheet', '~> 1.1.1'
3634
spec.add_development_dependency 'bundler', '>= 1.10'
@@ -47,23 +45,17 @@ Gem::Specification.new do |spec|
4745
spec.add_development_dependency 'gsl', '~>2.1.0.2'
4846
spec.add_development_dependency 'dbd-sqlite3'
4947
spec.add_development_dependency 'dbi'
50-
spec.add_development_dependency 'activerecord', '~> 4.0'
48+
spec.add_development_dependency 'activerecord', '~> 6.0'
5149
spec.add_development_dependency 'mechanize'
5250
# issue : https://github.com/SciRuby/daru/issues/493 occured
5351
# with latest version of sqlite3
54-
spec.add_development_dependency 'sqlite3', '~> 1.3.13'
52+
spec.add_development_dependency 'sqlite3'
5553
spec.add_development_dependency 'rubocop', '~> 0.49.0'
5654
spec.add_development_dependency 'ruby-prof'
5755
spec.add_development_dependency 'simplecov'
5856
spec.add_development_dependency 'gruff'
5957
spec.add_development_dependency 'webmock'
6058

61-
if RUBY_VERSION < '2.1.0'
62-
spec.add_development_dependency 'nokogiri', '<= 1.6.8.1'
63-
else
64-
spec.add_development_dependency 'nokogiri'
65-
end
66-
if RUBY_VERSION >= '2.2.5'
67-
spec.add_development_dependency 'guard-rspec'
68-
end
59+
spec.add_development_dependency 'nokogiri'
60+
spec.add_development_dependency 'guard-rspec'
6961
end

lib/daru.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ def jruby?
55
# :nocov:
66

77
module Daru
8-
98
DAYS_OF_WEEK = {
109
'SUN' => 0,
1110
'MON' => 1,
@@ -96,7 +95,6 @@ def error msg
9695
require 'daru/version.rb'
9796

9897
require 'open-uri'
99-
require 'backports/2.1.0/array/to_h'
10098

10199
require 'daru/index/index.rb'
102100
require 'daru/index/multi_index.rb'

lib/daru/configuration.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
module Daru
22
# Defines constants and methods related to configuration
33
module Configuration
4-
54
INSPECT_OPTIONS_KEYS = [
65
:max_rows,
7-
86
# Terminal
9-
:spacing,
10-
]
7+
:spacing
8+
].freeze
119

1210
# Jupyter
1311
DEFAULT_MAX_ROWS = 30

lib/daru/dataframe.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2122,7 +2122,7 @@ def to_h
21222122
end
21232123

21242124
# Convert to html for IRuby.
2125-
def to_html(threshold = Daru.max_rows)
2125+
def to_html(threshold=Daru.max_rows)
21262126
table_thead = to_html_thead
21272127
table_tbody = to_html_tbody(threshold)
21282128
path = if index.is_a?(MultiIndex)
@@ -2143,7 +2143,7 @@ def to_html_thead
21432143
ERB.new(File.read(table_thead_path).strip).result(binding)
21442144
end
21452145

2146-
def to_html_tbody(threshold = Daru.max_rows)
2146+
def to_html_tbody(threshold=Daru.max_rows)
21472147
threshold ||= @size
21482148
table_tbody_path =
21492149
if index.is_a?(MultiIndex)

spec/core/merge_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
expect(@left.join(@right, how: :outer, on: [:name])).to eq(answer)
113113
end
114114

115-
it "performs a left outer join", focus: true do
115+
it "performs a left outer join" do
116116
answer = Daru::DataFrame.new({
117117
:id_1 => [2,3,1,4],
118118
:name => ["Monkey", "Ninja", "Pirate", "Spaghetti"],

spec/dataframe_spec.rb

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4037,6 +4037,21 @@ def create_test(*args, &_proc)
40374037
| 12 1 1 1
40384038
| 13 1 1 1
40394039
| 14 1 1 1
4040+
| 15 1 1 1
4041+
| 16 1 1 1
4042+
| 17 1 1 1
4043+
| 18 1 1 1
4044+
| 19 1 1 1
4045+
| 20 1 1 1
4046+
| 21 1 1 1
4047+
| 22 1 1 1
4048+
| 23 1 1 1
4049+
| 24 1 1 1
4050+
| 25 1 1 1
4051+
| 26 1 1 1
4052+
| 27 1 1 1
4053+
| 28 1 1 1
4054+
| 29 1 1 1
40404055
| ... ... ... ...
40414056
}.unindent}
40424057
end

spec/fixtures/matrix_test.csv

Lines changed: 55 additions & 55 deletions
Large diffs are not rendered by default.

spec/io/io_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# -*- coding: utf-8 -*-
12
describe Daru::IO do
23
describe Daru::DataFrame do
34
context ".from_csv" do

spec/maths/arithmetic/dataframe_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
end
114114
end
115115

116-
context "#round", focus: true do
116+
context "#round" do
117117
it "rounds to precision" do
118118
df = Daru::DataFrame.new({
119119
a: [1.3434,2.4332,5.6655,12.3344,32.233],

0 commit comments

Comments
 (0)