Skip to content

Commit 2acdf73

Browse files
ZalfstenZalfsten
authored
Merge branch 'main' into dependabot/pip/opentelemetry-instrumentation-requests-0.59b0
2 parents 016c06f + 37daba2 commit 2acdf73

5 files changed

Lines changed: 72 additions & 53 deletions

File tree

‎.github/workflows/code_check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717

1818
steps:
1919
- name: Checkout git repo
20-
uses: actions/checkout@v5
20+
uses: actions/checkout@v6
2121

2222
- name: Set up Python ${{ env.PYTHON_VERSION }}
23-
uses: actions/setup-python@v5
23+
uses: actions/setup-python@v6
2424
with:
2525
python-version: "${{ env.PYTHON_VERSION }}"
2626

‎.github/workflows/codeql.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ jobs:
4848

4949
steps:
5050
- name: Checkout repository
51-
uses: actions/checkout@v5
51+
uses: actions/checkout@v6
5252

5353
# Initializes the CodeQL tools for scanning.
5454
- name: Initialize CodeQL
55-
uses: github/codeql-action/init@v3
55+
uses: github/codeql-action/init@v4
5656
with:
5757
languages: ${{ matrix.language }}
5858
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -66,7 +66,7 @@ jobs:
6666
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6767
# If this step fails, then you should remove it and run the build manually (see below)
6868
- name: Autobuild
69-
uses: github/codeql-action/autobuild@v3
69+
uses: github/codeql-action/autobuild@v4
7070

7171
# ℹ️ Command-line programs to run using the OS shell.
7272
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -79,6 +79,6 @@ jobs:
7979
# ./location_of_script_within_repo/buildscript.sh
8080

8181
- name: Perform CodeQL Analysis
82-
uses: github/codeql-action/analyze@v3
82+
uses: github/codeql-action/analyze@v4
8383
with:
8484
category: "/language:${{matrix.language}}"

‎.github/workflows/docker_build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
Patch: ${{ steps.gitversion.outputs.Patch }}
3030
steps:
3131
- name: Checkout git repo
32-
uses: actions/checkout@v5
32+
uses: actions/checkout@v6
3333
with:
3434
fetch-depth: 0 # This is needed for GitVersion not to crash
3535

@@ -59,7 +59,7 @@ jobs:
5959

6060
steps:
6161
- name: Checkout git repo
62-
uses: actions/checkout@v5
62+
uses: actions/checkout@v6
6363

6464
- name: Set up Docker Buildx
6565
uses: docker/setup-buildx-action@v3

‎middleware/scripts/publiso_conversor.jq‎

