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

[loterre-resolvers] Migrate from GitBucket #46

Merged
merged 45 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
4c2016e
feat(loterre-resolvers): Migrate from GitBucket
parmentf Feb 13, 2024
039bd8e
chore(vscode): Add Loterre to dictionary
parmentf Sep 25, 2024
0edb863
chore(loterre-resolvers): Reduce default concurrency from 4 to 2
parmentf Sep 25, 2024
cb6717f
build(loterre-resolvers): Prepare swagger.json
parmentf Sep 25, 2024
c591eb0
feat(loterre-resolvers): Add data files
parmentf Sep 25, 2024
e32cf24
build(loterre-resolvers): Get data from dvc
parmentf Sep 25, 2024
181d265
style(loterre-resolvers): Spelling
parmentf Sep 26, 2024
3c0f176
build(loterre-resolvers): Make /app/data readable
parmentf Sep 26, 2024
4e17de0
refactor(loterre-resolvers): Use local skos instead of the web one
parmentf Sep 26, 2024
09097c0
docs(loterre-resolvers): Add technical explanation
parmentf Sep 26, 2024
ba295f1
style(loterre-resolvers): Spelling
parmentf Sep 27, 2024
8ff211d
test(loterre-resolvers): Skip D63, as it does not work
parmentf Sep 27, 2024
56720fc
Merge branch 'main' into services/loterre-resolvers/migrate
parmentf Oct 8, 2024
16b38de
style(loterre-resolvers): Indent test payload
parmentf Oct 8, 2024
ecb4bb1
chore(loterre-resolvers): Add words to the spelling dictionary
parmentf Oct 8, 2024
3d4a71b
fix(loterre-resolvers): singleton alone crashed the script annotate.cfg
parmentf Oct 8, 2024
6b5a49b
style(loterre-resolvers): Spell
parmentf Oct 8, 2024
717d086
style(loterre-resolvers): Spelling
parmentf Oct 8, 2024
d780066
style(loterre-resolvers): Spelling
parmentf Oct 8, 2024
e810ca5
refactor(loterre-resolvers): Simplify configuration files
parmentf Oct 8, 2024
1e4d742
docs(loterre-resolvers): Spelling
parmentf Oct 8, 2024
fa1f910
refactor(loterre-resolvers): Remove useless fetch.cfg
parmentf Oct 8, 2024
6835f04
chore(loterre-resolvers): Ignore D63.hurl
parmentf Oct 9, 2024
838453c
release [email protected]
parmentf Oct 9, 2024
d9e5298
fix(loterre-resolvers): Fix D63 tests
parmentf Oct 9, 2024
d8037c8
release [email protected]
parmentf Oct 9, 2024
276ef7f
test(loterre-resolvers): Add JVR tests
parmentf Oct 10, 2024
7f3c6f7
feat(loterre-resolvers): Get databases from DVC remote
parmentf Oct 15, 2024
080749c
style(loterre-resolvers): Remove obsolete comments
parmentf Oct 15, 2024
f9c9231
feat(loterre-resolvers): Remove weekNumber from databases paths
parmentf Oct 15, 2024
53fd7bb
build(loterre-resolvers): Forgot to set the dockerfile syntax version
parmentf Oct 15, 2024
9227206
fix(loterre-resolvers): Uncompress databases in docker-entrypoint.sh
parmentf Oct 15, 2024
b34913d
ci(loterre-resolvers): Increase retry
parmentf Oct 15, 2024
9b0c7f3
ci(loterre-resolvers): Sleep 1m
parmentf Oct 15, 2024
59837f0
ci(loterre-resolvers): sleep 2m
parmentf Oct 15, 2024
e6661c5
ci(loterre-resolvers): Increase retry-interval to 30s
parmentf Oct 15, 2024
2c4c640
ci(loterre-resolvers): Add verbose option to hurl
parmentf Oct 17, 2024
0600294
ci(loterre-resolvers): Add retry-interval to ALL scripts
parmentf Oct 17, 2024
f1a416f
refactor(loterre-resolvers): Remove dead code
parmentf Oct 22, 2024
a862ac0
release [email protected]
parmentf Oct 22, 2024
75ae16e
fix(loterre-resolvers): Don't store .tgz in /tmp
parmentf Oct 22, 2024
94a44f6
release [email protected]
parmentf Oct 22, 2024
4ff72c5
chore(loterre-resolvers): Update port
parmentf Oct 23, 2024
bf0065b
chore(loterre-resolvers): Activate server
parmentf Oct 23, 2024
4c80274
Merge branch 'main' into services/loterre-resolvers/migrate
parmentf Oct 23, 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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,7 @@ dist

# Byte-compiled / optimized / DLL files
__pycache__/

