You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "dependabot[bot] (via GitHub)" <gi...@apache.org> on 2026/05/01 20:21:19 UTC
[PR] Bump the uv-dependency-updates group in /dev/breeze with 3 updates [airflow]
dependabot[bot] opened a new pull request, #66228:
URL: https://github.com/apache/airflow/pull/66228
Bumps the uv-dependency-updates group in /dev/breeze with 3 updates: [packaging](https://github.com/pypa/packaging), [prek](https://github.com/j178/prek) and [boto3](https://github.com/boto/boto3).
Updates `packaging` from 26.1 to 26.2
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/pypa/packaging/releases">packaging's releases</a>.</em></p>
<blockquote>
<h2>26.2</h2>
<h2>What's Changed</h2>
<p>Fixes:</p>
<ul>
<li>Fix incorrect sysconfig var name for pyemscripten by <a href="https://github.com/ryanking13"><code>@ryanking13</code></a> in <a href="https://redirect.github.com/pypa/packaging/pull/1160">pypa/packaging#1160</a></li>
<li>Make <code>Version</code>, <code>Specifier</code>, <code>SpecifierSet</code>, <code>Tag</code>, <code>Marker</code>, and <code>Requirement</code> pickle-safe
and backward-compatible with pickles created in 25.0-26.1 (including references to the removed
<code>packaging._structures</code> module) by <a href="https://github.com/eachimei"><code>@eachimei</code></a> and <a href="https://github.com/henryiii"><code>@henryiii</code></a> in <a href="https://redirect.github.com/pypa/packaging/pull/1163">pypa/packaging#1163</a>, <a href="https://redirect.github.com/pypa/packaging/pull/1168">pypa/packaging#1168</a>, <a href="https://redirect.github.com/pypa/packaging/pull/1170">pypa/packaging#1170</a>, and <a href="https://redirect.github.com/pypa/packaging/pull/1171">pypa/packaging#1171</a></li>
<li>fix: re-export ExceptionGroup for now by <a href="https://github.com/henryiii"><code>@henryiii</code></a> in <a href="https://redirect.github.com/pypa/packaging/pull/1164">pypa/packaging#1164</a></li>
</ul>
<p>Documentation:</p>
<ul>
<li>docs: add errors section and fix missing details by <a href="https://github.com/henryiii"><code>@henryiii</code></a> in <a href="https://redirect.github.com/pypa/packaging/pull/1159">pypa/packaging#1159</a></li>
<li>docs(dev): document property-based test suite by <a href="https://github.com/r266-tech"><code>@r266-tech</code></a> in <a href="https://redirect.github.com/pypa/packaging/pull/1167">pypa/packaging#1167</a></li>
<li>Fix typo in DirectUrl documentation by <a href="https://github.com/sbidoul"><code>@sbidoul</code></a> in <a href="https://redirect.github.com/pypa/packaging/pull/1169">pypa/packaging#1169</a></li>
<li>docs(specifiers): add is_unsatisfiable() usage example by <a href="https://github.com/r266-tech"><code>@r266-tech</code></a> in <a href="https://redirect.github.com/pypa/packaging/pull/1166">pypa/packaging#1166</a></li>
</ul>
<p>Internal:</p>
<ul>
<li>Enable the auditor persona on zizmor by <a href="https://github.com/henryiii"><code>@henryiii</code></a> in <a href="https://redirect.github.com/pypa/packaging/pull/1158">pypa/packaging#1158</a></li>
<li>Test new pickle guarantees by <a href="https://github.com/henryiii"><code>@henryiii</code></a> in <a href="https://redirect.github.com/pypa/packaging/pull/1174">pypa/packaging#1174</a></li>
<li>Use native uv integration in rtd by <a href="https://github.com/henryiii"><code>@henryiii</code></a> in <a href="https://redirect.github.com/pypa/packaging/pull/1175">pypa/packaging#1175</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/ryanking13"><code>@ryanking13</code></a> made their first contribution in <a href="https://redirect.github.com/pypa/packaging/pull/1160">pypa/packaging#1160</a></li>
<li><a href="https://github.com/eachimei"><code>@eachimei</code></a> made their first contribution in <a href="https://redirect.github.com/pypa/packaging/pull/1163">pypa/packaging#1163</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/pypa/packaging/compare/26.1...26.2">https://github.com/pypa/packaging/compare/26.1...26.2</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/pypa/packaging/blob/main/CHANGELOG.rst">packaging's changelog</a>.</em></p>
<blockquote>
<p>26.2 - 2026-04-24</p>
<pre><code>
Fixes:
<ul>
<li>Fix incorrect sysconfig var name for pyemscripten in (:pull:<code>1160</code>)</li>
<li>Make <code>Version</code>, <code>Specifier</code>, <code>SpecifierSet</code>, <code>Tag</code>, <code>Marker</code>, and <code>Requirement</code> pickle-safe<br />
and backward-compatible with pickles created in 25.0-26.1 (including references to the removed<br />
<code>packaging._structures</code> module) (:pull:<code>1163</code>, :pull:<code>1168</code>, :pull:<code>1170</code>, :pull:<code>1171</code>)</li>
<li>Re-export <code>ExceptionGroup</code> in metadata for now in (:pull:<code>1164</code>)</li>
</ul>
<p>Documentation:</p>
<ul>
<li>Add errors section and fix missing details in (:pull:<code>1159</code>)</li>
<li>Document our property-based test suite in (:pull:<code>1167</code>)</li>
<li>Fix a <code>DirectUrl</code> typo in (:pull:<code>1167</code>)</li>
<li>Add example of <code>is_unsatisfiable</code> in (:pull:<code>1166</code>)</li>
</ul>
<p>Internal:</p>
<ul>
<li>Enable the auditor persona on zizmor in (:pull:<code>1158</code>)</li>
<li>Test new pickle guarantees in (:pull:<code>1174</code>)</li>
<li>Use new native ReadTheDocs uv integration in (:pull:<code>1175</code>)<br />
</code></pre></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/pypa/packaging/commit/84a87ee42483d7352f9502d78a9553da8859aa7a"><code>84a87ee</code></a> Bump for release</li>
<li><a href="https://github.com/pypa/packaging/commit/4a616b65bed23c8c6d58e6b0fc1a4434d4ff1f14"><code>4a616b6</code></a> docs: a few more updates to prepare for 26.2 (<a href="https://redirect.github.com/pypa/packaging/issues/1176">#1176</a>)</li>
<li><a href="https://github.com/pypa/packaging/commit/9de6f44f1e82d4595edf3aad1c4f6f98c85935a0"><code>9de6f44</code></a> ci: use native uv integration in rtd (<a href="https://redirect.github.com/pypa/packaging/issues/1175">#1175</a>)</li>
<li><a href="https://github.com/pypa/packaging/commit/bc76e14debd1a2799d1ca8f9d9c9823f35bfa466"><code>bc76e14</code></a> chore: update changelog for 26.2 (<a href="https://redirect.github.com/pypa/packaging/issues/1161">#1161</a>)</li>
<li><a href="https://github.com/pypa/packaging/commit/3f00091c08f0aa830e33ed7db00f16f11c8ac97f"><code>3f00091</code></a> tests: add a pickle check (<a href="https://redirect.github.com/pypa/packaging/issues/1174">#1174</a>)</li>
<li><a href="https://github.com/pypa/packaging/commit/48a8a069805291186522de3eff73ea80a8ca96ad"><code>48a8a06</code></a> fix: make Requirements/Markers pickle-safe (<a href="https://redirect.github.com/pypa/packaging/issues/1171">#1171</a>)</li>
<li><a href="https://github.com/pypa/packaging/commit/823b44ed1f904084a77ae3adf0ef130af6365f84"><code>823b44e</code></a> fix: make Tags pickle-safe (<a href="https://redirect.github.com/pypa/packaging/issues/1170">#1170</a>)</li>
<li><a href="https://github.com/pypa/packaging/commit/4bed32d920ca7211dd65fdf0a1ee06376e9c4733"><code>4bed32d</code></a> fix: make Specifier / SpecifierSet pickle-safe (<a href="https://redirect.github.com/pypa/packaging/issues/1168">#1168</a>)</li>
<li><a href="https://github.com/pypa/packaging/commit/963118e37caae97bc8b72f72956c7fb4ca9857ec"><code>963118e</code></a> fix: re-export ExceptionGroup for now (<a href="https://redirect.github.com/pypa/packaging/issues/1164">#1164</a>)</li>
<li><a href="https://github.com/pypa/packaging/commit/66e34a80256c96dea11da143682950c84b8133bb"><code>66e34a8</code></a> docs(specifiers): add is_unsatisfiable() usage example (<a href="https://redirect.github.com/pypa/packaging/issues/1166">#1166</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/pypa/packaging/compare/26.1...26.2">compare view</a></li>
</ul>
</details>
<br />
Updates `prek` from 0.3.10 to 0.3.11
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/j178/prek/releases">prek's releases</a>.</em></p>
<blockquote>
<h2>0.3.11</h2>
<h2>Release Notes</h2>
<p>Released on 2026-04-27.</p>
<h3>Highlights</h3>
<p>Hook entries now have an explicit <code>shell</code> option for shell snippets. Set
<code>shell: sh</code>, <code>bash</code>, <code>pwsh</code>, <code>powershell</code>, or <code>cmd</code> when an entry should be
evaluated by that shell; leaving it unset keeps prek's direct argv execution.</p>
<p><code>prek auto-update</code> can now filter tag candidates before choosing an update.
Both options take glob patterns: use <code>--include-tag</code> to only consider matching
tag names, and <code>--exclude-tag</code> to skip matching tags such as moving tags or
prereleases.</p>
<h3>Enhancements</h3>
<ul>
<li>Add <code>auto-update --exclude-repo <repo></code> to skip repos (<a href="https://redirect.github.com/j178/prek/pull/1983">#1983</a>)</li>
<li>Add <code>auto-update --exit-code</code> to exit with non-zero on updates (<a href="https://redirect.github.com/j178/prek/pull/2002">#2002</a>)</li>
<li>Add <code>auto-update --include-tag <pattern></code>/<code>--exclude-tag <pattern></code> to filter tags (<a href="https://redirect.github.com/j178/prek/pull/1984">#1984</a>)</li>
<li>Adds an explicit <code>shell</code> hook option for entries that should run as shell source (<a href="https://redirect.github.com/j178/prek/pull/2004">#2004</a>)</li>
<li>Make <code>--hook-dir</code> optional for hook-impl (<a href="https://redirect.github.com/j178/prek/pull/1989">#1989</a>)</li>
<li>Skip shim warning when <code>--script-version</code> is missing (<a href="https://redirect.github.com/j178/prek/pull/1990">#1990</a>)</li>
</ul>
<h3>Bug fixes</h3>
<ul>
<li>Install Ruby executable in gem bin (<a href="https://redirect.github.com/j178/prek/pull/2017">#2017</a>)</li>
<li>Use dedicated Android npm package (<a href="https://redirect.github.com/j178/prek/pull/1982">#1982</a>)</li>
<li>Use stable repo keys without breaking cached clones (<a href="https://redirect.github.com/j178/prek/pull/1995">#1995</a>)</li>
</ul>
<h3>Documentation</h3>
<ul>
<li>Explain prek name (<a href="https://redirect.github.com/j178/prek/pull/1980">#1980</a>)</li>
<li>Clarify <code>pass_filenames</code> concurrency docs (<a href="https://redirect.github.com/j178/prek/pull/1999">#1999</a>)</li>
<li>Reorganize documentation references (<a href="https://redirect.github.com/j178/prek/pull/2005">#2005</a>)</li>
<li>Clarify hook author manifest env docs (<a href="https://redirect.github.com/j178/prek/pull/1991">#1991</a>)</li>
<li>docs: add Sentry to users list (<a href="https://redirect.github.com/j178/prek/pull/1981">#1981</a>)</li>
</ul>
<h3>Contributors</h3>
<ul>
<li><a href="https://github.com/j178"><code>@j178</code></a></li>
</ul>
<h2>Install prek 0.3.11</h2>
<h3>Install prebuilt binaries via shell script</h3>
<pre lang="sh"><code>curl --proto '=https' --tlsv1.2 -LsSf https://github.com/j178/prek/releases/download/v0.3.11/prek-installer.sh | sh
</code></pre>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/j178/prek/blob/master/CHANGELOG.md">prek's changelog</a>.</em></p>
<blockquote>
<h2>0.3.11</h2>
<p>Released on 2026-04-27.</p>
<h3>Highlights</h3>
<p>Hook entries now have an explicit <code>shell</code> option for shell snippets. Set
<code>shell: sh</code>, <code>bash</code>, <code>pwsh</code>, <code>powershell</code>, or <code>cmd</code> when an entry should be
evaluated by that shell; leaving it unset keeps prek's direct argv execution.</p>
<p><code>prek auto-update</code> can now filter tag candidates before choosing an update.
Both options take glob patterns: use <code>--include-tag</code> to only consider matching
tag names, and <code>--exclude-tag</code> to skip matching tags such as moving tags or
prereleases.</p>
<h3>Enhancements</h3>
<ul>
<li>Add <code>auto-update --exclude-repo <repo></code> to skip repos (<a href="https://redirect.github.com/j178/prek/pull/1983">#1983</a>)</li>
<li>Add <code>auto-update --exit-code</code> to exit with non-zero on updates (<a href="https://redirect.github.com/j178/prek/pull/2002">#2002</a>)</li>
<li>Add <code>auto-update --include-tag <pattern></code>/<code>--exclude-tag <pattern></code> to filter tags (<a href="https://redirect.github.com/j178/prek/pull/1984">#1984</a>)</li>
<li>Adds an explicit <code>shell</code> hook option for entries that should run as shell source (<a href="https://redirect.github.com/j178/prek/pull/2004">#2004</a>)</li>
<li>Make <code>--hook-dir</code> optional for hook-impl (<a href="https://redirect.github.com/j178/prek/pull/1989">#1989</a>)</li>
<li>Skip shim warning when <code>--script-version</code> is missing (<a href="https://redirect.github.com/j178/prek/pull/1990">#1990</a>)</li>
</ul>
<h3>Bug fixes</h3>
<ul>
<li>Install Ruby executable in gem bin (<a href="https://redirect.github.com/j178/prek/pull/2017">#2017</a>)</li>
<li>Use dedicated Android npm package (<a href="https://redirect.github.com/j178/prek/pull/1982">#1982</a>)</li>
<li>Use stable repo keys without breaking cached clones (<a href="https://redirect.github.com/j178/prek/pull/1995">#1995</a>)</li>
</ul>
<h3>Documentation</h3>
<ul>
<li>Explain prek name (<a href="https://redirect.github.com/j178/prek/pull/1980">#1980</a>)</li>
<li>Clarify <code>pass_filenames</code> concurrency docs (<a href="https://redirect.github.com/j178/prek/pull/1999">#1999</a>)</li>
<li>Reorganize documentation references (<a href="https://redirect.github.com/j178/prek/pull/2005">#2005</a>)</li>
<li>Clarify hook author manifest env docs (<a href="https://redirect.github.com/j178/prek/pull/1991">#1991</a>)</li>
<li>docs: add Sentry to users list (<a href="https://redirect.github.com/j178/prek/pull/1981">#1981</a>)</li>
</ul>
<h3>Contributors</h3>
<ul>
<li><a href="https://github.com/j178"><code>@j178</code></a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/j178/prek/commit/8e731a9313fa9a9bc7c02adec9e6f35ec7e1df62"><code>8e731a9</code></a> Bump version to 0.3.11 (<a href="https://redirect.github.com/j178/prek/issues/2018">#2018</a>)</li>
<li><a href="https://github.com/j178/prek/commit/24302f7fbf4cfff6b6c23590ed7889209f78c112"><code>24302f7</code></a> Install Ruby executable in gem bin (<a href="https://redirect.github.com/j178/prek/issues/2017">#2017</a>)</li>
<li><a href="https://github.com/j178/prek/commit/adf72c6b23a53e25d0d722953b32d5dba42351e1"><code>adf72c6</code></a> Update Rust crate rayon to v1.12.0 (<a href="https://redirect.github.com/j178/prek/issues/2015">#2015</a>)</li>
<li><a href="https://github.com/j178/prek/commit/95b88748006c9baae202068f7d6956c4332ffc1d"><code>95b8874</code></a> Update Rust crate webpki-root-certs to v1.0.7 (<a href="https://redirect.github.com/j178/prek/issues/2014">#2014</a>)</li>
<li><a href="https://github.com/j178/prek/commit/2692d8364ff9ec643d3d0f7b5f2130376fae8c80"><code>2692d83</code></a> Update Rust crate libc to v0.2.185 (<a href="https://redirect.github.com/j178/prek/issues/2013">#2013</a>)</li>
<li><a href="https://github.com/j178/prek/commit/14770255e2bba6410b4ee7cd80ae524ce42cfb22"><code>1477025</code></a> Update Rust crate tokio to v1.52.1 (<a href="https://redirect.github.com/j178/prek/issues/2016">#2016</a>)</li>
<li><a href="https://github.com/j178/prek/commit/efaf80458610e2f1f97afc273a30e5c84629c894"><code>efaf804</code></a> Update Rust crate clap_complete to v4.6.2 (<a href="https://redirect.github.com/j178/prek/issues/2012">#2012</a>)</li>
<li><a href="https://github.com/j178/prek/commit/12033f714fe02b3853b10178558d7d322be39a7c"><code>12033f7</code></a> Update Rust crate clap to v4.6.1 (<a href="https://redirect.github.com/j178/prek/issues/2011">#2011</a>)</li>
<li><a href="https://github.com/j178/prek/commit/96ebb94253a092ce860262edd395afb949a21a24"><code>96ebb94</code></a> Update Rust crate assert_cmd to v2.2.1 (<a href="https://redirect.github.com/j178/prek/issues/2010">#2010</a>)</li>
<li><a href="https://github.com/j178/prek/commit/55da2dce95ed2dd2b70fbe978be96e4ac451491c"><code>55da2dc</code></a> Update GitHub Actions (<a href="https://redirect.github.com/j178/prek/issues/2008">#2008</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/j178/prek/compare/v0.3.10...v0.3.11">compare view</a></li>
</ul>
</details>
<br />
Updates `boto3` from 1.42.94 to 1.42.96
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/boto/boto3/commit/60921ee112275b89a361d137657d9d48daacbf2a"><code>60921ee</code></a> Merge branch 'release-1.42.96'</li>
<li><a href="https://github.com/boto/boto3/commit/508588d61de44577d761094e3f204dd85a0eb3c0"><code>508588d</code></a> Bumping version to 1.42.96</li>
<li><a href="https://github.com/boto/boto3/commit/fd3d17795980826ef2b5e34fd4eb62338d1ecc55"><code>fd3d177</code></a> Add changelog entries from botocore</li>
<li><a href="https://github.com/boto/boto3/commit/4be6bbd12cb1ad40505dab385bafab62e70a4da8"><code>4be6bbd</code></a> chore: enable dependabot for pre-commit and refresh hook pins (<a href="https://redirect.github.com/boto/boto3/issues/4775">#4775</a>)</li>
<li><a href="https://github.com/boto/boto3/commit/a47ce816eb1f088956353335f2bd2cd56b6b1fc6"><code>a47ce81</code></a> Merge branch 'release-1.42.95'</li>
<li><a href="https://github.com/boto/boto3/commit/4ccdda83164e69faf24839542d20a523c5263465"><code>4ccdda8</code></a> Merge branch 'release-1.42.95' into develop</li>
<li><a href="https://github.com/boto/boto3/commit/03cc5cdf7c550b4a36d43f07745f77aa9dbc0c9a"><code>03cc5cd</code></a> Bumping version to 1.42.95</li>
<li><a href="https://github.com/boto/boto3/commit/ab160a576b0e6e150a9752837fe5e52961ae7349"><code>ab160a5</code></a> Add changelog entries from botocore</li>
<li><a href="https://github.com/boto/boto3/commit/0017b80aa909dd8e95cfde8f79345cef8bcafc66"><code>0017b80</code></a> Merge branch 'release-1.42.94' into develop</li>
<li>See full diff in <a href="https://github.com/boto/boto3/compare/1.42.94...1.42.96">compare view</a></li>
</ul>
</details>
<br />
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore <dependency name> major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
- `@dependabot ignore <dependency name> minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
- `@dependabot ignore <dependency name>` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore <dependency name>` will remove all of the ignore conditions of the specified dependency
- `@dependabot unignore <dependency name> <ignore condition>` will remove the ignore condition of the specified dependency and ignore conditions
</details>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Bump the uv-dependency-updates group in /dev/breeze with 3 updates [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk merged PR #66228:
URL: https://github.com/apache/airflow/pull/66228
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Bump the uv-dependency-updates group in /dev/breeze with 3 updates [airflow]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #66228:
URL: https://github.com/apache/airflow/pull/66228#issuecomment-4362501443
### Backport failed to create: v3-2-test. View the failure log <a href='https://github.com/apache/airflow/actions/runs/25240035309'> Run details </a>
Note: As of [Merging PRs targeted for Airflow 3.X](https://github.com/apache/airflow/blob/main/dev/README_AIRFLOW3_DEV.md#merging-prs-targeted-for-airflow-3x)
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.
In matter of doubt please ask in [#release-management](https://apache-airflow.slack.com/archives/C03G9H97MM2) Slack channel.
<table>
<tr>
<th>Status</th>
<th>Branch</th>
<th>Result</th>
</tr>
<tr>
<td>❌</td>
<td>v3-2-test</td>
<td><a href="https://github.com/apache/airflow/commit/cbd2698592850709115210fedacf2870ec9854ae"><img src='https://img.shields.io/badge/Commit-cbd2698-red' alt='Commit Link'></a></td>
</tr>
</table>
You can attempt to backport this manually by running:
```bash
cherry_picker cbd2698 v3-2-test
```
This should apply the commit to the v3-2-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.
After you have resolved the conflicts, you can continue the backport process by running:
```bash
cherry_picker --continue
```
If you don't have cherry-picker installed, see the [installation guide](https://github.com/apache/airflow/blob/main/dev/README_AIRFLOW3_DEV.md#how-to-backport-pr-with-cherry-picker-cli).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org