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

Update orcid_client gem. #150

Merged
merged 2 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
run: |
cp .env.build .env
gem install bundler
gem install bundler -v 2.4.22
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
# sudo /etc/init.d/mysql start
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ RUN /sbin/setuser app npm install

# Install Ruby gems
WORKDIR /home/app/webapp
RUN gem install bundler && \
RUN gem install bundler -v 2.4.22 && \
/sbin/setuser app bundle install --path vendor/bundle

# Add Runit script for shoryuken workers
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ gem "flipper-ui"
gem "nilify_blanks", "~> 1.3"
gem "oj", ">= 2.8.3"
gem "oj_mimic_json", "~> 1.0", ">= 1.0.1"
gem "orcid_client", "~> 0.5", ">= 0.9.3"
gem "orcid_client", "~> 0.10.1"
gem "postrank-uri", "~> 1.0", ">= 1.0.24"
gem "pwqgen.rb", "~> 0.1.0"
gem "rake", "~> 12.0"
Expand Down
108 changes: 44 additions & 64 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ GEM
tzinfo (~> 1.1)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
amazing_print (1.4.0)
ansi (1.5.0)
apollo-federation (1.1.5)
google-protobuf (~> 3.7)
Expand Down Expand Up @@ -101,7 +100,7 @@ GEM
latex-decode (~> 0.0)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
bolognese (1.9.12)
bolognese (2.1.0)
activesupport (>= 4.2.5)
benchmark_methods (~> 0.7)
bibtex-ruby (>= 5.1.0)
Expand All @@ -111,15 +110,14 @@ GEM
concurrent-ruby (~> 1.1, >= 1.1.5)
csl-styles (~> 1.0, >= 1.0.1.10)
edtf (~> 3.0, >= 3.0.4)
faraday (~> 0.17.3)
gender_detector (~> 0.1.2)
iso8601 (~> 0.9.1)
json-ld-preloaded (~> 3.1, >= 3.1.3)
jsonlint (~> 0.3.0)
loofah (~> 2.0, >= 2.0.3)
maremma (>= 4.9.4, < 5)
namae (~> 1.0)
nokogiri (~> 1.11.2)
nokogiri (>= 1.13.2, < 1.14)
oj (~> 3.10)
oj_mimic_json (~> 1.0, >= 1.0.1)
postrank-uri (~> 1.0, >= 1.0.18)
Expand Down Expand Up @@ -236,15 +234,14 @@ GEM
dry-core (~> 0.5, >= 0.5)
dry-initializer (~> 3.0)
dry-schema (~> 1.8, >= 1.8.0)
ebnf (2.2.1)
amazing_print (~> 1.2)
ebnf (2.3.5)
htmlentities (~> 4.3)
rdf (~> 3.1)
rdf (~> 3.2)
scanf (~> 1.0)
sxp (~> 1.1)
unicode-types (~> 1.6)
edtf (3.0.6)
activesupport (>= 3.0, < 7.0)
sxp (~> 1.2)
unicode-types (~> 1.8)
edtf (3.1.1)
activesupport (>= 3.0, < 8.0)
elasticsearch (7.1.0)
elasticsearch-api (= 7.1.0)
elasticsearch-transport (= 7.1.0)
Expand Down Expand Up @@ -321,11 +318,6 @@ GEM
graphql-errors (0.4.0)
graphql (>= 1.6.0, < 2)
gravtastic (3.2.6)
haml (5.2.2)
temple (>= 0.8.0)
tilt
hamster (3.0.0)
concurrent-ruby (~> 1.0)
hashdiff (1.0.1)
hashie (4.1.0)
htmlentities (4.3.4)
Expand All @@ -338,17 +330,17 @@ GEM
iso8601 (0.9.1)
jmespath (1.4.0)
json (2.5.1)
json-canonicalization (0.2.1)
json-ld (3.1.10)
json-canonicalization (0.4.0)
json-ld (3.2.5)
htmlentities (~> 4.3)
json-canonicalization (~> 0.2)
json-canonicalization (~> 0.3, >= 0.3.2)
link_header (~> 0.0, >= 0.0.8)
multi_json (~> 1.14)
rack (~> 2.0)
rdf (~> 3.1)
json-ld-preloaded (3.1.6)
json-ld (~> 3.1)
rdf (~> 3.1)
multi_json (~> 1.15)
rack (>= 2.2, < 4)
rdf (~> 3.2, >= 3.2.10)
json-ld-preloaded (3.2.2)
json-ld (~> 3.2)
rdf (~> 3.2)
jsonapi-renderer (0.2.2)
jsonlint (0.3.0)
oj (~> 3)
Expand All @@ -366,7 +358,7 @@ GEM
activerecord
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
latex-decode (0.3.2)
latex-decode (0.4.0)
launchy (2.5.0)
addressable (~> 2.7)
link_header (0.0.8)
Expand All @@ -390,24 +382,25 @@ GEM
mailgun-ruby (1.2.5)
rest-client (>= 2.0.2)
marcel (1.0.2)
maremma (4.9.5)
maremma (4.9.8)
activesupport (>= 4.2.5)
addressable (>= 2.3.6)
builder (~> 3.2, >= 3.2.2)
excon (~> 0.71.0)
faraday (~> 0.17.3)
faraday-encoding (~> 0.0.4)
faraday_middleware (~> 0.14.0)
nokogiri (~> 1.11.2)
nokogiri (>= 1.11.2, < 1.14.0)
oj (>= 2.8.3)
oj_mimic_json (~> 1.0, >= 1.0.1)
matrix (0.4.2)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0901)
mini_magick (4.11.0)
mini_mime (1.1.1)
mini_portile2 (2.5.3)
mini_portile2 (2.8.5)
minitest (5.14.4)
msgpack (1.4.2)
multi_json (1.15.0)
Expand All @@ -420,8 +413,8 @@ GEM
activerecord (>= 4.0.0)
activesupport (>= 4.0.0)
nio4r (2.5.8)
nokogiri (1.11.7)
mini_portile2 (~> 2.5.0)
nokogiri (1.13.10)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
oauth2 (1.4.7)
faraday (>= 0.8, < 2.0)
Expand Down Expand Up @@ -451,15 +444,15 @@ GEM
omniauth-rails_csrf_protection (1.0.0)
actionpack (>= 4.2)
omniauth (~> 2.0)
optimist (3.0.1)
orcid_client (0.9.8)
optimist (3.1.0)
orcid_client (0.10.1)
activesupport (>= 4.2.5, < 6)
bolognese (~> 1.3, >= 1.9.8)
bolognese (~> 2.1.0)
builder (~> 3.2, >= 3.2.2)
dotenv (~> 2.1, >= 2.1.1)
maremma (>= 4.4)
namae (~> 1.0.1)
nokogiri (>= 1.10.4, < 1.12.0)
nokogiri (>= 1.13.9)
orm_adapter (0.5.0)
pandoc-ruby (2.1.4)
parallel (1.22.1)
Expand Down Expand Up @@ -517,30 +510,18 @@ GEM
rb-inotify (0.10.1)
ffi (~> 1.0)
rchardet (1.8.0)
rdf (3.1.15)
hamster (~> 3.0)
rdf (3.2.11)
link_header (~> 0.0, >= 0.0.8)
rdf-aggregate-repo (3.1.0)
rdf (~> 3.1)
rdf-rdfa (3.1.3)
haml (~> 5.2)
htmlentities (~> 4.3)
rdf (~> 3.1, >= 3.1.13)
rdf-aggregate-repo (~> 3.1)
rdf-vocab (~> 3.1, >= 3.1.11)
rdf-xsd (~> 3.1)
rdf-rdfxml (3.1.1)
rdf-rdfxml (3.2.2)
builder (~> 3.2)
htmlentities (~> 4.3)
rdf (~> 3.1)
rdf-rdfa (~> 3.1)
rdf-xsd (~> 3.1)
rdf-turtle (3.1.3)
ebnf (~> 2.1)
rdf (~> 3.1, >= 3.1.8)
rdf-vocab (3.1.14)
rdf (~> 3.1, >= 3.1.12)
rdf-xsd (3.1.1)
rdf (~> 3.1)
rdf (~> 3.2)
rdf-xsd (~> 3.2)
rdf-turtle (3.2.1)
ebnf (~> 2.3)
rdf (~> 3.2)
rdf-xsd (3.2.1)
rdf (~> 3.2)
rexml (~> 3.2)
redis (4.4.0)
regexp_parser (2.1.1)
Expand Down Expand Up @@ -648,14 +629,13 @@ GEM
sprockets (>= 3.0.0)
strip_attributes (1.11.0)
activemodel (>= 3.0, < 7.0)
sxp (1.1.0)
rdf (~> 3.1)
sxp (1.2.4)
matrix (~> 0.4)
rdf (~> 3.2)
sysrandom (1.0.5)
temple (0.8.2)
test-prof (0.10.2)
thor (1.1.0)
thread_safe (0.3.6)
tilt (2.0.10)
tzinfo (1.2.9)
thread_safe (~> 0.1)
tzinfo-data (1.2021.2)
Expand All @@ -667,7 +647,7 @@ GEM
unf_ext
unf_ext (0.0.8)
unicode-display_width (2.3.0)
unicode-types (1.7.0)
unicode-types (1.9.0)
unicode_utils (1.4.0)
validates_email_format_of (1.6.3)
i18n
Expand Down Expand Up @@ -757,7 +737,7 @@ DEPENDENCIES
omniauth-globus (~> 0.9.1)
omniauth-orcid (~> 2.0)
omniauth-rails_csrf_protection (~> 1.0)
orcid_client (~> 0.5, >= 0.9.3)
orcid_client (~> 0.10.1)
postrank-uri (~> 1.0, >= 1.0.24)
pwqgen.rb (~> 0.1.0)
rack-cors (~> 1.0)
Expand Down Expand Up @@ -796,4 +776,4 @@ DEPENDENCIES
with_env (~> 1.1)

BUNDLED WITH
2.3.18
2.4.22
2 changes: 1 addition & 1 deletion bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Dir.chdir APP_ROOT do
# Add necessary setup steps to this file:

puts "== Installing dependencies =="
system "gem install bundler --conservative"
system "gem install bundler -v 2.4.22 --conservative"
system "bundle check || bundle install"

# puts "\n== Copying sample files =="
Expand Down
Loading