From 8bf8cf59dca11764f44d14a461879ca34fe2991d Mon Sep 17 00:00:00 2001
From: Kyle Sunden <git@ksunden.space>
Date: Wed, 19 Jun 2024 14:06:20 -0500
Subject: [PATCH 1/2] Backport PR #28425: Fix Circle yaml line length

---
 .github/workflows/circleci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml
index cfdf184b8666..4e5733e03466 100644
--- a/.github/workflows/circleci.yml
+++ b/.github/workflows/circleci.yml
@@ -10,7 +10,8 @@ jobs:
     name: Run CircleCI artifacts redirector
     steps:
       - name: GitHub Action step
-        uses: scientific-python/circleci-artifacts-redirector-action@4e13a10d89177f4bfc8007a7064bdbeda848d8d1  # v1.0.0
+        uses: | #v1.0.0
+          scientific-python/circleci-artifacts-redirector-action@4e13a10d89177f4bfc8007a7064bdbeda848d8d1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           api-token: ${{ secrets.CIRCLECI_TOKEN }}

From f8d15bdac2c85a55e976278392fbe7022ef521f7 Mon Sep 17 00:00:00 2001
From: Ruth Comer <10599679+rcomer@users.noreply.github.com>
Date: Thu, 20 Jun 2024 10:14:59 +0100
Subject: [PATCH 2/2] Backport PR #28427: Fix circleci yaml

---
 .github/workflows/circleci.yml | 4 ++--
 .yamllint.yml                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml
index 4e5733e03466..3aead720cf20 100644
--- a/.github/workflows/circleci.yml
+++ b/.github/workflows/circleci.yml
@@ -10,8 +10,8 @@ jobs:
     name: Run CircleCI artifacts redirector
     steps:
       - name: GitHub Action step
-        uses: | #v1.0.0
-          scientific-python/circleci-artifacts-redirector-action@4e13a10d89177f4bfc8007a7064bdbeda848d8d1
+        uses:
+          scientific-python/circleci-artifacts-redirector-action@4e13a10d89177f4bfc8007a7064bdbeda848d8d1  # v1.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           api-token: ${{ secrets.CIRCLECI_TOKEN }}
diff --git a/.yamllint.yml b/.yamllint.yml
index 3b30533ececa..2be81b28c7fb 100644
--- a/.yamllint.yml
+++ b/.yamllint.yml
@@ -3,7 +3,7 @@ extends: default
 
 rules:
   line-length:
-    max: 111
+    max: 120
     allow-non-breakable-words: true
   truthy:
     check-keys: false