From d73ff7c2dccd6a60223b5c4ed673d7f3e7df9a43 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 14:57:32 -0700
Subject: [PATCH 1/3] [pre-commit.ci] pre-commit autoupdate (#3116)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .pre-commit-config.yaml | 10 +++++-----
 docs/changelog.rst      |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6860c9dad..676720afe 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,21 +15,21 @@ repos:
       - id: codespell
         args: ["--write-changes"]
   - repo: https://github.com/tox-dev/tox-toml-fmt
-    rev: "v1.9.1"
+    rev: "v1.9.2"
     hooks:
       - id: tox-toml-fmt
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.21.0"
+    rev: "v2.21.1"
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.15.9"
+    rev: "v0.15.10"
     hooks:
       - id: ruff-format
       - id: ruff
         args: ["--fix", "--unsafe-fixes", "--exit-non-zero-on-fix"]
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: "v3.8.1"
+    rev: "v3.8.2"
     hooks:
       - id: prettier
         additional_dependencies:
@@ -42,7 +42,7 @@ repos:
         args: ["-l", "120"]
         additional_dependencies: ["sphinx>=9.1"]
   - repo: https://github.com/zizmorcore/zizmor-pre-commit
-    rev: v1.23.1
+    rev: v1.24.1
     hooks:
       - id: zizmor
   - repo: meta
diff --git a/docs/changelog.rst b/docs/changelog.rst
index dc0543359..056a16dd9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -16,6 +16,7 @@ Bugfixes - 21.2.1
 - Upgrade embedded wheels:
 
   - setuptools to ``82.0.1`` from ``82.0.0`` (:issue:`3093`)
+
 - Use terminal width for help formatting instead of hardcoded 240. (:issue:`3110`)
 
 **********************

From 33348d69426ef49ea26dcab7f12b474706968813 Mon Sep 17 00:00:00 2001
From: Rahul Devikar <rahuldevikar5512@gmail.com>
Date: Mon, 13 Apr 2026 16:32:05 -0700
Subject: [PATCH 2/3] bump python-discovery minimum to 1.2.2 (#3117)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 docs/changelog/3117.bugfix.rst | 1 +
 pyproject.toml                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 docs/changelog/3117.bugfix.rst

diff --git a/docs/changelog/3117.bugfix.rst b/docs/changelog/3117.bugfix.rst
new file mode 100644
index 000000000..1b7acaeee
--- /dev/null
+++ b/docs/changelog/3117.bugfix.rst
@@ -0,0 +1 @@
+Bump ``python-discovery`` minimum to ``>=1.2.2`` to include ``normalize_isa`` support - by :user:`rahuldevikar`.
diff --git a/pyproject.toml b/pyproject.toml
index 471684f3b..f0a97cd07 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -50,7 +50,7 @@ dependencies = [
   "filelock>=3.24.2,<4; python_version>='3.10'",
   "importlib-metadata>=6.6; python_version<'3.8'",
   "platformdirs>=3.9.1,<5",
-  "python-discovery>=1",
+  "python-discovery>=1.2.2",
   "typing-extensions>=4.13.2; python_version<'3.11'",
 ]
 urls.Documentation = "https://virtualenv.pypa.io"

From 7f91a9a0bfbc549fc10274164135cf02c8ca8167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?=
 <690238+gaborbernat@users.noreply.github.com>
Date: Mon, 13 Apr 2026 23:32:56 +0000
Subject: [PATCH 3/3] release 21.2.2

---
 docs/changelog.rst             | 10 ++++++++++
 docs/changelog/3117.bugfix.rst |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)
 delete mode 100644 docs/changelog/3117.bugfix.rst

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 056a16dd9..1e6e5599c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,16 @@
 
 .. towncrier release notes start
 
+**********************
+ v21.2.2 (2026-04-13)
+**********************
+
+Bugfixes - 21.2.2
+=================
+
+- Bump ``python-discovery`` minimum to ``>=1.2.2`` to include ``normalize_isa`` support - by :user:`rahuldevikar`.
+  (:issue:`3117`)
+
 **********************
  v21.2.1 (2026-04-09)
 **********************
diff --git a/docs/changelog/3117.bugfix.rst b/docs/changelog/3117.bugfix.rst
deleted file mode 100644
index 1b7acaeee..000000000
--- a/docs/changelog/3117.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Bump ``python-discovery`` minimum to ``>=1.2.2`` to include ``normalize_isa`` support - by :user:`rahuldevikar`.