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.

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: sync with NCBO latest version and support ruby RDF 3.0 #28

Merged
merged 101 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
e0c5ed1
Gemfile.lock update
mdorf Jul 21, 2020
800a1cb
Merge staging for release
mdorf Jul 21, 2020
b54d022
Gemfile.lock update; fixed ncbo/sparql-client#3
mdorf Jul 21, 2020
ef5d82d
Gemfile.lock update
mdorf Sep 4, 2020
7be23e9
Gemfile.lock update
mdorf Sep 4, 2020
03ff84a
Merge staging for release
mdorf Sep 5, 2020
e35ca59
Gemfile.lock update
mdorf Sep 5, 2020
7a90571
Gemfile.lock update
mdorf Mar 20, 2021
74779d0
Gemfile.lock update
mdorf Mar 29, 2021
533fbfc
Gemfile.lock update
mdorf Apr 1, 2021
5904d52
Gemfile.lock update
mdorf Apr 1, 2021
08f90db
Merge staging for release
mdorf Apr 3, 2021
41ac11d
Gemfile.lock update
mdorf Apr 3, 2021
1ff6b90
implemented #40 - Add incremental logging when the dictionary is bein…
mdorf May 17, 2021
b58b8bf
Gemfile.lock update
mdorf May 17, 2021
89ad2b7
Gemfile.lock update
mdorf May 18, 2021
fd4be97
Merge staging for release
mdorf May 18, 2021
b38ed58
Gemfile.lock update
mdorf May 18, 2021
0a18c31
Gemfile.lock update
mdorf Jun 30, 2021
a1a0b85
Gemfile.lock update
mdorf Jul 8, 2021
b8175bc
Merge staging for release
mdorf Jul 8, 2021
dfd2316
Gemfile.lock update
mdorf Jul 8, 2021
e607f99
Remove ffi gem version pin
alexskr Jul 8, 2021
4340ddf
Gemfile.lock
mdorf Jul 8, 2021
3e8da63
Gemfile.lock
mdorf Jul 8, 2021
d688fb5
Gemfile.lock update
mdorf Aug 10, 2021
3f9a10e
pinned oj to v2.X for all projects due to an error in latest oj 3.13.1
mdorf Aug 10, 2021
4daf2b1
Gemfile.lock update
mdorf Aug 10, 2021
94a77bb
Gemfile.lock update
mdorf Aug 10, 2021
a21a562
Restore Gemfile.lock
jvendetti Feb 2, 2022
a26b52d
Pin faraday gem to 1.9
jvendetti Feb 2, 2022
e0dabcb
Merge staging for release
jvendetti Feb 2, 2022
717ddc6
Fix "same gem twice" parsing error
jvendetti Feb 3, 2022
7ee441f
Fix bundle install duplicate entry warnings
jvendetti Feb 3, 2022
2725353
Update Gemfile.lock
jvendetti Feb 3, 2022
e5e5874
Merge staging for release
jvendetti Feb 3, 2022
e224f46
Gemfile.lock update
jvendetti Feb 3, 2022
ee39d8d
Update Gemfile.lock
jvendetti Mar 1, 2022
bdd3804
Merge staging for release
jvendetti Mar 1, 2022
f2e5d3d
Update Gemfile.lock
jvendetti Mar 1, 2022
1acd843
add docker support for unit testing
alexskr Mar 3, 2022
526f6a5
remove wait-for-it
alexskr Mar 3, 2022
b1593ae
add config file for testing
alexskr Mar 3, 2022
09a6db6
Update branch specifier to develop
jvendetti Mar 7, 2022
4e599cf
remove deprecated ncbo_resource_index
alexskr Mar 10, 2022
25ee301
update ruby v2.6 -> 2.7
alexskr Mar 25, 2022
76b55c3
ruby v2.7, bundler optimization - v2.3
alexskr Mar 31, 2022
7ec0456
Merge branch 'remove_ncbo_resource_index' into develop
jvendetti Apr 18, 2022
08732ff
Reset branch specifier to develop
jvendetti Apr 18, 2022
5bdb6ee
Update Gemfile.lock
jvendetti Apr 18, 2022
73d7fb7
Reconcile divergent branches
jvendetti Apr 18, 2022
84114f9
Update Gemfile.lock
jvendetti Apr 18, 2022
76d5e4a
Add Linux platform
jvendetti Apr 19, 2022
532f896
Update Gemfile.lock
jvendetti Apr 19, 2022
57204d8
merge to upstream v5.22.3
syphax-bouazzouni May 13, 2022
54c1e3a
Fix - deprecation warning for pipelining commands on a Redis instance
alexskr Jun 29, 2022
521c4f7
Remove duplicated line
alexskr Jun 29, 2022
00d04b4
Merge pull request #24 from ncbo/fix_redis_pipeline_deprecation_notice
mdorf Jul 5, 2022
d053a08
Restore branch specifier to master
jvendetti Jul 14, 2022
ed325ae
Update Gemfile.lock
jvendetti Jul 18, 2022
5bf8165
Bump tzinfo from 0.3.60 to 0.3.61
dependabot[bot] Jul 21, 2022
71d41e3
Merge pull request #25 from ncbo/dependabot/bundler/tzinfo-0.3.61
jvendetti Jul 28, 2022
bad8c64
Reset branch specifier to develop
jvendetti Jul 28, 2022
75d1a8f
Gemfile.lock update
mdorf Nov 3, 2022
0d5a4d8
Gemfile.lock update
mdorf Jan 31, 2023
f5484f7
Gemfile.lock update
mdorf Jan 31, 2023
9546713
Merge staging for release
mdorf Feb 1, 2023
6bb32f1
Gemfile had references to develop branch
mdorf Feb 1, 2023
fa8fc96
Gemfile.lock update
mdorf Feb 1, 2023
f1da45b
Allow setting ruby version in the docker-compose file
alexskr Feb 1, 2023
d77efb1
Add codecov reporting
alexskr Feb 1, 2023
2ee3915
fixed a failing unit test, test_annotate_minsize_term
mdorf Feb 1, 2023
7d870ea
Merge staging for release
mdorf Feb 1, 2023
964f068
Gemfile.lock update
mdorf Feb 1, 2023
88cc449
Set mgrep default port to 55556
alexskr Feb 18, 2023
276973b
gem version update
alexskr Feb 18, 2023
a8999d3
fixed #26 - annotator cache generation failure - Unsupported command …
mdorf May 4, 2023
3a3ba4e
Merge branch 'develop' of github.com:ncbo/ncbo_annotator into develop
mdorf May 4, 2023
9fd2649
Gemfile.lock update
mdorf May 4, 2023
3ae6bfb
bundle update
alexskr Jul 17, 2023
f4aa1c3
Merge branch 'develop'
alexskr Jul 17, 2023
067104a
Gemfile.lock update
mdorf Sep 7, 2023
ac11b22
Merge staging for release
mdorf Sep 7, 2023
04226ac
Gemfile.lock update
mdorf Sep 8, 2023
4f4361e
Gemfile.lock update
mdorf Nov 2, 2023
ebbb7a3
Gemfile.lock update
mdorf Nov 2, 2023
c72bbfe
resolved an issue with the Recommender query in AllegroGraph
mdorf Dec 15, 2023
1170a94
Merge branch 'develop'
alexskr Dec 15, 2023
d7ee808
an improved fix to ncbo/ncbo_ontology_recommender#21
mdorf Dec 15, 2023
944af97
Add AllegroGraph backend to unit test matrix
alexskr Dec 20, 2023
354b388
minitest style change for troubleshooting purposes
alexskr Dec 20, 2023
1462e2f
Merge pull request #30 from ncbo/allegrograph_unit_tests
alexskr Dec 20, 2023
9a037b9
Gemfile.lock update
mdorf Jan 10, 2024
f60341e
Gemfile.lock update
alexskr Jan 12, 2024
63c9868
Merge branch 'develop'
alexskr Jan 12, 2024
2d2c3af
Merge branch 'master' into sync-ncbo
syphax-bouazzouni Feb 28, 2024
6288f9d
Merge remote-tracking branch 'ontoportal/sync-ncbo' into feature/syc-…
syphax-bouazzouni Feb 28, 2024
a6cfda8
update test CI
syphax-bouazzouni Feb 28, 2024
9af92c0
add lemmatizer_jar config default value
syphax-bouazzouni Feb 28, 2024
54ddd1e
fix annotator after updating RDF version to 3.0
syphax-bouazzouni Feb 28, 2024
c991c3d
update agraph version to 8.1.0
syphax-bouazzouni Feb 28, 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
13 changes: 13 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.bundle
.git
.gitignore
.github
.DS_Store
vendor/bundle
# Logs
log/*
# Temp files
tmp/*
# Editor temp files
*.swp
*.swo
45 changes: 45 additions & 0 deletions .github/workflows/ruby-unit-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Ruby Unit Tests

on:
push:
pull_request:

jobs:
test:
strategy:
fail-fast: false
matrix:
goo-slice: [ '20', '100', '500' ]
ruby-version: [ '2.7' ]
triplestore: [ 'fs', 'ag', 'vo', 'gb' ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: create config.rb file
run: cp config/config.test.rb config/config.rb
- name: Set up solr configsets
run: ./test/solr/generate_ncbo_configsets.sh
- name: Install Dependencies
run: sudo apt-get update && sudo apt-get -y install raptor2-utils
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- name: Run unit tests
# unit tests are run inside a container
# http://docs.codecov.io/docs/testing-with-docker
run: |
ci_env=`bash <(curl -s https://codecov.io/env)`
GOO_SLICES=${{ matrix.goo-slice }} bundle exec rake test:docker:${{ matrix.triplestore }} TESTOPTS="-v"
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
with:
flags: unittests
verbose: true
fail_ci_if_error: false # optional (default = false)
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,5 @@ bin/mallet-deps.jar
bin/CogPOTerms

create_permissions.log

test/data/dictionary-lem.txt
22 changes: 22 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
ARG RUBY_VERSION
ARG DISTRO_NAME=bullseye

FROM ruby:$RUBY_VERSION-$DISTRO_NAME

RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
openjdk-11-jre-headless \
raptor2-utils \
&& rm -rf /var/lib/apt/lists/*

# The Gemfile Caching Trick
RUN mkdir -p /srv/ontoportal/ncbo_annotator
COPY *.gemspec Gemfile* /srv/ontoportal/ncbo_annotator/

WORKDIR /srv/ontoportal/ncbo_annotator

# set bundler to v2.4.22 which is the last version supported by ruby 2.7
RUN gem install bundler -v 2.4.22
ENV BUNDLE_PATH /bundle
RUN bundle install
COPY . /srv/ontoportal/ncbo_annotator
CMD ["/bin/bash"]
21 changes: 14 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
source 'https://rubygems.org'

gem 'cube-ruby'
gem 'faraday', '~> 1.9'
gem 'ffi'
gem 'oj', '~> 3.0'
gem 'rake', '~> 10.0'
gem 'redis'
gem 'minitest', '~> 4.0'
gem 'cube-ruby', require: "cube"
gem 'ruby-xxHash'
gem 'ffi', '< 1.9.22'
gem 'request_store'
gem 'jwt'
gem 'addressable', '~> 2.8.0'

# Development
gem 'pry', group: :development
group :development do
gem 'minitest', '~> 4.0'
gem 'pry'
gem 'simplecov'
gem 'simplecov-cobertura' # for codecov.io
end

# NCBO gems (can be from a local dev path or from rubygems/git)
gem 'goo', github: 'ontoportal-lirmm/goo', branch: 'development'
gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master'
gem 'sparql-client', github: 'ontoportal-lirmm/sparql-client', branch: 'master'
gem 'ontologies_linked_data', github: 'ontoportal-lirmm/ontologies_linked_data', branch: 'development'
gem 'ncbo_resource_index', github: 'ncbo/resource_index'
Loading
Loading