Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relax allowed elasticsearch dependency version #933

Merged
merged 3 commits into from
May 1, 2024
Merged

Relax allowed elasticsearch dependency version #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3985833
Relax allowed `elasticsearch` dependency version
mjankowski Mar 26, 2024
6df8aa4
Update tracer/logger access style
mjankowski Apr 30, 2024
a247d49
Add changelog notes
mjankowski May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

### Changes

* [#933](https://github.com/toptal/chewy/pull/933): Relax allowed `elasticsearch` dependency versions. ([@mjankowski][])

### Bugs Fixed

## 7.5.1 (2024-01-30)
Expand Down
2 changes: 1 addition & 1 deletion chewy.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ['lib']

spec.add_dependency 'activesupport', '>= 5.2' # Remove with major version bump, 8.x
spec.add_dependency 'elasticsearch', '>= 7.12.0', '< 7.14.0'
spec.add_dependency 'elasticsearch', '>= 7.14.0', '< 8'
spec.add_dependency 'elasticsearch-dsl'
spec.metadata['rubygems_mfa_required'] = 'true'
end
4 changes: 2 additions & 2 deletions lib/chewy/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ def initialize
end

def transport_logger=(logger)
Chewy.client.transport.logger = logger
Chewy.client.transport.transport.logger = logger
@transport_logger = logger
end

def transport_tracer=(tracer)
Chewy.client.transport.tracer = tracer
Chewy.client.transport.transport.tracer = tracer
@transport_tracer = tracer
end

Expand Down
4 changes: 2 additions & 2 deletions spec/chewy/config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

specify do
expect { subject.transport_logger = logger }
.to change { Chewy.client.transport.logger }.to(logger)
.to change { Chewy.client.transport.transport.logger }.to(logger)
end
specify do
expect { subject.transport_logger = logger }
Expand All @@ -40,7 +40,7 @@

specify do
expect { subject.transport_tracer = tracer }
.to change { Chewy.client.transport.tracer }.to(tracer)
.to change { Chewy.client.transport.transport.tracer }.to(tracer)
end
specify do
expect { subject.transport_tracer = tracer }
Expand Down