Skip to content

Commit bfa243b

Browse files
committed
Update Ruby to 3.3 and fix dependencies accordingly
Starting with version 3.19.3, html-proofer removes its dependency on the end-of-life nokogumbo library and replaces it with nokogirl. gjtorikian/html-proofer#660 Front_matter_parser 1.0.1 fixes an error with newer versios of Ruby https://github.com/waiting-for-dev/front_matter_parser/blob/main/CHANGELOG.md#101---2021-07-20 The base64 and csv gems will no longer be included with Ruby, so add to Gemfile to ensure they will be installed Update bundler to fix up some warnings/errors and update the rest of the packages Update to Ruby 3.3 Ruby 3.0 will no longer be supported as of 2024-03-31, so let's get it upgraded. research.rb and teaching.rb are included in this changeset because they were using File.exists, which is invalid syntax as of Ruby 3.2 ignore env helper files
1 parent 57f12f7 commit bfa243b

File tree

7 files changed

+117
-70
lines changed

7 files changed

+117
-70
lines changed

.github/workflows/build-site.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: install ruby
1919
uses: ruby/setup-ruby@v1
2020
with:
21-
ruby-version: '3.0'
21+
ruby-version: '3.3.0'
2222
bundler-cache: true
2323
- name: run deploy script
2424
env:

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@
66
*.Rproj
77
*.Rhistory
88
.DS_Store
9+
10+
.envrc
11+
.env

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.3.0

Gemfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
source "https://rubygems.org"
2-
ruby RUBY_VERSION
2+
ruby file: ".ruby-version"
33

4+
gem "base64"
5+
gem "csv"
46
gem "jekyll", ">=3.3.1"
5-
gem "html-proofer"
6-
gem "front_matter_parser"
7+
gem "html-proofer", ">=3.19.3"
8+
gem "front_matter_parser", ">=1.0.1"
79
gem "kramdown"
810
gem "kramdown-parser-gfm"
911
gem "rake"

Gemfile.lock

