From 9220ba4e014fd09e7bf3914c2845b4bc13a6ae39 Mon Sep 17 00:00:00 2001 From: lizkrznarich Date: Fri, 4 Apr 2025 15:44:19 -0500 Subject: [PATCH 1/4] update references to 2.1 features branchs to point back to main/master --- .github/workflows/dev.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/staging.yml | 4 ++-- requirements.txt | 2 +- rorapi/common/create_update.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index f14191c..8b5f43a 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 23242fa..465f190 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: | diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 68af2f8..a32ac44 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -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: | diff --git a/requirements.txt b/requirements.txt index 5844ea8..f28d73b 100644 --- a/requirements.txt +++ b/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 diff --git a/rorapi/common/create_update.py b/rorapi/common/create_update.py index 0bfc7cc..9c84c24 100644 --- a/rorapi/common/create_update.py +++ b/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): From 927da69774e5ae2b79e1baf51414be6600880b94 Mon Sep 17 00:00:00 2001 From: lizkrznarich Date: Fri, 4 Apr 2025 15:50:23 -0500 Subject: [PATCH 2/4] udpate actions cache version --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 8b5f43a..cfb0895 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -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 }} From eab66b6a80ac9080dc8e99c69b6ab9cf6c348cac Mon Sep 17 00:00:00 2001 From: lizkrznarich Date: Fri, 4 Apr 2025 15:54:34 -0500 Subject: [PATCH 3/4] udpate actions cache version --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index cfb0895..6199f77 100644 --- a/.github/workflows/dev.yml +++ b/.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') }} From 5e6c6d1ea8d2a47a1f35e1db16232cf385ead916 Mon Sep 17 00:00:00 2001 From: lizkrznarich Date: Fri, 4 Apr 2025 16:09:30 -0500 Subject: [PATCH 4/4] udpate actions cache version --- .github/workflows/release.yml | 4 ++-- .github/workflows/staging.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 465f190..bfd0346 100644 --- a/.github/workflows/release.yml +++ b/.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') }} @@ -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 }} diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index a32ac44..57bef2f 100644 --- a/.github/workflows/staging.yml +++ b/.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') }} @@ -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 }}