Merge branch 'master' of github.com:ror-community/ror-updates

ror-community · Apr 18, 2024 · b00ef65 · b00ef65
2 parents 1c79478 + 6eab463
commit b00ef65
Show file tree

Hide file tree

Showing 223 changed files with 24,233 additions and 31 deletions.
diff --git a/.github/ISSUE_TEMPLATE/add-organization-to-ror.md b/.github/ISSUE_TEMPLATE/add-organization-to-ror.md
@@ -11,8 +11,10 @@ Summary of request: Add a new organization to ROR
 
 Name of organization:
 Website: 
+Domains:
 Link to publications: 
 Organization type: 
+Organization status:
 Wikipedia page:
 Wikidata ID:
 ISNI ID:

diff --git a/.github/workflows/generate_relationships.yml b/.github/workflows/generate_relationships.yml
@@ -2,6 +2,13 @@ name: Create relationships
 on:
   workflow_dispatch:
     inputs:
+      schema-version:
+            required: true
+            description: Schema version
+            type: choice
+            options:
+            - v1
+            - v2
       directory-name:
         type: string
         description: Name of parent directory containing records to generate relationships for. Needed only if different from branch name.
@@ -30,8 +37,13 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install requests==2.23.0
-          curl https://raw.githubusercontent.com/ror-community/curation_ops/main/generate_relationships/generate_relationships.py -o generate_relationships.py
-          python generate_relationships.py relationships.csv
+          curl https://raw.githubusercontent.com/ror-community/curation_ops/v2-crosswalk/generate_relationships/generate_relationships.py -o generate_relationships.py
+          if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
+            python generate_relationships.py relationships.csv -v 1
+          fi
+          if [[ ${{ github.event.inputs.schema-version }} == 'v2' ]]; then
+            python generate_relationships.py relationships.csv -v 2
+          fi
       - name: commit error file
         if: ${{ steps.genrelshp.outcome != 'success'}}
         working-directory:  ${{ env.WORKING_DIR }}
@@ -61,4 +73,4 @@ jobs:
         with:
           channel: '#ror-curation-releases'
           color: 'good'
-          text: 'Relationship generation status ${env.VALIDATION_STATUS} in ${env.GITHUB_REPOSITORY}. 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: 'Relationship generation status ${env.VALIDATION_STATUS} in ${env.GITHUB_REPOSITORY}. Using version ${{ github.event.inputs.schema-version }}. 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'
diff --git a/.github/workflows/remove_relationships.yml b/.github/workflows/remove_relationships.yml
@@ -2,6 +2,13 @@ name: Remove relationships to inactive records
 on:
   workflow_dispatch:
     inputs:
+      schema-version:
+          required: true
+          description: Schema version
+          type: choice
+          options:
+          - v1
+          - v2
       directory-name:
         type: string
         description: Name of parent directory containing new/updated records with inactive statuses. Needed only if different from branch name.
@@ -30,8 +37,13 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install requests==2.23.0
-          curl https://raw.githubusercontent.com/ror-community/curation_ops/main/remove_relationships/remove_relationships.py -o remove_relationships.py
-          python remove_relationships.py relationships.csv
+          curl https://raw.githubusercontent.com/ror-community/curation_ops/v2-crosswalk/remove_relationships/remove_relationships.py -o remove_relationships.py
+          if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
+            python remove_relationships.py -v 1
+          fi
+          if [[ ${{ github.event.inputs.schema-version }} == 'v2' ]]; then
+            python remove_relationships.py -v 2
+          fi
       - name: commit error file
         if: ${{ steps.remrelshp.outcome != 'success'}}
         working-directory:  ${{ env.WORKING_DIR }}
@@ -61,4 +73,4 @@ jobs:
         with:
           channel: '#ror-curation-releases'
           color: 'good'
-          text: 'Relationship removal 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: 'Relationship removal status: ${env.VALIDATION_STATUS}. Using version ${{ github.event.inputs.schema-version }}. 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'
diff --git a/.github/workflows/update_addresses.yml b/.github/workflows/update_addresses.yml
@@ -2,6 +2,13 @@ name: Update addresses
 on:
   workflow_dispatch:
     inputs:
+      schema-version:
+          required: true
+          description: Schema version
+          type: choice
+          options:
+          - v1
+          - v2
       directory-name:
         type: string
         description: Name of parent directory containing new/updated records. Needed only if different from branch name.
@@ -30,9 +37,14 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install requests==2.23.0
-          pip install git+https://github.com/ror-community/update_address.git@add-caching
-          curl https://raw.githubusercontent.com/ror-community/curation_ops/separate-address-update/update_address_only/update_addresses.py -o update_addresses.py
-          python update_addresses.py
+          pip install git+https://github.com/ror-community/update_address.git@v2-locations
+          curl https://raw.githubusercontent.com/ror-community/curation_ops/v2-crosswalk/update_address_only/update_addresses.py -o update_addresses.py
+          if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
+            python update_addresses.py -v 1
+          fi
+          if [[ ${{ github.event.inputs.schema-version }} == 'v2' ]]; then
+            python update_addresses.py -v 2
+          fi
       - name: commit error file
         if: ${{ steps.updateaddresses.outcome != 'success'}}
         working-directory:  ${{ env.WORKING_DIR }}
