From 7a70a3ae5e5b8822267337df0073c1efc834cd26 Mon Sep 17 00:00:00 2001 From: Youssef Boulkaid Date: Thu, 29 Sep 2022 09:16:32 +0200 Subject: [PATCH] Unlock Psych dependency (#9135) Merge pull request 9135 --- features/step_definitions.rb | 2 +- jekyll.gemspec | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/features/step_definitions.rb b/features/step_definitions.rb index 9d479ecf..616ab0b6 100644 --- a/features/step_definitions.rb +++ b/features/step_definitions.rb @@ -163,7 +163,7 @@ Given(%r!^I have a configuration file with "(.*)" set to "(.*)"$!) do |key, valu else {} end - config[key] = YAML.load(value) + config[key] = SafeYAML.load(value) Jekyll.set_timezone(value) if key == "timezone" File.write("_config.yml", YAML.dump(config)) end diff --git a/jekyll.gemspec b/jekyll.gemspec index 32560921..3bdd3e3b 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -43,11 +43,6 @@ Gem::Specification.new do |s| s.add_runtime_dependency("liquid", "~> 4.0") s.add_runtime_dependency("mercenary", ">= 0.3.6", "< 0.5") s.add_runtime_dependency("pathutil", "~> 0.9") - - # Ruby 3.1.0 shipped with `psych-4.0.3` which caused some of our Cucumber-based tests to fail. - # TODO: Remove lock once we implement a way to use Psych 4 without breaking anything. - s.add_runtime_dependency("psych", "~> 3.3") - s.add_runtime_dependency("rouge", ">= 3.0", "< 5.0") s.add_runtime_dependency("safe_yaml", "~> 1.0") s.add_runtime_dependency("terminal-table", ">= 1.8", "< 4.0")