Merge staging to master: update references to 2.1 feature branches

.github/workflows/dev.yml

@@ -48,7 +48,7 @@ jobs:
           echo ${FILE%.*}
           echo "LATEST_DUMP_FILE=${FILE%.*}" >> $GITHUB_ENV
       - name: Cache dependency
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
@@ -70,7 +70,7 @@ jobs:
         working-directory: ./ror-api
         run: |
           python manage.py setup v1.55-2024-10-31-ror-data -t
-          # Dump file temp hard coded for v2 beta
+          # Dump file temp hard coded for v2.1 release
           # Pulled from ror-data-test per settings.py config
       - name: Test
         working-directory: ./ror-api
@@ -89,7 +89,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
         with:
           path: ror-api
       - name: Cache dependency
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
@@ -53,8 +53,8 @@ jobs:
       - name: Setup
         working-directory: ./ror-api
         run: |
-          python manage.py setup v1.35-2023-10-26-ror-data -t
-          # temp hard-coded dump file for v2 beta
+          python manage.py setup v1.55-2024-10-31-ror-data -t
+          # temp hard-coded dump file for v2.1 release
       - name: Test
         working-directory: ./ror-api
         run: |
@@ -72,7 +72,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/staging.yml

@@ -33,7 +33,7 @@ jobs:
         with:
           path: ror-api
       - name: Cache dependency
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
@@ -54,8 +54,8 @@ jobs:
       - name: Setup
         working-directory: ./ror-api
         run: |
-          python manage.py setup v1.35-2023-10-26-ror-data -t
-          # temp hard-coded dump file for v2 beta
+          python manage.py setup v1.55-2024-10-31-ror-data -t
+          # temp hard-coded dump file for v2.1 release
       - name: Test
         working-directory: ./ror-api
         run: |
@@ -73,7 +73,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

requirements.txt

@@ -20,7 +20,7 @@ boto3
 pandas==1.4.1
 numpy==1.22
 titlecase==2.3
-update_address @ git+https://github.com/ror-community/update_address.git@v2-1-locations
+update_address @ git+https://github.com/ror-community/update_address.git
 launchdarkly-server-sdk==7.6.1
 jsonschema==3.2.0
 python-magic

rorapi/common/create_update.py

@@ -8,7 +8,7 @@
 )
 from rorapi.management.commands.generaterorid import check_ror_id
 
-V2_SCHEMA = get_file_from_url("https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/schema-v2-1/ror_schema_v2_1.json")
+V2_SCHEMA = get_file_from_url("https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/master/ror_schema_v2_1.json")
 
 
 def update_record(json_input, existing_record):