Skip to content

Commit a173f93

Browse files
lizkrznarichlizkrznarich
committed
fix merge conflicts
2 parents 70a1014 + 4c9c0bd commit a173f93

12,635 files changed

Lines changed: 900208 additions & 450139 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/generate_dump_v2_initial_release.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
name: Create data dump v2 first release
2-
description: Generates a data dump based on an input file from ror-data-test and uploades the result to ror-data. For use during the first v1 release only.
32
on:
43
workflow_dispatch:
54
inputs:
@@ -63,7 +62,7 @@ jobs:
6362
python generate_dump.py -r ${{github.event.inputs.new-release}} -e ${{github.event.inputs.prev-release}} -i '../../ror-records-test' -o '../../ror-records-prod' -v 1
6463
fi
6564
if [[ ${{ github.event.inputs.schema-version }} == 'v2' ]]; then
66-
python generate_dump.py -r ${{github.event.inputs.new-release}} -e ${{github.event.inputs.prev-release}} -i '../../ror-records-test' -o '../../ror-records-prod' -v 2
65+
python generate_dump.py -r ${{github.event.inputs.new-release}} -e ${{github.event.inputs.prev-release}} -i '../../ror-records-test' -o '../../ror-records-test' -v 2
6766
fi
6867
- name: cat error file
6968
if: ${{ steps.gendumpscript.outcome != 'success'}}

‎.github/workflows/remove_relationships.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ jobs:
3737
run: |
3838
python -m pip install --upgrade pip
3939
pip install requests==2.23.0
40+
<<<<<<< HEAD
4041
curl https://raw.githubusercontent.com/ror-community/curation_ops/main/remove_relationships/remove_relationships.py -o remove_relationships.py
42+
=======
43+
curl https://raw.githubusercontent.com/ror-community/curation_ops/update-last-mod-all-update-actions/remove_relationships/remove_relationships.py -o remove_relationships.py
44+
>>>>>>> main
4145
if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
4246
python remove_relationships.py -v 1
4347
fi

‎.github/workflows/update_labels.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,15 @@ jobs:
3636
working-directory: ${{ env.WORKING_DIR }}
3737
run: |
3838
python -m pip install --upgrade pip
39+
<<<<<<< HEAD
3940
curl https://raw.githubusercontent.com/ror-community/curation_ops/main/update_related_records/requirements.txt -o requirements.txt
4041
pip install -r requirements.txt
4142
curl https://raw.githubusercontent.com/ror-community/curation_ops/main/update_related_records/update_related.py -o update_related.py
43+
=======
44+
curl https://raw.githubusercontent.com/ror-community/curation_ops/update-last-mod-all-update-actions/update_related_records/requirements.txt -o requirements.txt
45+
pip install -r requirements.txt
46+
curl https://raw.githubusercontent.com/ror-community/curation_ops/update-last-mod-all-update-actions/update_related_records/update_related.py -o update_related.py
47+
>>>>>>> main
4248
if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
4349
python update_related.py -v 1
4450
fi

