From 1011411954c54183a51e72769366227ce79e0975 Mon Sep 17 00:00:00 2001 From: Jeremy Friesen Date: Wed, 24 May 2023 11:51:36 -0400 Subject: [PATCH] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Adding=20derivative=5Frode?= =?UTF-8?q?o=20as=20dev=20dependency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Why as a development dependency? Because the DerivativeRodeo introduces a dependency on Faraday >= 1. And the Valkyrie and ActiveFedora versions which Hyrax 2 and 3 depend on have a Faraday dependency of < 1. I am pushing this up so that I can begin development on the ingest aspect of the Derivative Rodeo. Also to see how this resolves in our CI setup and to see the impact, if any on downstream implementations of IIIF Print (e.g. Adventist, British Library, ATLA, PALNI/PALCI, UTK, and others). The plan is to determine if we want to have this Faraday conflict setup or if we want to swap out something else in the underlying DerivativeRodeo. Related to: - https://github.com/scientist-softserv/adventist-dl/issues/330 - https://github.com/scientist-softserv/iiif_print/issues/219 - https://github.com/scientist-softserv/iiif_print/issues/220 --- Gemfile | 3 +++ iiif_print.gemspec | 3 ++- spec/test_app_templates/Gemfile.extra | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 spec/test_app_templates/Gemfile.extra diff --git a/Gemfile b/Gemfile index 947e95aa..235bbc52 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,9 @@ source 'https://rubygems.org' gemspec group :development, :test do + gem 'derivative_rodeo', git: "https://github.com/scientist-softserv/derivative_rodeo.git", branch: "main" + gem 'active-fedora', git: "https://github.com/scientist-softserv/active_fedora.git", branch: "13.3.x-loosening-faraday-requirements" + gem 'valkyrie', git: "https://github.com/scientist-softserv/valkyrie.git", branch: "loosening-faraday-requirements" gem 'coveralls', require: false end diff --git a/iiif_print.gemspec b/iiif_print.gemspec index be98c129..8f2d9678 100644 --- a/iiif_print.gemspec +++ b/iiif_print.gemspec @@ -32,12 +32,13 @@ SUMMARY spec.add_development_dependency 'bixby' spec.add_development_dependency 'database_cleaner', '~> 1.3' + spec.add_development_dependency 'derivative_rodeo' spec.add_development_dependency 'engine_cart', '~> 2.2' spec.add_development_dependency "factory_bot", '~> 4.4' spec.add_development_dependency 'fcrepo_wrapper', '~> 0.5', '>= 0.5.1' spec.add_development_dependency 'newspaper_works_fixtures', '~> 0.3', '>=0.3.1' spec.add_development_dependency 'rails-controller-testing', '~> 1' - spec.add_development_dependency 'rspec-rails', '~> 3.1' + spec.add_development_dependency 'rspec-rails' spec.add_development_dependency 'rspec-activemodel-mocks' spec.add_development_dependency 'shoulda-matchers', '~> 3.1' spec.add_development_dependency 'solr_wrapper', '>= 1.1', '< 3.0' diff --git a/spec/test_app_templates/Gemfile.extra b/spec/test_app_templates/Gemfile.extra new file mode 100644 index 00000000..e329b23e --- /dev/null +++ b/spec/test_app_templates/Gemfile.extra @@ -0,0 +1,5 @@ +group :development, :test do + gem 'derivative_rodeo', git: "https://github.com/scientist-softserv/derivative_rodeo.git", branch: "main" + gem 'active-fedora', git: "https://github.com/scientist-softserv/active_fedora.git", branch: "13.3.x-loosening-faraday-requirements" + gem 'valkyrie', git: "https://github.com/scientist-softserv/valkyrie.git", branch: "loosening-faraday-requirements" +end \ No newline at end of file