Skip to content

Commit

Permalink
Merge pull request #170 from ror-community/staging
Browse files Browse the repository at this point in the history
Merge v1.53 to production
  • Loading branch information
adambuttrick authored Oct 14, 2024
2 parents 15f6f89 + 1ba9038 commit 50aa83e
Show file tree
Hide file tree
Showing 720 changed files with 77,573 additions and 7 deletions.
1 change: 0 additions & 1 deletion .github/workflows/generate_dump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
with:
repository: ror-community/curation_ops
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
ref: v2-crosswalk
path: ./curation_ops
- name: Set up Python environment
uses: actions/setup-python@v2
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/staging_manual_index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ jobs:
uses: actions/checkout@v2
with:
repository: ror-community/validation-suite
ref: schema-v2
path: validation-suite
- name: Validate files
id: validatefiles
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/staging_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ jobs:
uses: actions/checkout@v2
with:
repository: ror-community/validation-suite
ref: schema-v2
path: validation-suite
- name: Validate files
id: validatefiles
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:
uses: actions/checkout@v2
with:
repository: ror-community/validation-suite
ref: schema-v2
path: validation-suite
- name: Get directory name
if: "${{ github.event.inputs.directory-name != '' }}"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ JSON files for new and updated ROR records should be validated before generating
4. If this workflow fails, there's an issue with the data in one of more ROR record JSON files that needs to be corrected. In that case, check the error details, make the needed corrections, commit and push the files to your working branch and repeat steps 1-3 to re-run the Validate files workflow.

