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

Develop to master merge, release v5.33.4 #25

Merged
merged 2 commits into from
Nov 27, 2024
Merged

Develop to master merge, release v5.33.4 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e3dc8d
update number of classes to accommodate changes in bro ontology
alexskr Nov 27, 2024
6434e7d
Merge branch 'master' into develop
alexskr Nov 27, 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
8 changes: 4 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ gem 'rake', '~> 10.0'
gem 'redis'

# NCBO
gem 'goo', github: 'ncbo/goo', branch: 'master'
gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'master'
gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'master'
gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master'
gem 'goo', github: 'ncbo/goo', branch: 'develop'
gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'develop'
gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'develop'
gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'develop'

group :development do
gem 'simplecov'
Expand Down
50 changes: 25 additions & 25 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GIT
remote: https://github.com/ncbo/goo.git
revision: f943ac33e87c55c88131c32d826ed5d39c89302c
branch: master
revision: 35721855ba808517698d8b94eb38d4553001c4b6
branch: develop
specs:
goo (0.0.2)
addressable (~> 2.8)
Expand All @@ -16,8 +16,8 @@ GIT

GIT
remote: https://github.com/ncbo/ncbo_annotator.git
revision: 63c986880aa88c9384043e6611a682434a14aba7
branch: master
revision: 11838eb3d3c66bfcbc0fcbd2081e776da121fb8c
branch: develop
specs:
ncbo_annotator (0.0.1)
goo
Expand All @@ -27,8 +27,8 @@ GIT

GIT
remote: https://github.com/ncbo/ontologies_linked_data.git
revision: 9ab4be437ed84f5a480e7f0d8799824fcea310ae
branch: master
revision: 6389fa2052e06ff8e21c64fd1be0030beca4c828
branch: develop
specs:
ontologies_linked_data (0.0.1)
activesupport
Expand All @@ -47,8 +47,8 @@ GIT

GIT
remote: https://github.com/ncbo/sparql-client.git
revision: e89c26aa96f184dbe9b52d51e04fb3d9ba998dbc
branch: master
revision: 1657f0dd69fd4b522d3549a6848670175f5e98cc
branch: develop
specs:
sparql-client (1.0.1)
json_pure (>= 1.4)
Expand All @@ -73,23 +73,23 @@ GEM
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
cube-ruby (0.0.3)
date (3.3.4)
date (3.4.0)
docile (1.4.1)
domain_name (0.6.20240107)
faraday (2.12.0)
faraday-net_http (>= 2.0, < 3.4)
faraday (2.12.1)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-net_http (3.3.0)
net-http
faraday-net_http (3.4.0)
net-http (>= 0.5.0)
ffi (1.17.0-aarch64-linux-gnu)
http-accept (1.7.0)
http-cookie (1.0.7)
domain_name (~> 0.5)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.7.2)
json_pure (2.7.2)
json (2.8.2)
json_pure (2.8.1)
libxml-ruby (5.0.3)
logger (1.6.1)
macaddr (1.7.2)
Expand All @@ -103,14 +103,14 @@ GEM
mime-types (3.6.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2024.1001)
mime-types-data (3.2024.1105)
mini_mime (1.1.5)
minitest (4.7.5)
multi_json (1.15.0)
net-http (0.4.1)
net-http (0.5.0)
uri
net-http-persistent (2.9.4)
net-imap (0.4.16)
net-imap (0.4.18)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -120,19 +120,19 @@ GEM
net-smtp (0.5.0)
net-protocol
netrc (0.11.0)
oj (3.16.6)
oj (3.16.7)
bigdecimal (>= 3.0)
ostruct (>= 0.2)
omni_logger (0.1.4)
logger
ostruct (0.6.0)
ostruct (0.6.1)
pony (1.13.1)
mail (>= 2.0)
pry (0.14.2)
pry (0.15.0)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (6.0.1)
rack (3.1.7)
rack (3.1.8)
rack-test (2.1.0)
rack (>= 1.3)
rake (10.5.0)
Expand All @@ -149,7 +149,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.3.8)
rexml (3.3.9)
rsolr (2.6.0)
builder (>= 2.1.2)
faraday (>= 0.9, < 3, != 2.0.0)
Expand All @@ -166,9 +166,9 @@ GEM
simplecov_json_formatter (0.1.4)
systemu (2.6.5)
thread_safe (0.3.6)
timeout (0.4.1)
timeout (0.4.2)
tzinfo (0.3.62)
uri (0.13.1)
uri (1.0.2)
uuid (2.3.9)
macaddr (~> 1.0)

Expand Down
4 changes: 2 additions & 2 deletions test/evaluators/test_specialization_evaluator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ def test_evaluate

def test_get_number_of_classes
assert_equal(810, @@specialization_evaluator.send(:get_number_of_classes, 'MCCLTEST-0'))
assert_equal(486, @@specialization_evaluator.send(:get_number_of_classes, 'BROTEST-0'))
assert_equal(487, @@specialization_evaluator.send(:get_number_of_classes, 'BROTEST-0'))
assert_equal(436, @@specialization_evaluator.send(:get_number_of_classes, 'ONTOMATEST-0'))
end

end
end