Skip to content

Commit ea24eb1

Browse files
author
github actions
committed
Squashed 'buildres/csl/csl-locales/' changes from 79c4dba80a..bd8d2dbc85
bd8d2dbc85 Update spec_helper for pull-request testing (#220) ed3fc7c9be Update to Ruby 3.0.0 (#218) git-subtree-dir: buildres/csl/csl-locales git-subtree-split: bd8d2dbc85713b192d426fb02749475df30f0d2c
1 parent bf7344c commit ea24eb1

File tree

3 files changed

+57
-26
lines changed

3 files changed

+57
-26
lines changed

Diff for: Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ruby '2.7.1'
1+
ruby '3.0.0'
22
source 'https://rubygems.org'
33

44
gem 'rake'

Diff for: Gemfile.lock

+54-25
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,85 @@
11
GIT
22
remote: https://github.com/citation-style-language/Sheldon.git
3-
revision: 1962fad73610a3e0b1610e0c24c16669d584196b
3+
revision: 38b6de75ac4dd86d6b3b47c172431e6e44f53ca0
44
specs:
5-
sheldon (1.0.2)
5+
sheldon (1.0.30)
66
citeproc-ruby
77
csl-styles
88
diffy
99
dotenv
10+
erubis (~> 2.7)
11+
faraday
12+
faraday_middleware
13+
git_diff
14+
hashdiff (= 0.3.7)
1015
nokogiri
16+
octokit (~> 4.0)
1117
ostruct
1218
reverse_markdown
1319

1420
GEM
1521
remote: https://rubygems.org/
1622
specs:
23+
addressable (2.7.0)
24+
public_suffix (>= 2.0.2, < 5.0)
1725
citeproc (1.0.10)
1826
namae (~> 1.0)
19-
citeproc-ruby (1.1.12)
27+
citeproc-ruby (1.1.13)
2028
citeproc (~> 1.0, >= 1.0.9)
2129
csl (~> 1.5)
22-
csl (1.5.1)
30+
csl (1.5.2)
2331
namae (~> 1.0)
2432
csl-styles (1.0.1.10)
2533
csl (~> 1.0)
2634
diff-lcs (1.4.4)
2735
diffy (3.4.0)
2836
dotenv (2.7.6)
29-
fuubar (2.5.0)
37+
erubis (2.7.0)
38+
faraday (1.3.0)
39+
faraday-net_http (~> 1.0)
40+
multipart-post (>= 1.2, < 3)
41+
ruby2_keywords
42+
faraday-net_http (1.0.1)
43+
faraday_middleware (1.0.0)
44+
faraday (~> 1.0)
45+
fuubar (2.5.1)
3046
rspec-core (~> 3.0)
3147
ruby-progressbar (~> 1.4)
32-
mini_portile2 (2.4.0)
33-
namae (1.0.1)
34-
nokogiri (1.10.10)
35-
mini_portile2 (~> 2.4.0)
36-
ostruct (0.2.0)
37-
rake (13.0.1)
48+
git_diff (0.4.3)
49+
hashdiff (0.3.7)
50+
mini_portile2 (2.5.0)
51+
multipart-post (2.1.1)
52+
namae (1.0.2)
53+
nokogiri (1.11.1)
54+
mini_portile2 (~> 2.5.0)
55+
racc (~> 1.4)
56+
octokit (4.20.0)
57+
faraday (>= 0.9)
58+
sawyer (~> 0.8.0, >= 0.5.3)
59+
ostruct (0.3.3)
60+
public_suffix (4.0.6)
61+
racc (1.5.2)
62+
rake (13.0.3)
3863
reverse_markdown (2.0.0)
3964
nokogiri
40-
rspec (3.9.0)
41-
rspec-core (~> 3.9.0)
42-
rspec-expectations (~> 3.9.0)
43-
rspec-mocks (~> 3.9.0)
44-
rspec-core (3.9.2)
45-
rspec-support (~> 3.9.3)
46-
rspec-expectations (3.9.2)
65+
rspec (3.10.0)
66+
rspec-core (~> 3.10.0)
67+
rspec-expectations (~> 3.10.0)
68+
rspec-mocks (~> 3.10.0)
69+
rspec-core (3.10.1)
70+
rspec-support (~> 3.10.0)
71+
rspec-expectations (3.10.1)
4772
diff-lcs (>= 1.2.0, < 2.0)
48-
rspec-support (~> 3.9.0)
49-
rspec-mocks (3.9.1)
73+
rspec-support (~> 3.10.0)
74+
rspec-mocks (3.10.2)
5075
diff-lcs (>= 1.2.0, < 2.0)
51-
rspec-support (~> 3.9.0)
52-
rspec-support (3.9.3)
53-
ruby-progressbar (1.10.1)
76+
rspec-support (~> 3.10.0)
77+
rspec-support (3.10.2)
78+
ruby-progressbar (1.11.0)
79+
ruby2_keywords (0.0.4)
80+
sawyer (0.8.2)
81+
addressable (>= 2.3.5)
82+
faraday (> 0.8, < 2.0)
5483

5584
PLATFORMS
5685
ruby
@@ -64,7 +93,7 @@ DEPENDENCIES
6493
sheldon!
6594

6695
RUBY VERSION
67-
ruby 2.7.1
96+
ruby 3.0.0p0
6897

6998
BUNDLED WITH
70-
2.1.4
99+
2.2.3

Diff for: spec/spec_helper.rb

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
require 'json'
33

44
LOCALE_ROOT = File.expand_path('../..', __FILE__)
5+
PULL_REQUEST = File.join(LOCALE_ROOT, 'pull-request')
6+
LOCALE_ROOT = PULL_REQUEST if File.directory?(PULL_REQUEST)
57

68
NO_REGIONS = %w{
79
eu ar la

0 commit comments

Comments
 (0)