@@ -62,4 +74,4 @@ jobs:
         with:
           channel: '#ror-curation-releases'
           color: 'good'
-          text: 'DEV address 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'
+          text: 'DEV address update status: ${env.VALIDATION_STATUS}. Using version ${{ github.event.inputs.schema-version }}. 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'
diff --git a/.github/workflows/update_labels.yml b/.github/workflows/update_labels.yml
@@ -2,6 +2,13 @@ name: Update labels in related records
 on:
   workflow_dispatch:
     inputs:
+      schema-version:
+          required: true
+          description: Schema version
+          type: choice
+          options:
+          - v1
+          - v2
       directory-name:
         type: string
         description: Name of parent directory containing records to generate relationships for. Needed only if different from branch name.
@@ -29,10 +36,15 @@ jobs:
         working-directory: ${{ env.WORKING_DIR }}
         run: |
           python -m pip install --upgrade pip
-          curl https://raw.githubusercontent.com/ror-community/curation_ops/main/update_related_records/requirements.txt -o requirements.txt
+          curl https://raw.githubusercontent.com/ror-community/curation_ops/v2-crosswalk/update_related_records/requirements.txt -o requirements.txt
           pip install -r requirements.txt
-          curl https://raw.githubusercontent.com/ror-community/curation_ops/main/update_related_records/update_related.py -o update_related.py
-          python update_related.py
+          curl https://raw.githubusercontent.com/ror-community/curation_ops/v2-crosswalk/update_related_records/update_related.py -o update_related.py
+          if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
+            python update_related.py -v 1
+          fi
+          if [[ ${{ github.event.inputs.schema-version }} == 'v2' ]]; then
+            python update_related.py -v 2
+          fi
       - name: commit changed files
         if: ${{ steps.updatelabels.outcome == 'success'}}
         uses: stefanzweifel/git-auto-commit-action@v4
@@ -56,4 +68,4 @@ jobs:
         with:
           channel: '#ror-curation-releases'
           color: 'good'
-          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'
+          text: '${env.GITHUB_REPOSITORY}: Update labels in related records status: ${env.VALIDATION_STATUS}. Using version ${{ github.event.inputs.schema-version }}. 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'
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -2,6 +2,13 @@ name: Validate files
 on:
   workflow_dispatch:
     inputs:
+      schema-version:
+        required: true
+        description: Schema version
+        type: choice
+        options:
+        - v1
+        - v2
       with-relationship:
         type: boolean
         description: Check box to validate with relationships
@@ -29,6 +36,7 @@ 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 != '' }}"
@@ -39,31 +47,61 @@ jobs:
       - name: Validate files
         id: validatefiles
         run: |