## Generate relationships
Relationships are not included in the intitial ROR record JSON files. Relationships are generated using a script [generaterelationships.py](https://github.com/ror-community/curation_ops/blob/v2-crosswalk/generate_relationships/generate_relationships.py) triggered by a Github action [Create relationships](https://github.com/ror-community/ror-updates/actions/workflows/generate_relationships.yml), which should be run AFTER all new and updated JSON records to be included in the release are uploaded to ror-updates.
Relationships are not included in the intitial ROR record JSON files. Relationships are generated using a script [generaterelationships.py](https://github.com/ror-community/curation_ops/blob/main/generate_relationships/generate_relationships.py) triggered by a Github action [Create relationships](https://github.com/ror-community/ror-updates/actions/workflows/generate_relationships.yml), which should be run AFTER all new and updated JSON records to be included in the release are uploaded to ror-updates.


1. Create relationships list as a CSV file using the template [[TEMPLATE] relationships.csv](https://docs.google.com/spreadsheets/d/17rA549Q6Vc-YyH8WUtXUOvsAROwCDmt1vy4Rjce-ELs) and name the file relationships.csv. **IMPORTANT! File must be named relationships.csv and fields used by the script must be formatted correctly**. Template fields used by the script are:
Expand Down Expand Up @@ -136,7 +136,7 @@ Relationships are not included in the intitial ROR record JSON files. Relationsh
## Remove relationships to inactive records
Active records cannot contain relationships to inactive or withdrawn records. On each release, all release records must be checked for status changes and, for any where status changed from active to inactive or withdrawn, relationships to those records must be removed from active records (both in the release and in production).

Relationships to inactive records are removed using a script [remove_relationships.py](https://github.com/ror-community/curation_ops/blob/v2-crosswalk/remove_relationships/remove_relationships.py) triggered by a Github action [Remove relationships to inactive records](https://github.com/ror-community/ror-updates/actions/workflows/remove_relationships.yml), which must be run AFTER the Generate relationships action.
Relationships to inactive records are removed using a script [remove_relationships.py](https://github.com/ror-community/curation_ops/blob/main/remove_relationships/remove_relationships.py) triggered by a Github action [Remove relationships to inactive records](https://github.com/ror-community/ror-updates/actions/workflows/remove_relationships.yml), which must be run AFTER the Generate relationships action.


1. Go to https://github.com/ror-community/ror-updates/actions/workflows/remove_relationships.yml (Actions > Remove relationships to inactive records in the ror-updates repository)
Expand Down Expand Up @@ -168,7 +168,7 @@ All release records must have their locations.geonames_details checked against t
## Update last modified dates
All release records must have their last modified date updated to match the (planned) date of the release. Ideally, this date should match the data dump file date. Release file generation is often completed 1 or more days before the release is actually deployed. In that case, the planned release date should be used (not the current date).

Last modified dates are updated using a script [update_last_mod.py](https://github.com/ror-community/curation_ops/blob/v2-crosswalk/utilities/update_last_mod/update_last_mod.py) triggered by a Github action [Update last modified date](https://github.com/ror-community/ror-updates/actions/workflows/update_last_mod.yml). This action should be run after all other changes to release files are complete.
Last modified dates are updated using a script [update_last_mod.py](https://github.com/ror-community/curation_ops/blob/main/utilities/update_last_mod/update_last_mod.py) triggered by a Github action [Update last modified date](https://github.com/ror-community/ror-updates/actions/workflows/update_last_mod.yml). This action should be run after all other changes to release files are complete.

1. Go to https://github.com/ror-community/ror-updates/actions/workflows/update_last_mod.yml(Actions > Update last modified date in the ror-updates repository)
2. Click Run workflow at right and set the following options:
Expand Down
81 changes: 81 additions & 0 deletions v1.53/000nwmh60.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"admin": {
"created": {
"date": "2018-11-14",
"schema_version": "1.0"
},
"last_modified": {
"date": "2024-10-14",
"schema_version": "2.0"
}
},
"domains": [],
"established": 1997,
"external_ids": [
{
"all": [
"grid.436061.6"
],
"preferred": "grid.436061.6",
"type": "grid"
},
{
"all": [
"0000 0001 0586 9504"
],
"preferred": null,
"type": "isni"
},
{
"all": [
"Q1781428"
],
"preferred": null,
"type": "wikidata"
}
],
"id": "https://ror.org/000nwmh60",
"links": [
{
"type": "website",
"value": "http://www.l-3com.com/"
},
{
"type": "wikipedia",
"value": "https://en.wikipedia.org/wiki/L-3_Communications"
}
],
"locations": [
{
"geonames_details": {
"country_code": "US",
"country_name": "United States",
"lat": 40.71427,
"lng": -74.00597,
"name": "New York"
},
"geonames_id": 5128581
}
],
"names": [
{
"lang": null,
"types": [
"ror_display",
"label"
],
"value": "L-3 Communications (United States)"
}
],
"relationships": [
{
"label": "L3Harris (United States)",
"type": "successor",
"id": "https://ror.org/05fhwtx59"
}
],
"status": "inactive",
"types": [
"company"
]
}
83 changes: 83 additions & 0 deletions v1.53/000xab928.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"admin": {
"created": {
"date": "2024-10-13",
"schema_version": "2.0"
},
"last_modified": {
"date": "2024-10-14",
"schema_version": "2.0"
}
},
"domains": [
"emgfa.pt"
],
"established": null,
"external_ids": [
{
"all": [
"0000 0001 0701 1632"
],
"preferred": "0000 0001 0701 1632",
"type": "isni"
},
{
"all": [
"Q10275408"
],
"preferred": "Q10275408",
"type": "wikidata"
}
],
"id": "https://ror.org/000xab928",
"links": [
{
"type": "website",
"value": "https://www.emgfa.pt"
},
{
"type": "wikipedia",
"value": "https://en.wikipedia.org/wiki/Armed_Forces_General_Staff_%28Portugal%29"
}
],
"locations": [
{
"geonames_details": {
"country_code": "PT",
"country_name": "Portugal",
"lat": 38.71667,
"lng": -9.13333,
"name": "Lisbon"
},
"geonames_id": 2267057
}
],
"names": [
{
"lang": "pt",
"types": [
"acronym"
],
"value": "EMGFA"
},
{
"lang": "pt",
"types": [
"label",
"ror_display"
],
"value": "Estado-Maior-General das Forças Armadas"
}
],
"relationships": [
{
"label": "Instituto Universitário Militar",
"type": "child",
"id": "https://ror.org/029me2p54"
}
],
"status": "active",
"types": [
"government"
]
}
79 changes: 79 additions & 0 deletions v1.53/001br4864.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"admin": {
"created": {
"date": "2024-10-13",
"schema_version": "2.0"
},
"last_modified": {
"date": "2024-10-14",
"schema_version": "2.0"
}
},
"domains": [],
"established": 2019,
"external_ids": [],
"id": "https://ror.org/001br4864",
"links": [
{
"type": "website",
"value": "https://biomedicale.u-paris.fr/biomedtech-facilities/"
}
],
"locations": [
{
"geonames_details": {
"country_code": "FR",
"country_name": "France",
"lat": 48.85341,
"lng": 2.3488,
"name": "Paris"
},
"geonames_id": 2988507
}
],
"names": [
{
"lang": "en",
"types": [
"label",
"ror_display"
],
"value": "Biomedtech Facilities"
},
{
"lang": null,
"types": [
"alias"
],
"value": "UMS 2009"
},
{
"lang": null,
"types": [
"alias"
],
"value": "US36"
}
],
"relationships": [
{
"label": "Université Paris Cité",
"type": "parent",
"id": "https://ror.org/05f82e368"
},
{
"label": "Inserm",
"type": "parent",
"id": "https://ror.org/02vjkv261"
},
{
"label": "Centre National de la Recherche Scientifique",
"type": "parent",
"id": "https://ror.org/02feahw73"
}
],
"status": "active",
"types": [
"facility"
]
}
Loading

0 comments on commit 50aa83e

Please sign in to comment.