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

Feature/add MOD metadata to submission object #175

Merged
merged 12 commits into from
Mar 7, 2025
Merged

Feature/add MOD metadata to submission object #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6175af0
Merge pull request #172 from ncbo/develop
alexskr Nov 26, 2024
e50ca26
reset branch specifier to master
alexskr Nov 27, 2024
78e6e0d
Gemfile.lock update
alexskr Nov 27, 2024
1e4882b
Merge pull request #8 from ncbo/master
alexskr Dec 4, 2024
59dd535
use the new ontologies_linked_data model
syphax-bouazzouni Feb 19, 2025
0b0ea40
fix ruby version issue
syphax-bouazzouni Feb 19, 2025
bc3f2b0
update populate_from_params helper to support URI attributes
syphax-bouazzouni Feb 19, 2025
69cda4f
add submission and ontologies metadata endpoints
syphax-bouazzouni Feb 20, 2025
cbb523b
Merge pull request #9 from ontoportal-lirmm/feature/extact-agroportal…
alexskr Feb 24, 2025
1dcd12a
Merge pull request #173 from ontoportal/master
alexskr Feb 24, 2025
6f3b313
use ruby 3.1.6
alexskr Feb 24, 2025
7e09f16
use oLD from ncbo org
alexskr Feb 24, 2025
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: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.6
3.1.6
4 changes: 1 addition & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUBY_VERSION=3.0
ARG RUBY_VERSION=3.1
ARG DISTRO_NAME=bullseye

FROM ruby:$RUBY_VERSION-$DISTRO_NAME
Expand All @@ -14,8 +14,6 @@ COPY Gemfile* /srv/ontoportal/ontologies_api/

WORKDIR /srv/ontoportal/ontologies_api

RUN gem update --system
RUN gem install bundler
ENV BUNDLE_PATH=/srv/ontoportal/bundle
RUN bundle install

Expand Down
14 changes: 8 additions & 6 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ 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 'goo', github: 'ncbo/goo', branch: 'develop'
gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'develop'
gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'develop'
gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'develop'
gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'develop'
gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'develop'
gem 'goo', github: 'ncbo/goo', branch: 'master'
gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'master'
gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'master'
gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'master'
gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'feature/add_MOD_metadata_to_submission_object'
gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master'

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
Expand Down Expand Up @@ -80,3 +80,5 @@ group :test do
gem 'webmock', '~> 3.19.1'
gem 'webrick'
end

gem 'net-ftp'
Loading