Lines changed: 48 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,59 @@
1-
..[] | {
1+
.[] | {
22
"@context": {
33
"@language": "en",
44
"@vocab":"https://schema.org/"},
55
"@type": "Dataset",
6-
"@id": ("https://doi.org/" + .doi),
6+
"@id":
7+
(if has("doi")
8+
then "https://doi.org/" + .doi
9+
else "https://repository.publisso.de/resource/" + .["@id"]
10+
end),
711
"name": (if has("title") then (.title[]) else null end),
812
"alternativeHeadline": (if has("alternative") then .alternative[0] else null end),
913
"description": (if has("description") then (.description[]) else null end),
10-
"identifier": (if has("doi") then (.doi | {"@type":"PropertyValue", "value":., "propertyID": "https://registry.identifiers.org/registry/doi", "url": ("https://doi.org/" + .)}) else null end),
11-
"creator":
12-
[
13-
14-
(if has("creator") then
15-
(.creator[]
16-
| {
17-
"@type": "Person",
18-
"familyName": (.prefLabel | split(", ")[0]),
19-
"givenName": (.prefLabel | split(", ")[1: ] | join(" ")),
20-
"identifier": ."@id"
14+
"identifier": ([
15+
(if has("doi") then
16+
{
17+
"@type": "PropertyValue",
18+
"propertyID": "https://registry.identifiers.org/registry/doi",
19+
"value": .doi,
20+
"url": ("https://doi.org/" + .doi)
21+
}
22+
else empty end),
23+
{
24+
"@type": "PropertyValue",
25+
"propertyID": "frl-internal",
26+
"value": .["@id"],
27+
"url": ("https://repository.publisso.de/resource/" + .["@id"])
2128
}
22-
)
23-
else null end)
24-
],
29+
]),
30+
31+
"creator":
32+
[
33+
(if has("creator") then
34+
(.creator[]
35+
| {
36+
"@type": "Person",
37+
"familyName": (.prefLabel | split(", ")[0]),
38+
"givenName": (.prefLabel | split(", ")[1: ] | join(" ")),
39+
"identifier": ."@id"
40+
}
41+
)
42+
else null end)
43+
],
2544
"contributor":
2645
[
27-
(if has("contributor") then
28-
(.contributor[]
29-
| {
30-
"@type": "Person",
31-
"familyName": (.prefLabel | split(", ")[0]),
32-
"givenName": (.prefLabel | split(", ")[1: ] | join(" ")),
33-
"identifier": ."@id"
34-
}
35-
)
36-
else null end)
37-
],
46+
(if has("contributor") then
47+
(.contributor[]
48+
| {
49+
"@type": "Person",
50+
"familyName": (.prefLabel | split(", ")[0]),
51+
"givenName": (.prefLabel | split(", ")[1: ] | join(" ")),
52+
"identifier": ."@id"
53+
}
54+
)
55+
else null end)
56+
],
3857
"sourceOrganization":
3958
[
4059
(if has("institution") then (.institution[] | {"@type":"Organization", "@id": ."@id", "name": .prefLabel}) else null end)
@@ -46,7 +65,7 @@
4665
(if has("ddc") then (.ddc[] | {"@type":"DefinedTerm", "name": .prefLabel, "identifier": ."@id", "inDefinedTermSet": "https://www.oclc.org/en/dewey.html"}) else null end),
4766
(if has("subject") then (.subject[] | {"@type":"DefinedTerm", "name": .prefLabel, "identifier": ."@id"}) else null end)
4867
],
49-
"measurementTechnique":
68+
"measurementTechnique":
5069
[
5170
(if has("dataOrigin") then (.dataOrigin[] | {"@type":"DefinedTerm", "name": .prefLabel, "identifier": ."@id"}) else null end)
5271
],
@@ -56,7 +75,7 @@
5675
],
5776
"funding":
5877
[
59-
(if has("joinedFunding") then (.joinedFunding[] | {"@type":"Grant", "name": .fundingProgramJoined, "funder": .fundingJoined | {"@type":"Organization", "@id": ."@id", "name": .prefLabel}}) else (if has("fundingProgram") then (.fundingProgram[] | {"@type":"Grant", "name": .}) else null end) end)
78+
(if has("joinedFunding") then (.joinedFunding[] | {"@type":"Grant", "name": .fundingProgramJoined, "funder": .fundingJoined | {"@type":"Organization", "@id": ."@id", "name": .prefLabel}}) else (if has("fundingProgram") then (.fundingProgram[] | {"@type":"Grant", "name": .}) else null end) end)
6079
],
6180
"distribution":
6281
[

‎requirements.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ jstyleson==0.0.2
2424
lxml==6.0.2
2525
lxml_html_clean==0.4.3
2626
mf2py==2.0.1
27-
multidict==6.7.1
28-
opentelemetry-api==1.39.1
29-
opentelemetry-exporter-otlp-proto-common==1.39.1
30-
opentelemetry-exporter-otlp-proto-grpc==1.39.1
31-
opentelemetry-instrumentation==0.60b1
32-
opentelemetry-instrumentation-aiohttp-client==0.60b1
33-
opentelemetry-instrumentation-requests==0.60b1
34-
opentelemetry-instrumentation-urllib==0.60b1
35-
opentelemetry-proto==1.39.1
36-
opentelemetry-sdk==1.39.1
37-
opentelemetry-semantic-conventions==0.60b1
38-
opentelemetry-util-http==0.60b1
39-
packaging==26.0
40-
propcache==0.4.1
27+
multidict==6.6.4
28+
opentelemetry-api==1.36.0
29+
opentelemetry-exporter-otlp-proto-common==1.36.0
30+
opentelemetry-exporter-otlp-proto-grpc==1.36.0
31+
opentelemetry-instrumentation==0.57b0
32+
opentelemetry-instrumentation-aiohttp-client==0.57b0
33+
opentelemetry-instrumentation-requests==0.57b0
34+
opentelemetry-instrumentation-urllib==0.57b0
35+
opentelemetry-proto==1.36.0
36+
opentelemetry-sdk==1.36.0
37+
opentelemetry-semantic-conventions==0.57b0
38+
opentelemetry-util-http==0.57b0
39+
packaging==25.0
40+
propcache==0.3.2
4141
protobuf==6.33.5
42-
pyparsing==3.3.2
43-
pyRdfa3==3.6.5
42+
pyparsing==3.2.3
43+
pyRdfa3==3.6.4
4444
pytz==2025.2
4545
PyYAML==6.0.3
4646
rdflib==7.5.0

0 commit comments

Comments
 (0)