Relax blacklight dependency to fix the build #3177
Conversation
|
Note: I ran the test suite locally on blacklight 6.8 as well as blacklight 6.11. |
|
Is the "workaround" comment still relevant? |
|
@cbeer good catch. I tried but was unable to replicate the bug that comment referenced. The issue did not include any information on how to observe or replicate the bug. I spoke with the reporter and he said he thought it had to do with limiting search results by facets, and getting an ArgumentError. I tried to replicate that with Blacklight 6.11 but didn't get any errors. I'm not sure whether that means the bug is resolved or there was some other requirement to produce the bug. The hyrax commit which closed that issue included some other code which I have not pulled in, since I was unable to replicate. If you or anyone else has ideas on how I might replicate, or whether that additional code would be required regardless, that I'd appreciate your thoughts. In the meantime, I removed the comment. |
|
Changes Unknown when pulling ac29a84 on blacklight-bump into ** on master**. |
|
Changes Unknown when pulling ac29a84 on blacklight-bump into ** on master**. |
|
Changes Unknown when pulling 371b21b on blacklight-bump into ** on master**. |
sufia.gemspec
Outdated
| @@ -23,8 +23,7 @@ Gem::Specification.new do |spec| | |||
| spec.add_dependency 'hydra-head', '>= 10.4.0' | |||
| spec.add_dependency 'hydra-batch-edit', '~> 2.0' | |||
| spec.add_dependency 'browse-everything', '>= 0.10.3' | |||
| # Workaround for https://github.com/projecthydra-labs/hyrax/issues/546 | |||
| spec.add_dependency 'blacklight', '~> 6.6', '< 6.8.0' | |||
| spec.add_dependency 'blacklight', '~> 6.6', '< 7' | |||
There was a problem hiding this comment.
I wonder if the '< 7' is adding anything here. Shouldn't the '~> 6.6' twiddly-wakka be sufficient to keep the version less than 7?
There was a problem hiding this comment.
Yes, you're totally right; holdover from when I was messing around. Thanks for noticing.
hackartisan
force-pushed
the
blacklight-bump
branch
from
371b21b
to
e638df9
Compare
|
Changes Unknown when pulling e638df9 on blacklight-bump into ** on master**. |
|
Changes Unknown when pulling faf86a2 on blacklight-bump into ** on master**. |
|
Hit a flappy spec there for a minute, but now green. |
hackartisan
changed the title
|
So regarding the sufia 7.4 release and rsolr dependencies -- while this this PR suggests that an rsolr 1.0 dependency is too strict for sufia dependencies -- our own app (which I believe was the primary examplar for these recent upgrades), in it's branch to upgrade to sufia 7.4, actually does have something in it's Gemfile restricting to rsolr 1.x. Along with a note from @HackMasterA (who no longer works here at our organization :( ), suggesting that the rsolr 1.x restriction was actually necessary to avoid bugs when upgrading to sufia 7.4. And the rsolr 1.x restriction does not actually prevent bundler dependency resolution. Anyone have any idea what's going on? @HackMasterA? @mjgiarlo? Otherwise, this note serves as a warning to others, you may actually need to lock to rsolr 1.x with sufia 7.4, even though the sufia gemspec does not explicitly mention rsolr, and the sufia 7.4 dependencies may allow rsolr 1.x or 2.x. |
Lower blacklight generators insert an rsolr 1.0 requirement into the Gemfile, which was conflicting with sufia dependencies.
This is backwards compatible, since the issue only affects app generation. I believe this can be released as a point release.
@projecthydra/sufia-code-reviewers