‎.github/workflows/update_last_mod.yml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Update last modified date
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
date-value:
6+
type: string
7+
description: Date value to populate last_modified field with (YYYY-MM-DD)
8+
directory-name:
9+
type: string
10+
description: Name of parent directory containing new/updated records. Needed only if different from branch name.
11+
jobs:
12+
update-last-mod:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: checkout
16+
uses: actions/checkout@v2
17+
with:
18+
ref: ${{ github.event.ref }}
19+
- name: Set up Python environment
20+
uses: actions/setup-python@v2
21+
with:
22+
python-version: "3.8"
23+
- name: Get directory name
24+
if: "${{ github.event.inputs.directory-name != '' }}"
25+
run: echo "WORKING_DIR=${{ github.event.inputs.directory-name }}" >> $GITHUB_ENV
26+
- name: Get branch name
27+
if: "${{ github.event.inputs.directory-name == '' }}"
28+
run: echo "WORKING_DIR=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
29+
- name: Update last modified
30+
id: updatelastmod
31+
working-directory: ${{ env.WORKING_DIR }}
32+
run: |
33+
python -m pip install --upgrade pip
34+
curl https://raw.githubusercontent.com/ror-community/curation_ops/v2-crosswalk/utilities/update_last_mod/update_last_mod.py -o update_last_mod.py
35+
python update_last_mod.py -d ${{ github.event.inputs.date-value }}
36+
- name: commit error file
37+
if: ${{ steps.updatelastmod.outcome != 'success'}}
38+
working-directory: ${{ env.WORKING_DIR }}
39+
run: |
40+
echo "ERRORS found for some records:"
41+
cat update_last_mod_errors.log
42+
- name: commit changed files
43+
if: ${{ steps.updatelastmod.outcome == 'success'}}
44+
uses: stefanzweifel/git-auto-commit-action@v4
45+
with:
46+
file_pattern: ${{ env.WORKING_DIR }}/**.json
47+
commit_message: Apply last mod changes to files
48+
- name: Set env variable for notification
49+
if: always()
50+
run: |
51+
if [[ ${{ steps.updatelastmod.outcome }} == 'success' ]]; then
52+
echo "update_last_mod_status=SUCCESS" >> $GITHUB_ENV
53+
else
54+
echo "update_last_mod_status=FAILED" >> $GITHUB_ENV
55+
fi
56+
- name: Notify Slack
57+
if: always()
58+
uses: edge/simple-slack-notify@master
59+
env:
60+
SLACK_WEBHOOK_URL: ${{ secrets.CURATOR_SLACK_WEBHOOK_URL }}
61+
VALIDATION_STATUS: ${{ env.update_last_mod_status }}
62+
with:
63+
channel: '#ror-curation-releases'
64+
color: 'good'
65+
text: 'DEV last mod update status: ${env.VALIDATION_STATUS}. Branch: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/tree/${env.GITHUB_REF_NAME}. Directory: ${{ env.WORKING_DIR }}. Please check: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID} for more details'

‎.github/workflows/validate-dump.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ jobs:
6767
with:
6868
channel: '#ror-curation-releases'
6969
color: 'good'
70-
text: 'Dump validation status ${{ steps.validatefiles.outcome }} in ${env.GITHUB_REPOSITORY}. Using version ${{ github.event.inputs.schema-version }}. On branch: ${{ env.WORKING_DIR }}. Please check: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}'
70+
text: 'Dump validation status ${{ steps.validatefiles.outcome }} in ${env.GITHUB_REPOSITORY}. Using version ${{ github.event.inputs.schema-version }}. On branch: ${{ env.WORKING_DIR }}. Please check: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}'

‎liz-test-v1.47/new/001ca9b54.json‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"admin": {
3+
"created": {
4+
"date": "2024-05-09",
5+
"schema_version": "2.0"
6+
},
7+
"last_modified": {
8+
"date": "2024-05-09",
9+
"schema_version": "2.0"
10+
}
11+
},
12+
"domains": [
13+
"gaas-gh.org"
14+
],
15+
"established": 1959,
16+
"external_ids": [
17+
{
18+
"all": [
19+
"0000 0000 8499 2537"
20+
],
21+
"preferred": "0000 0000 8499 2537",
22+
"type": "isni"
23+
},
24+
{
25+
"all": [
26+
"Q5555328"
27+
],
28+
"preferred": "Q5555328",
29+
"type": "wikidata"
30+
}
31+
],
32+
"id": "https://ror.org/001ca9b54",
33+
"links": [
34+
{
35+
"type": "website",
36+
"value": "http://www.gaas-gh.org"
37+
},
38+
{
39+
"type": "wikipedia",
40+
"value": "https://en.wikipedia.org/wiki/Ghana_Academy_of_Arts_and_Sciences"
41+
}
42+
],
43+
"locations": [
44+
{
45+
"geonames_details": {
46+
"country_code": "GH",
47+
"country_name": "Ghana",
48+
"lat": 5.55602,
49+
"lng": -0.1969,
50+
"name": "Accra"
51+
},
52+
"geonames_id": 2306104
53+
}
54+
],
55+
"names": [
56+
{
57+
"lang": null,
58+
"types": [
59+
"acronym"
60+
],
61+
"value": "GAAS"
62+
},
63+
{
64+
"lang": null,
65+
"types": [
66+
"label",
67+
"ror_display"
68+
],
69+
"value": "Ghana Academy of Arts and Sciences"
70+
}
71+
],
72+
"relationships": [],
73+
"status": "active",
74+
"types": [
75+
"other"
76+
]
77+
}

‎liz-test-v1.47/new/003erwy51.json‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{
2+
"admin": {
3+
"created": {
4+
"date": "2024-05-09",
5+
"schema_version": "2.0"
6+
},
7+
"last_modified": {
8+
"date": "2024-05-09",
9+
"schema_version": "2.0"
10+
}
11+
},
12+
"domains": [
13+
"tatu.edu.gh"
14+
],
15+
"established": 1951,
16+
"external_ids": [
17+
{
18+
"all": [
19+
"Q85805076"
20+
],
21+
"preferred": "Q85805076",
22+
"type": "wikidata"
23+
}
24+
],
25+
"id": "https://ror.org/003erwy51",
26+
"links": [
27+
{
28+
"type": "website",
29+
"value": "https://tatu.edu.gh"
30+
},
31+
{
32+
"type": "wikipedia",
33+
"value": "https://en.wikipedia.org/wiki/Tamale_Technical_University"
34+
}
35+
],
36+
"locations": [
37+
{
38+
"geonames_details": {
39+
"country_code": "GH",
40+
"country_name": "Ghana",
41+
"lat": 9.40079,
42+
"lng": -0.8393,
43+
"name": "Tamale"
44+
},
45+
"geonames_id": 2294877
46+
}
47+
],
48+
"names": [
49+
{
50+
"lang": null,
51+
"types": [
52+
"acronym"
53+
],
54+
"value": "TaTU"
55+
},
56+
{
57+
"lang": null,
58+
"types": [
59+
"label",
60+
"ror_display"
61+
],
62+
"value": "Tamale Technical University"
63+
}
64+
],
65+
"relationships": [],
66+
"status": "active",
67+
"types": [
68+
"education"
69+
]
70+
}

‎liz-test-v1.47/new/006qnnf37.json‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
{
2+
"admin": {
3+
"created": {
4+
"date": "2024-05-09",
5+
"schema_version": "2.0"
6+
},
7+
"last_modified": {
8+
"date": "2024-05-09",
9+
"schema_version": "2.0"
10+
}
11+
},
12+
"domains": [],
13+
"established": 2008,
14+
"external_ids": [],
15+
"id": "https://ror.org/006qnnf37",
16+
"links": [
17+
{
18+
"type": "website",
19+
"value": "https://giu.edu.ge"
20+
}
21+
],
22+
"locations": [
23+
{
24+
"geonames_details": {
25+
"country_code": "GE",
26+
"country_name": "Georgia",
27+
"lat": 41.69411,
28+
"lng": 44.83368,
29+
"name": "Tbilisi"
30+
},
31+
"geonames_id": 611717
32+
}
33+
],
34+
"names": [
35+
{
36+
"lang": "en",
37+
"types": [
38+
"acronym"
39+
],
40+
"value": "GIU"
41+
},
42+
{
43+
"lang": "en",
44+
"types": [
45+
"label",
46+
"ror_display"
47+
],
48+
"value": "Georgian International University"
49+
},
50+
{
51+
"lang": "en",
52+
"types": [
53+
"alias"
54+
],
55+
"value": "Georgian International University GIU"
56+
},
57+
{
58+
"lang": "en",
59+
"types": [
60+
"alias"
61+
],
62+
"value": "Guram Tavartkiladze Educational University"
63+
},
64+
{
65+
"lang": "en",
66+
"types": [
67+
"alias"
68+
],
69+
"value": "International University of Georgia"
70+
},
71+
{
72+
"lang": "en",
73+
"types": [
74+
"alias"
75+
],
76+
"value": "Tbilisi University of Economic Relations and Law"
77+
},
78+
{
79+
"lang": "ka",
80+
"types": [
81+
"alias"
82+
],
83+
"value": "გურამ თავართქილაძის სახელობის სასწავლო უნივერსიტეტი"
84+
},
85+
{
86+
"lang": "ka",
87+
"types": [
88+
"alias"
89+
],
90+
"value": "თბილისი ეკონომიკური ურთიერთობებისა და სამართლის უნივერსიტეტისა"
91+
},
92+
{
93+
"lang": "ka",
94+
"types": [
95+
"label"
96+
],
97+
"value": "საქართველოს საერთაშორისო უნივერსიტეტი"
98+
},
99+
{
100+
"lang": "ka",
101+
"types": [
102+
"acronym"
103+
],
104+
"value": "ჯიუ"
105+
}
106+
],
107+
"relationships": [],
108+
"status": "active",
109+
"types": [
110+
"education"
111+
]
112+
}

0 commit comments

Comments
 (0)