From 32a50c7574b541b92bf9a67c97328699544100c5 Mon Sep 17 00:00:00 2001 From: Gillian Minnehan Date: Wed, 10 Jul 2024 17:50:01 -0400 Subject: [PATCH] Revert "Update ruby (#486)" This reverts commit ec597d6419ae039e13dca64dc75f08e7f6959988. --- .ruby-version | 2 +- Gemfile.lock | 54 +++++++++++++++++++++++------------------------- readme.md | 2 +- requirements.txt | 5 ++--- 4 files changed, 30 insertions(+), 33 deletions(-) diff --git a/.ruby-version b/.ruby-version index acf9bf09d..62ae32d58 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 \ No newline at end of file +2.7.7 \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 3ecd28126..5e3b0ee66 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,22 +11,22 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.3.3) - deep_merge (1.2.2) - em-websocket (0.5.3) + concurrent-ruby (1.1.9) + deep_merge (1.2.1) + em-websocket (0.5.2) eventmachine (>= 0.12.9) - http_parser.rb (~> 0) + http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - execjs (2.9.1) - ffi (1.17.0) + execjs (2.8.1) + ffi (1.15.4) forwardable-extended (2.6.0) - http_parser.rb (0.8.0) - i18n (1.14.5) + http_parser.rb (0.6.0) + i18n (1.8.10) concurrent-ruby (~> 1.0) - jekyll (4.2.2) + jekyll (4.2.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -49,49 +49,47 @@ GEM deep_merge (~> 1.2) jekyll (>= 3.0) jekyll-paginate (1.1.0) - jekyll-sass-converter (2.2.0) + jekyll-sass-converter (2.1.0) sassc (> 2.0.1, < 3.0) jekyll-seo-tag (2.7.1) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) - jekyll-target-blank (2.0.2) + jekyll-target-blank (2.0.0) jekyll (>= 3.0, < 5.0) nokogiri (~> 1.10) jekyll-watch (2.2.1) listen (~> 3.0) - json (2.7.2) - kramdown (2.4.0) + json (2.6.3) + kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.4) - listen (3.9.0) + liquid (4.0.3) + listen (3.7.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - mini_portile2 (2.8.7) - nokogiri (1.16.6) + mini_portile2 (2.8.4) + nokogiri (1.15.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (6.0.0) - racc (1.8.0) - rb-fsevent (0.11.2) - rb-inotify (0.11.1) + public_suffix (4.0.6) + racc (1.7.1) + rb-fsevent (0.11.0) + rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.3.1) - strscan - rouge (3.30.0) + rexml (3.2.5) + rouge (3.26.1) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) - strscan (3.1.0) terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (1.8.0) - webrick (1.8.1) + webrick (1.7.0) PLATFORMS ruby diff --git a/readme.md b/readme.md index 49123c655..5e0adefc7 100644 --- a/readme.md +++ b/readme.md @@ -37,7 +37,7 @@ You can now access the server at [http://0.0.0.0:4000](http://0.0.0.0:4000) You'll need: - Python 3.8 or later -- Ruby 3.2.2 +- Ruby 2.7.7 #### Install Dependencies diff --git a/requirements.txt b/requirements.txt index aec3ba91b..b4c66355e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -# Install a newer version of blockdiag, that's compatible with modern pillow -git+https://github.com/blockdiag/blockdiag.git@refs/pull/179/head -Pillow==10.3.0 +blockdiag +Pillow==9.5.0 funcparserlib==1.0.0a0