Merge branch 'feature/multilingual-support-add-language-request-middl…

…eware' into pr/sync-agroportal-bioportal
ncbo · May 20, 2024 · 9892e98 · 9892e98
2 parents 9ca2500 + 3dc9f9d
commit 9892e98
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -12,7 +12,6 @@ gem 'rake', '~> 10.0'
 gem 'sinatra', '~> 1.0'
 gem 'sinatra-advanced-routes'
 gem 'sinatra-contrib', '~> 1.0'
-gem 'request_store'
 
 # Rack middleware
 gem 'ffi'
@@ -41,6 +40,7 @@ gem 'unicorn-worker-killer'
 gem 'haml', '~> 5.2.2' # pin see https://github.com/ncbo/ontologies_api/pull/107
 gem 'redcarpet'
 
+
 # NCBO gems (can be from a local dev path or from rubygems/git)
 gem 'ncbo_annotator', git: 'https://github.com/ncbo/ncbo_annotator.git', branch: 'master'
 gem 'ncbo_cron', git: 'https://github.com/ncbo/ncbo_cron.git', branch: 'master'
@@ -49,6 +49,7 @@ gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master'
 gem 'goo', github: 'ncbo/goo', branch: 'develop'
 gem 'ontologies_linked_data', github: 'ontoportal-lirmm/ontologies_linked_data', branch: 'pr/sync-agroportal-ncbo'
 
+
 group :development do
   # bcrypt_pbkdf and ed35519 is required for capistrano deployments when using ed25519 keys; see https://github.com/miloserdow/capistrano-deploy/issues/42
   gem 'shotgun', github: 'palexander/shotgun', branch: 'ncbo'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -66,7 +66,7 @@ GIT
 
 GIT
   remote: https://github.com/ontoportal-lirmm/ontologies_linked_data.git
-  revision: 7c5184fc7d3b25b5c9dd54c25f5ea2b1c4951318
+  revision: 67f9e10c03880431590b15ea5b27d2f1fe1354c4
   branch: pr/sync-agroportal-ncbo
   specs:
     ontologies_linked_data (0.0.1)
@@ -114,7 +114,9 @@ GEM
     backports (3.25.0)
     base64 (0.2.0)
     bcrypt (3.1.20)
-    bcrypt_pbkdf (1.1.0)
+    bcrypt_pbkdf (1.1.1)
+    bcrypt_pbkdf (1.1.1-arm64-darwin)
+    bcrypt_pbkdf (1.1.1-x86_64-darwin)
     bigdecimal (1.4.2)
     builder (3.2.4)
     capistrano (3.18.1)
@@ -173,6 +175,7 @@ GEM
     google-cloud-env (2.1.1)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.4.0)
+    google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-arm64-darwin)
     google-protobuf (3.25.3-x86_64-darwin)
     google-protobuf (3.25.3-x86_64-linux)
@@ -189,6 +192,9 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
+    grpc (1.63.0-aarch64-linux)
+      google-protobuf (~> 3.25)
+      googleapis-common-protos-types (~> 1.0)
     grpc (1.63.0-arm64-darwin)
       google-protobuf (~> 3.25)
       googleapis-common-protos-types (~> 1.0)
@@ -267,7 +273,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.5)
-    racc (1.7.3)
+    racc (1.8.0)
     rack (1.6.13)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -283,7 +289,7 @@ GEM
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
-    rack-timeout (0.6.3)
+    rack-timeout (0.7.0)
     rainbow (3.1.1)
     raindrops (0.20.1)
     rake (10.5.0)
@@ -386,6 +392,7 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
+  aarch64-linux
   arm64-darwin-22
   arm64-darwin-23
   x86_64-darwin-18
@@ -430,7 +437,6 @@ DEPENDENCIES
   redis
   redis-rack-cache (~> 2.0)
   redis-store (~> 1.10)
-  request_store
   rubocop
   shotgun!
   simplecov

diff --git a/test/controllers/test_classes_controller.rb b/test/controllers/test_classes_controller.rb
@@ -8,8 +8,7 @@ def self.before_suite
                submissions_to_process: [1, 2],
                process_submission: true,
                random_submission_count: false,
-               process_options: {process_rdf: true, extract_metadata: false},
-               file_path: "./test/data/ontology_files/BRO_v3.2.owl",
+               process_options: {process_rdf: true, extract_metadata: false}
     }
     return LinkedData::SampleData::Ontology.create_ontologies_and_submissions(options)
   end