Lines changed: 105 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,153 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.7.0)
5-
public_suffix (>= 2.0.2, < 5.0)
4+
Ascii85 (1.1.0)
5+
addressable (2.8.6)
6+
public_suffix (>= 2.0.2, < 6.0)
7+
afm (0.2.2)
8+
async (2.10.1)
9+
console (~> 1.10)
10+
fiber-annotation
11+
io-event (~> 1.5, >= 1.5.1)
12+
timers (~> 4.1)
13+
base64 (0.2.0)
14+
bigdecimal (3.1.7)
615
colorator (1.1.0)
7-
concurrent-ruby (1.1.8)
8-
em-websocket (0.5.2)
16+
concurrent-ruby (1.2.3)
17+
console (1.23.6)
18+
fiber-annotation
19+
fiber-local
20+
json
21+
csv (3.3.0)
22+
em-websocket (0.5.3)
923
eventmachine (>= 0.12.9)
10-
http_parser.rb (~> 0.6.0)
11-
ethon (0.14.0)
24+
http_parser.rb (~> 0)
25+
ethon (0.16.0)
1226
ffi (>= 1.15.0)
1327
eventmachine (1.2.7)
14-
faraday (1.4.1)
15-
faraday-excon (~> 1.1)
16-
faraday-net_http (~> 1.0)
17-
faraday-net_http_persistent (~> 1.1)
18-
multipart-post (>= 1.2, < 3)
19-
ruby2_keywords (>= 0.0.4)
20-
faraday-excon (1.1.0)
21-
faraday-net_http (1.0.1)
22-
faraday-net_http_persistent (1.1.0)
23-
ffi (1.15.0)
28+
faraday (2.9.0)
29+
faraday-net_http (>= 2.0, < 3.2)
30+
faraday-net_http (3.1.0)
31+
net-http
32+
ffi (1.16.3)
33+
fiber-annotation (0.2.0)
34+
fiber-local (1.0.0)
2435
forwardable-extended (2.6.0)
25-
front_matter_parser (1.0.0)
26-
html-proofer (3.19.1)
36+
front_matter_parser (1.0.1)
37+
google-protobuf (4.26.1-arm64-darwin)
38+
rake (>= 13)
39+
google-protobuf (4.26.1-x86_64-darwin)
40+
rake (>= 13)
41+
google-protobuf (4.26.1-x86_64-linux)
42+
rake (>= 13)
43+
hashery (2.1.2)
44+
html-proofer (5.0.8)
2745
addressable (~> 2.3)
28-
mercenary (~> 0.3)
29-
nokogumbo (~> 2.0)
30-
parallel (~> 1.3)
46+
async (~> 2.1)
47+
nokogiri (~> 1.13)
48+
pdf-reader (~> 2.11)
3149
rainbow (~> 3.0)
3250
typhoeus (~> 1.3)
3351
yell (~> 2.0)
34-
http_parser.rb (0.6.0)
35-
i18n (1.8.10)
52+
zeitwerk (~> 2.5)
53+
http_parser.rb (0.8.0)
54+
i18n (1.14.4)
3655
concurrent-ruby (~> 1.0)
37-
jekyll (4.2.0)
56+
io-event (1.5.1)
57+
jekyll (4.3.3)
3858
addressable (~> 2.4)
3959
colorator (~> 1.0)
4060
em-websocket (~> 0.5)
4161
i18n (~> 1.0)
42-
jekyll-sass-converter (~> 2.0)
62+
jekyll-sass-converter (>= 2.0, < 4.0)
4363
jekyll-watch (~> 2.0)
44-
kramdown (~> 2.3)
64+
kramdown (~> 2.3, >= 2.3.1)
4565
kramdown-parser-gfm (~> 1.0)
4666
liquid (~> 4.0)
47-
mercenary (~> 0.4.0)
67+
mercenary (>= 0.3.6, < 0.5)
4868
pathutil (~> 0.9)
49-
rouge (~> 3.0)
69+
rouge (>= 3.0, < 5.0)
5070
safe_yaml (~> 1.0)
51-
terminal-table (~> 2.0)
71+
terminal-table (>= 1.8, < 4.0)
72+
webrick (~> 1.7)
5273
jekyll-paginate (1.1.0)
53-
jekyll-sass-converter (2.1.0)
54-
sassc (> 2.0.1, < 3.0)
74+
jekyll-sass-converter (3.0.0)
75+
sass-embedded (~> 1.54)
5576
jekyll-watch (2.2.1)
5677
listen (~> 3.0)
57-
kramdown (2.3.1)
78+
json (2.7.1)
79+
kramdown (2.4.0)
5880
rexml
5981
kramdown-parser-gfm (1.1.0)
6082
kramdown (~> 2.0)
61-
liquid (4.0.3)
62-
listen (3.5.1)
83+
liquid (4.0.4)
84+
listen (3.9.0)
6385
rb-fsevent (~> 0.10, >= 0.10.3)
6486
rb-inotify (~> 0.9, >= 0.9.10)
6587
mercenary (0.4.0)
66-
multipart-post (2.1.1)
67-
nokogiri (1.11.3-x86_64-darwin)
88+
net-http (0.4.1)
89+
uri
90+
nokogiri (1.16.3-arm64-darwin)
6891
racc (~> 1.4)
69-
nokogiri (1.11.3-x86_64-linux)
92+
nokogiri (1.16.3-x86_64-darwin)
7093
racc (~> 1.4)
71-
nokogumbo (2.0.5)
72-
nokogiri (~> 1.8, >= 1.8.4)
73-
octokit (4.21.0)
74-
faraday (>= 0.9)
75-
sawyer (~> 0.8.0, >= 0.5.3)
76-
parallel (1.20.1)
94+
nokogiri (1.16.3-x86_64-linux)
95+
racc (~> 1.4)
96+
octokit (8.1.0)
97+
base64
98+
faraday (>= 1, < 3)
99+
sawyer (~> 0.9)
77100
pathutil (0.16.2)
78101
forwardable-extended (~> 2.6)
79-
public_suffix (4.0.6)
80-
racc (1.5.2)
81-
rainbow (3.0.0)
82-
rake (13.0.3)
83-
rb-fsevent (0.10.4)
102+
pdf-reader (2.12.0)
103+
Ascii85 (~> 1.0)
104+
afm (~> 0.2.1)
105+
hashery (~> 2.0)
106+
ruby-rc4
107+
ttfunk
108+
public_suffix (5.0.4)
109+
racc (1.7.3)
110+
rainbow (3.1.1)
111+
rake (13.1.0)
112+
rb-fsevent (0.11.2)
84113
rb-inotify (0.10.1)
85114
ffi (~> 1.0)
86-
rexml (3.2.5)
87-
rouge (3.26.0)
88-
ruby2_keywords (0.0.4)
115+
rexml (3.2.6)
116+
rouge (4.2.1)
117+
ruby-rc4 (0.1.5)
89118
safe_yaml (1.0.5)
90-
sassc (2.4.0)
91-
ffi (~> 1.9)
92-
sawyer (0.8.2)
119+
sass-embedded (1.72.0-arm64-darwin)
120+
google-protobuf (>= 3.25, < 5.0)
121+
sass-embedded (1.72.0-x86_64-darwin)
122+
google-protobuf (>= 3.25, < 5.0)
123+
sass-embedded (1.72.0-x86_64-linux-gnu)
124+
google-protobuf (>= 3.25, < 5.0)
125+
sawyer (0.9.2)
93126
addressable (>= 2.3.5)
94-
faraday (> 0.8, < 2.0)
95-
terminal-table (2.0.0)
96-
unicode-display_width (~> 1.1, >= 1.1.1)
97-
typhoeus (1.4.0)
127+
faraday (>= 0.17.3, < 3)
128+
terminal-table (3.0.2)
129+
unicode-display_width (>= 1.1.1, < 3)
130+
timers (4.3.5)
131+
ttfunk (1.8.0)
132+
bigdecimal (~> 3.1)
133+
typhoeus (1.4.1)
98134
ethon (>= 0.9.0)
99-
unicode-display_width (1.7.0)
100-
webrick (1.7.0)
135+
unicode-display_width (2.5.0)
136+
uri (0.13.0)
137+
webrick (1.8.1)
101138
yell (2.2.2)
139+
zeitwerk (2.6.13)
102140

