fix: add manual fixes

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
           - 9200:9200
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Apt update
         run: sudo apt-get update -y
@@ -131,7 +131,7 @@ jobs:
   javascript-tests:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup NodeJS
         uses: actions/setup-node@v2-beta
@@ -142,7 +142,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

.github/workflows/production.yml

@@ -15,7 +15,7 @@ jobs:
       github.event_name == 'workflow_dispatch' ||
       github.event.workflow_run.conclusion == 'success'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: release
       - uses: akhileshns/heroku-deploy@79ef2ae4ff9b897010907016b268fd0f88561820

.github/workflows/release-candiate.yml

@@ -15,7 +15,7 @@ jobs:
       github.event_name == 'workflow_dispatch' ||
       github.event.workflow_run.conclusion == 'success'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: release-candidate
       - uses: akhileshns/heroku-deploy@79ef2ae4ff9b897010907016b268fd0f88561820

.secrets.baseline

@@ -148,7 +148,7 @@
         "filename": "docker-compose-notebook.yml",
         "hashed_secret": "965748b380ab0ab25d1846afc174a3d93a8ec06c",
         "is_verified": false,
-        "line_number": 10
+        "line_number": 7
       }
     ],
     "docker-compose.travis.yml": [
@@ -284,5 +284,5 @@
       }
     ]
   },
-  "generated_at": "2024-04-30T20:24:02Z"
+  "generated_at": "2024-05-15T07:35:56Z"
 }

sheets/coupon_request_api_test.py

@@ -96,15 +96,13 @@ def test_full_sheet_process(
     expected_processed_rows = {6, 8}
     expected_failed_rows = {5, 7}
     assert ResultType.PROCESSED.value in result
-    assert set(result[ResultType.PROCESSED.value]) == expected_processed_rows, (
-        "Rows %s as defined in coupon_requests.csv should be processed"
-        % str(expected_processed_rows)
-    )
+    assert (
+        set(result[ResultType.PROCESSED.value]) == expected_processed_rows
+    ), f"Rows {expected_processed_rows!s} as defined in coupon_requests.csv should be processed"
     assert ResultType.FAILED.value in result
-    assert set(result[ResultType.FAILED.value]) == expected_failed_rows, (
-        "Rows %s as defined in coupon_requests.csv should fail"
-        % str(expected_failed_rows)
-    )
+    assert (
+        set(result[ResultType.FAILED.value]) == expected_failed_rows
+    ), f"Rows {expected_failed_rows!s} as defined in coupon_requests.csv should fail"
     # A CouponGenerationRequest should be created for each row that wasn't ignored and did not fail full sheet
     # validation (CSV has 1 row that should fail validation, hence the 1)
     assert CouponGenerationRequest.objects.all().count() == (

voucher/utils_test.py

@@ -221,7 +221,7 @@ def test_voucher_upload_path(voucher_and_exact_match_with_coupon):
     voucher = voucher_and_exact_match_with_coupon.voucher
     assert (
         re.match(
-            r"vouchers\/\w{8}\-\w{4}\-\w{4}\-\w{4}-\w{12}_%s" % voucher.pdf.name,
+            rf"vouchers\/\w{8}\-\w{4}\-\w{4}\-\w{4}-\w{12}_{voucher.pdf.name}",
             voucher_upload_path(voucher, voucher.pdf.name),
         )
         is not None