Skip to content

Commit

Permalink
⚙️ Adding derivative_rodeo as dev dependency
Browse files Browse the repository at this point in the history
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
- #219
- #220
  • Loading branch information
jeremyf committed May 24, 2023
1 parent 8fdf56e commit 1011411
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion iiif_print.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 5 additions & 0 deletions spec/test_app_templates/Gemfile.extra
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 1011411

Please sign in to comment.