# Local files
services/data-termsuite/NOTES.md
services/loterre-resolvers/D63.hurl
8 changes: 7 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"MD024": false, // MD024: Duplicate headings
"MD028": false, // MD028: Blank line inside blockquote
"MD041": false, // MD041: First line in file should be a top level header
"MD051": false // MD051: Broken link fragment (ex: #v1/teeft instead of #v1teeft)
"MD051": false // MD051: Broken link fragment (ex: #v1/teeft instead of #v1teeft)
},
"cSpell.enableFiletypes": [
"ini",
Expand All @@ -12,12 +12,18 @@
"cSpell.language": "en,fr-FR",
"cSpell.words": [
"Bigramme",
"cnrs",
"concat",
"foaf",
"inist",
"Lodex",
"loterre",
"Loterre",
"openapi",
"prometheus",
"skos",
"stopwords",
"stylesheet",
"ungroup",
"uuid"
]
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ All contributing instructions are in [CONTRIBUTING](CONTRIBUTING.md).
- [funder-ner](./services/funder-ner) [![Docker Pulls](https://img.shields.io/docker/pulls/cnrsinist/ws-funder-ner.svg)](https://hub.docker.com/r/cnrsinist/ws-funder-ner/)
- [hal-classifier](./services/hal-classifier) [![Docker Pulls](https://img.shields.io/docker/pulls/cnrsinist/ws-hal-classifier.svg)](https://hub.docker.com/r/cnrsinist/ws-hal-classifier/)
- [irc3-species](./services/irc3-species) [![Docker Pulls](https://img.shields.io/docker/pulls/cnrsinist/ws-irc3-species.svg)](https://hub.docker.com/r/cnrsinist/ws-irc3-species/)
- [loterre-resolvers](./services/loterre-resolvers) [![Docker Pulls](https://img.shields.io/docker/pulls/cnrsinist/ws-loterre-resolvers.svg)](https://hub.docker.com/r/cnrsinist/ws-loterre-resolvers/)
- [ner-tagger](./services/ner-tagger) [![Docker Pulls](https://img.shields.io/docker/pulls/cnrsinist/ws-ner-tagger.svg)](https://hub.docker.com/r/cnrsinist/ws-ner-tagger/)
- [nlp-tools2](./services/nlp-tools2) [![Docker Pulls](https://img.shields.io/docker/pulls/cnrsinist/ws-nlp-tools2.svg)](https://hub.docker.com/r/cnrsinist/ws-nlp-tools2/)
- [pdf-text](./services/pdf-text) [![Docker Pulls](https://img.shields.io/docker/pulls/cnrsinist/ws-pdf-text.svg)](https://hub.docker.com/r/cnrsinist/ws-pdf-text/)
Expand Down
5 changes: 3 additions & 2 deletions bin/build-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

set -eu

# Wait until $1 is available, retrying every $3 milliseconds up to $2 times.
wait_for_url () {
echo "Waiting for $1"
printf 'GET %s\nHTTP 200' "$1" | hurl --retry "$2" > /dev/null;
printf 'GET %s\nHTTP 200' "$1" | hurl --retry "$2" --retry-interval "$3" --verbose> /dev/null;
return 0
}

Expand All @@ -19,7 +20,7 @@ cd "services/$SERVICE_NAME"
npm run start:dev

echo "Waiting server to be ready"
wait_for_url "http://localhost:31976" 10
wait_for_url "http://localhost:31976" 10 30000

echo "Running hurl tests"
hurl --variable host=http://localhost:31976 --test tests.hurl
Expand Down
4 changes: 2 additions & 2 deletions bin/test-on-branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -eu

wait_for_url () {
echo "Waiting for $1"
printf 'GET %s\nHTTP 200' "$1" | hurl --retry "$2" > /dev/null;
printf 'GET %s\nHTTP 200' "$1" | hurl --retry "$2" --retry-interval "$3" --verbose > /dev/null;
return 0
}

Expand All @@ -19,7 +19,7 @@ cd "services/$SERVICE_NAME"
npm run start:dev

echo "Waiting server to be ready"
wait_for_url "http://localhost:31976" 10
wait_for_url "http://localhost:31976" 10 30000

echo "Running hurl tests"
hurl --variable host=http://localhost:31976 --test tests.hurl
Expand Down
4 changes: 2 additions & 2 deletions bin/test-on-tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -eu

wait_for_url () {
echo "Waiting for $1"
printf 'GET %s\nHTTP 200' "$1" | hurl --retry "$2" > /dev/null;
printf 'GET %s\nHTTP 200' "$1" | hurl --retry "$2" --retry-interval "$3" --verbose > /dev/null;
return 0
}

Expand All @@ -24,7 +24,7 @@ cd "services/$SERVICE_NAME"
npm run start:dev

echo "Waiting server to be ready"
wait_for_url "http://localhost:31976" 10
wait_for_url "http://localhost:31976" 10 30000

echo "Running hurl tests"
hurl --variable host=http://localhost:31976 --test tests.hurl
Expand Down
Loading