Skip to content

Commit

Permalink
Merge pull request #776 from ror-community/rc-v1.1
Browse files Browse the repository at this point in the history
Merging rc-v1.1 into main
  • Loading branch information
adambuttrick authored Jun 17, 2022
2 parents 2494237 + 6bb289c commit f4c6d79
Show file tree
Hide file tree
Showing 1,087 changed files with 115,884 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/update_labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,5 @@ jobs:
with:
channel: '#ror-curation-releases'
color: 'good'
text: 'DEV update labels in related records 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'
text: '${env.GITHUB_REPOSITORY}: Update labels in related records 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'

13 changes: 7 additions & 6 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,18 @@ jobs:
id: validatefiles
run: |
mkdir files
cp ./${{ env.WORKING_DIR }}/**.json files/
cp ./${{ env.WORKING_DIR }}/*/*.json files/
cd validation-suite
python -m pip install --upgrade pip
pip install -r requirements.txt
if [[ ${{ github.event.inputs.with-relationship }} == "true" ]]; then
if [[ -f "../${{ env.WORKING_DIR }}/**relationships.csv" ]]; then
python run_validations.py -i ../files -f ../${{ env.WORKING_DIR }}/**relationships.csv -p ../files/
ls ../files/
if [[ ${{ github.event.inputs.with-relationship }} == true ]]; then
if [[ -f "../${{ env.WORKING_DIR }}/relationships.csv" ]]; then
python run_validations.py -i ../files -f ../${{ env.WORKING_DIR }}/relationships.csv -p ../files/
else
python run_validations.py -i ../files -p ../files/
fi
elif [[ ${{ github.event.inputs.with-relationship }} == "false" ]]; then
elif [[ ${{ github.event.inputs.with-relationship }} == false ]]; then
python run_validations.py -i ../files
fi
- name: Notify Slack
Expand All @@ -58,4 +59,4 @@ jobs:
with:
channel: '#ror-curation-releases'
color: 'good'
text: 'Validation status ${{ steps.validatefiles.outcome }} in ${env.GITHUB_REPOSITORY}. On branch: ${{ env.WORKING_DIR }}. Please check: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}'
text: '${env.GITHUB_REPOSITORY}: Validation status ${{ steps.validatefiles.outcome }} in ${env.GITHUB_REPOSITORY}. On branch: ${{ env.WORKING_DIR }}. Please check: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}'
111 changes: 111 additions & 0 deletions rc-v1.1/new/000vekr11.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
{
"ip_addresses": [],
"aliases": [
"GW4 Alliance",
"Great Western 4"
],
"acronyms": [],
"links": [
"https://gw4.ac.uk"
],
"wikipedia_url": "https://en.wikipedia.org/wiki/GW4",
"external_ids": {
"ISNI": {
"preferred": "0000 0004 7478 045X",
"all": [
"0000 0004 7478 045X"
]
},
"Wikidata": {
"preferred": "Q28402688",
"all": [
"Q28402688"
]
}
},
"established": 2013,
"relationships": [
{
"label": "University of Bristol",
"type": "Related",
"id": "https://ror.org/0524sp257"
},
{
"label": "University of Exeter",
"type": "Related",
"id": "https://ror.org/03yghzc09"
},
{
"label": "University of Bath",
"type": "Related",
"id": "https://ror.org/002h8g185"
},
{
"label": "Cardiff University",
"type": "Related",
"id": "https://ror.org/03kk7td41"
},
{
"label": "GW4 Facility for High-Resolution Electron Cryo-Microscopy",
"type": "Child",
"id": "https://ror.org/022p86748"
}
],
"email_address": null,
"id": "https://ror.org/000vekr11",
"labels": [],
"status": "active",
"name": "GW4",
"types": [
"Education"
],
"addresses": [
{
"lat": 51.45523,
"lng": -2.59665,
"state": null,
"state_code": null,
"country_geonames_id": 2635167,
"city": "Bristol",
"geonames_city": {
"id": 2654675,
"city": "Bristol",
"geonames_admin1": {
"name": "England",
"ascii_name": "England",
"id": 6269131,
"code": "GB.ENG"
},
"geonames_admin2": {
"name": "Bristol",
"id": 3333134,
"ascii_name": "Bristol",
"code": "GB.ENG.B7"
},
"nuts_level1": {
"name": null,
"code": null
},
"nuts_level2": {
"name": null,
"code": null
},
"nuts_level3": {
"name": null,
"code": null
},
"license": {
"attribution": "Data from geonames.org under a CC-BY 3.0 license",
"license": "http://creativecommons.org/licenses/by/3.0/"
}
},
"primary": false,
"postcode": null,
"line": null
}
],
"country": {
"country_name": "United Kingdom",
"country_code": "GB"
}
}
97 changes: 97 additions & 0 deletions rc-v1.1/new/0028hwj42.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
{
"ip_addresses": [],
"aliases": [
"St. Petersburg Research Center RAS"
],
"acronyms": [
"SPbRC RAS"
],
"links": [
"http://www.spbrc.nw.ru"
],
"wikipedia_url": "https://ru.wikipedia.org/wiki/%D0%A1%D0%B0%D0%BD%D0%BA%D1%82-%D0%9F%D0%B5%D1%82%D0%B5%D1%80%D0%B1%D1%83%D1%80%D0%B3%D1%81%D0%BA%D0%B8%D0%B9_%D0%BD%D0%B0%D1%83%D1%87%D0%BD%D1%8B%D0%B9_%D1%86%D0%B5%D0%BD%D1%82%D1%80_%D0%A0%D0%90%D0%9D",
"external_ids": {
"ISNI": {
"preferred": "0000 0001 2225 2258",
"all": [
"0000 0001 2225 2258"
]
},
"Wikidata": {
"preferred": "Q4407733",
"all": [
"Q4407733"
]
}
},
"established": 1983,
"relationships": [
{
"label": "Russian Academy of Sciences",
"type": "Parent",
"id": "https://ror.org/05qrfxd25"
}
],
"email_address": null,
"id": "https://ror.org/0028hwj42",
"labels": [
{
"label": "Санкт-Петербургский научный центр РАН",
"iso639": "ru"
}
],
"status": "active",
"name": "St. Petersburg Research Center of the Russian Academy of Sciences",
"types": [
"Government"
],
"addresses": [
{
"lat": 59.93863,
"lng": 30.31413,
"state": null,
"state_code": null,
"country_geonames_id": 2017370,
"city": "St Petersburg",
"geonames_city": {
"id": 498817,
"city": "St Petersburg",
"geonames_admin1": {
"name": "St.-Petersburg",
"ascii_name": "St.-Petersburg",
"id": 536203,
"code": "RU.66"
},
"geonames_admin2": {
"name": null,
"id": null,
"ascii_name": null,
"code": null
},
"nuts_level1": {
"name": null,
"code": null
},
"nuts_level2": {
"name": null,
"code": null
},
"nuts_level3": {
"name": null,
"code": null
},
"license": {
"attribution": "Data from geonames.org under a CC-BY 3.0 license",
"license": "http://creativecommons.org/licenses/by/3.0/"
}
},
"primary": false,
"postcode": null,
"line": null
}
],
"country": {
"country_name": "Russia",
"country_code": "RU"
}
}
76 changes: 76 additions & 0 deletions rc-v1.1/new/002pvtp37.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"ip_addresses": [],
"aliases": [],
"acronyms": [
"BIM"
],
"links": [
"http://www.bim.government.bg"
],
"wikipedia_url": null,
"external_ids": {},
"established": null,
"relationships": [],
"email_address": null,
"id": "https://ror.org/002pvtp37",
"labels": [
{
"label": "Български институт по метрология",
"iso639": "cu"
}
],
"status": "active",
"name": "Bulgarian Institute of Metrology",
"types": [
"Government"
],
"addresses": [
{
"lat": 42.69751,
"lng": 23.32415,
"state": null,
"state_code": null,
"country_geonames_id": 732800,
"city": "Sofia",
"geonames_city": {
"id": 727011,
"city": "Sofia",
"geonames_admin1": {
"name": "Sofia-Capital",
"ascii_name": "Sofia-Capital",
"id": 731061,
"code": "BG.42"
},
"geonames_admin2": {
"name": "Sofia",
"id": 6458974,
"ascii_name": "Sofia",
"code": "BG.42.SOF46"
},
"nuts_level1": {
"name": null,
"code": null
},
"nuts_level2": {
"name": null,
"code": null
},
"nuts_level3": {
"name": null,
"code": null
},
"license": {
"attribution": "Data from geonames.org under a CC-BY 3.0 license",
"license": "http://creativecommons.org/licenses/by/3.0/"
}
},
"primary": false,
"postcode": null,
"line": null
}
],
"country": {
"country_name": "Bulgaria",
"country_code": "BG"
}
}
Loading

0 comments on commit f4c6d79

Please sign in to comment.