From ce6b2077cc7801daef44af25e53272eddf2f8c9a Mon Sep 17 00:00:00 2001 From: Syphax Date: Wed, 30 Oct 2024 11:59:32 +0100 Subject: [PATCH 1/2] fix: docker-compose app volume --- docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2a08a35e..564fc8d2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,7 +49,7 @@ services: - "9393:9393" volumes: # bundle volume for hosting gems installed by bundle; it speeds up gem install in local development - - .:/srv/ontoportal/ontologies_api + - app_api:/srv/ontoportal/ontologies_api - repository:/srv/ontoportal/data/repository ncbo_cron: @@ -199,4 +199,3 @@ volumes: mgrep: logs: history: - From 0eae7ed2f0a7baed4130ec10ec53374a899b7384 Mon Sep 17 00:00:00 2001 From: Syphax Date: Tue, 5 Nov 2024 04:15:42 +0100 Subject: [PATCH 2/2] fix ncbo_ontology_recommender version --- Gemfile | 2 +- Gemfile.lock | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Gemfile b/Gemfile index c4efa29f..5082ef4e 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ gem 'redcarpet' # NCBO gems (can be from a local dev path or from rubygems/git) gem 'ncbo_annotator', git: 'https://github.com/ontoportal-lirmm/ncbo_annotator.git', branch: 'development' gem 'ncbo_cron', git: 'https://github.com/ontoportal-lirmm/ncbo_cron.git', branch: 'master' -gem 'ncbo_ontology_recommender', git: 'https://github.com/ncbo/ncbo_ontology_recommender.git', branch: 'master' +gem 'ncbo_ontology_recommender', git: 'https://github.com/ontoportal-lirmm/ncbo_ontology_recommender.git', branch: 'development' gem 'goo', github: 'ontoportal-lirmm/goo', branch: 'development' gem 'sparql-client', github: 'ontoportal-lirmm/sparql-client', branch: 'development' gem 'ontologies_linked_data', git: 'https://github.com/ontoportal-lirmm/ontologies_linked_data.git', branch: 'development' diff --git a/Gemfile.lock b/Gemfile.lock index 62396ce6..e2a97501 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,3 @@ -GIT - remote: https://github.com/ncbo/ncbo_ontology_recommender.git - revision: 9dbd4f179e42c52095129d353a5ac584e9bd47f3 - branch: master - specs: - ncbo_ontology_recommender (0.0.1) - goo - ncbo_annotator - ontologies_linked_data - redis - GIT remote: https://github.com/ontoportal-lirmm/goo.git revision: f8ac7b00e8d8b46d1eea04de014175525c1cdd83 @@ -40,7 +29,7 @@ GIT GIT remote: https://github.com/ontoportal-lirmm/ncbo_cron.git - revision: bed0ff08408ad1241db3513992ad025a253eeef0 + revision: 37a9573c11978869a867050f8ec75e048c8b9b2b branch: master specs: ncbo_cron (0.0.1) @@ -55,6 +44,17 @@ GIT redis rufus-scheduler (~> 2.0.24) +GIT + remote: https://github.com/ontoportal-lirmm/ncbo_ontology_recommender.git + revision: a0e36c89e6e2f8502cac288df2992625649dad7a + branch: development + specs: + ncbo_ontology_recommender (0.0.1) + goo + ncbo_annotator + ontologies_linked_data + redis + GIT remote: https://github.com/ontoportal-lirmm/ontologies_linked_data.git revision: 312ef426eeaa461e88fa23124ea5fd531f4276ba @@ -138,7 +138,7 @@ GEM rexml cube-ruby (0.0.3) dante (0.2.0) - date (3.3.4) + date (3.4.0) declarative (0.0.20) docile (1.4.1) domain_name (0.6.20240107) @@ -211,7 +211,7 @@ GEM httpclient (2.8.3) i18n (1.14.6) concurrent-ruby (~> 1.0) - json (2.7.5) + json (2.7.6) json-ld (3.0.2) multi_json (~> 1.12) rdf (>= 2.2.8, < 4.0) @@ -262,8 +262,8 @@ GEM net-protocol net-ssh (7.3.0) netrc (0.11.0) - newrelic_rpm (9.14.0) - oj (3.16.6) + newrelic_rpm (9.15.0) + oj (3.16.7) bigdecimal (>= 3.0) ostruct (>= 0.2) omni_logger (0.1.4) @@ -272,7 +272,7 @@ GEM ostruct (0.6.0) parallel (1.26.3) parseconfig (1.1.2) - parser (3.3.5.0) + parser (3.3.5.1) ast (~> 2.4.1) racc pony (1.13.1) @@ -343,7 +343,7 @@ GEM rsolr (2.6.0) builder (>= 2.1.2) faraday (>= 0.9, < 3, != 2.0.0) - rubocop (1.67.0) + rubocop (1.68.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -353,7 +353,7 @@ GEM rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.33.0) + rubocop-ast (1.34.0) parser (>= 3.3.1.0) ruby-progressbar (1.13.0) ruby-xxHash (0.4.0.2) @@ -416,7 +416,7 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.8.2) + webrick (1.9.0) PLATFORMS x86_64-linux