103141
PLATFORMS
142+
arm64-darwin-23
104143
x86_64-darwin-20
105144
x86_64-linux
106145

107146
DEPENDENCIES
108-
front_matter_parser
109-
html-proofer
147+
base64
148+
csv
149+
front_matter_parser (>= 1.0.1)
150+
html-proofer (>= 3.19.3)
110151
jekyll (>= 3.3.1)
111152
jekyll-paginate
112153
kramdown
@@ -116,7 +157,7 @@ DEPENDENCIES
116157
webrick (~> 1.7)
117158

118159
RUBY VERSION
119-
ruby 3.0.2p107
160+
ruby 3.3.0p0
120161

121162
BUNDLED WITH
122-
2.2.17
163+
2.5.7

_plugins/research.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class ResearchGen < Jekyll::Generator
88
def generate(site)
99
repo_data = {}
1010
data_file = File.join('_data', 'repositories.yml')
11-
if File.exists? data_file
11+
if File.exist? data_file
1212
repo_data = YAML.load_file(data_file)
1313
end
1414
research_files = Dir.glob(File.join('_research', '*.md'))

_plugins/teaching.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class TeachingGen < Jekyll::Generator
88
def generate(site)
99
repo_data = {}
1010
data_file = File.join('_data', 'repositories.yml')
11-
if File.exists? data_file
11+
if File.exist? data_file
1212
repo_data = YAML.load_file(data_file)
1313
end
1414
teaching_files = Dir.glob(File.join('_teaching', '*.md'))

0 commit comments

Comments
 (0)