+          echo ${{ github.event.inputs.schema-version}}
           mkdir files
           cp ./${{ env.WORKING_DIR }}/*/*.json files/
           cd validation-suite
           python -m pip install --upgrade pip
           pip install -r requirements.txt
+          curl https://raw.githubusercontent.com/ror-community/ror-schema/master/ror_schema.json -o ror_schema.json
+          curl https://raw.githubusercontent.com/ror-community/ror-schema/master/ror_schema_v2_0.json -o ror_schema_v2_0.json
           ls ../files/
-          if [[ ${{ github.event.inputs.skip-geonames }} == true ]]; then
-            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/ --no-geonames
-              else
-                python run_validations.py -i ../files -p ../files/ --no-geonames
+          if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
+            echo "validating v1"
+            if [[ ${{ github.event.inputs.skip-geonames }} == true ]]; then
+              if [[ ${{ github.event.inputs.with-relationship }} == true ]]; then
+                if [[ -f "../${{ env.WORKING_DIR }}/relationships.csv" ]]; then
+                  python run_validations.py -i ../files -v 1 -s ror_schema.json -f ../${{ env.WORKING_DIR }}/relationships.csv -p ../files/ --no-geonames
+                else
+                  python run_validations.py -i ../files -v 1 -s ror_schema.json -p ../files/ --no-geonames
+                fi
+              elif [[ ${{ github.event.inputs.with-relationship }} == false ]]; then
+                python run_validations.py -i ../files -v 1 -s ror_schema.json --no-geonames
+              fi
+            else
+              if [[ ${{ github.event.inputs.with-relationship }} == true ]]; then
+                if [[ -f "../${{ env.WORKING_DIR }}/relationships.csv" ]]; then
+                  python run_validations.py -i ../files -v 1 -s ror_schema.json -f ../${{ env.WORKING_DIR }}/relationships.csv -p ../files/
+                else
+                  python run_validations.py -i ../files -v 1 -s ror_schema.json -p ../files/
+                fi
+              elif [[ ${{ github.event.inputs.with-relationship }} == false ]]; then
+                python run_validations.py -i ../files -v 1 -s ror_schema.json
               fi
-            elif [[ ${{ github.event.inputs.with-relationship }} == false ]]; then
-              python run_validations.py -i ../files --no-geonames
             fi
-          else
-            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
+          if [[ ${{ github.event.inputs.schema-version }} == 'v2' ]]; then
+            echo "validating v2"
+            if [[ ${{ github.event.inputs.skip-geonames }} == true ]]; then
+              if [[ ${{ github.event.inputs.with-relationship }} == true ]]; then
+                if [[ -f "../${{ env.WORKING_DIR }}/relationships.csv" ]]; then
+                  python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json -f ../${{ env.WORKING_DIR }}/relationships.csv -p ../files/ --no-geonames
+                else
+                  python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json -p ../files/ --no-geonames
+                fi
+              elif [[ ${{ github.event.inputs.with-relationship }} == false ]]; then
+                python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json --no-geonames
+              fi
+            else
+              if [[ ${{ github.event.inputs.with-relationship }} == true ]]; then
+                if [[ -f "../${{ env.WORKING_DIR }}/relationships.csv" ]]; then
+                  python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json -f ../${{ env.WORKING_DIR }}/relationships.csv -p ../files/
+                else
+                  python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json -p ../files/
+                fi
+              elif [[ ${{ github.event.inputs.with-relationship }} == false ]]; then
+                python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json
               fi
-            elif [[ ${{ github.event.inputs.with-relationship }} == false ]]; then
-              python run_validations.py -i ../files
             fi
           fi
       - name: Notify Slack
@@ -74,4 +112,4 @@ jobs:
         with:
           channel: '#ror-curation-releases'
           color: 'good'
-          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}'
+          text: '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}'
diff --git a/rc-v1.45/new/004j8pp46.json b/rc-v1.45/new/004j8pp46.json
@@ -0,0 +1,56 @@
+{
+  "admin": {
+    "created": {
+      "date": "2024-04-06",
+      "schema_version": "2.0"
+    },
+    "last_modified": {
+      "date": "2024-04-06",
+      "schema_version": "2.0"
+    }
+  },
+  "domains": [],
+  "established": 2017,
+  "external_ids": [],
+  "id": "https://ror.org/004j8pp46",
+  "links": [
+    {
+      "type": "website",
+      "value": "https://www.shu.edu.pk"
+    }
+  ],
+  "locations": [
+    {
+      "geonames_details": {
+        "country_code": "PK",
+        "country_name": "Pakistan",
+        "lat": 24.8608,
+        "lng": 67.0104,
+        "name": "Karachi"
+      },
+      "geonames_id": 1174872
+    }
+  ],
+  "names": [
+    {
+      "lang": "en",
+      "types": [
+        "acronym"
+      ],
+      "value": "SHU"
+    },
+    {
+      "lang": "en",
+      "types": [
+        "label",
+        "ror_display"
+      ],
+      "value": "Salim Habib University"
+    }
+  ],
+  "relationships": [],
+  "status": "active",
+  "types": [
+    "education"
+  ]
+}
diff --git a/rc-v1.45/new/006q8y354.json b/rc-v1.45/new/006q8y354.json
@@ -0,0 +1,74 @@
+{
+  "admin": {
+    "created": {
+      "date": "2024-04-06",
+      "schema_version": "2.0"
+    },
+    "last_modified": {
+      "date": "2024-04-06",
+      "schema_version": "2.0"
+    }
+  },
+  "domains": [],
+  "established": 2008,
+  "external_ids": [
+    {
+      "all": [
+        "Q1022865"
+      ],
+      "preferred": "Q1022865",
+      "type": "wikidata"
+    }
+  ],
+  "id": "https://ror.org/006q8y354",
+  "links": [
+    {
+      "type": "website",
+      "value": "http://www.cased.de"
+    },
+    {
+      "type": "wikipedia",
+      "value": "https://en.wikipedia.org/wiki/Center_for_Advanced_Security_Research_Darmstadt"
+    }
+  ],
+  "locations": [
+    {
+      "geonames_details": {
+        "country_code": "DE",
+        "country_name": "Germany",
+        "lat": 49.87167,
+        "lng": 8.65027,
+        "name": "Darmstadt"
+      },
+      "geonames_id": 2938913
+    }
+  ],
+  "names": [
+    {
+      "lang": "en",
+      "types": [
+        "acronym"
+      ],
+      "value": "CASED"
+    },
+    {
+      "lang": "en",
+      "types": [
+        "label",
+        "ror_display"
+      ],
+      "value": "Center for Advanced Security Research Darmstadt"
+    }
+  ],
+  "relationships": [
+    {
+      "label": "National Research Center for Applied Cybersecurity ATHENE",
+      "type": "successor",
+      "id": "https://ror.org/0378v2g76"
+    }
+  ],
+  "status": "inactive",
+  "types": [
+    "facility"
+  ]
+}