From d846e3373af92a48ff948a1f4f42faea1a5e86fe Mon Sep 17 00:00:00 2001
From: Richard Levasseur <rlevasseur@google.com>
Date: Sun, 22 Feb 2026 16:59:08 -0800
Subject: [PATCH 1/2] chore: update changelog with 1.8.5 notes, fix 1.8 links

---
 CHANGELOG.md | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 569722791c..56a5e7893a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,21 +83,12 @@ END_UNRELEASED_TEMPLATE
 
 {#v1-9-0-fixed}
 ### Fixed
-* (runfiles) Fixed `CurrentRepository()` raising `ValueError` on Windows.
-  ([#3579](https://github.com/bazel-contrib/rules_python/issues/3579))
 * (tests) No more coverage warnings are being printed if there are no sources.
   ([#2762](https://github.com/bazel-contrib/rules_python/issues/2762))
 * (gazelle) Ancestor `conftest.py` files are added in addition to sibling `conftest.py`.
   ([#3497](https://github.com/bazel-contrib/rules_python/issues/3497)) Note
   that this behavior can be reverted to the pre-1.9.0 behavior by setting the new
   `python_include_ancestor_conftest` directive to `false`.
-* (pypi) `pip_parse` no longer silently drops PEP 508 URL-based requirements
-  (`pkg @ https://...`) when `extract_url_srcs=False` (the default for
-  `pip_repository`).
-* (pypi) Extras in requirement strings are now normalized per PEP 685,
-  fixing missing transitive dependencies when extras contain hyphens
-  (e.g., `sqlalchemy[postgresql-psycopg2binary]`).
-  ([#3587](https://github.com/bazel-contrib/rules_python/issues/3587))
 * (binaries/tests) Stamped build data generated by Windows actions is readable
 
 {#v1-9-0-added}
@@ -131,9 +122,29 @@ END_UNRELEASED_TEMPLATE
   was technically incorrect.
   ([#3596](https://github.com/bazel-contrib/rules_python/pull/3596))
 
+
+{#v1-8-5}
+## [1.8.5] - 2026-02-22
+
+[1.8.5]: https://github.com/bazel-contrib/rules_python/releases/tag/1.8.5
+
+{#v1-8-5-fixed}
+### Fixed
+* (runfiles) Fixed `CurrentRepository()` raising `ValueError` on Windows.
+  ([#3579](https://github.com/bazel-contrib/rules_python/issues/3579))
+* (pypi) `pip_parse` no longer silently drops PEP 508 URL-based requirements
+  (`pkg @ https://...`) when `extract_url_srcs=False` (the default for
+  `pip_repository`).
+* (pypi) Extras in requirement strings are now normalized per PEP 685,
+  fixing missing transitive dependencies when extras contain hyphens
+  (e.g., `sqlalchemy[postgresql-psycopg2binary]`).
+  ([#3587](https://github.com/bazel-contrib/rules_python/issues/3587))
+
 {#v1-8-4}
 ## [1.8.4] - 2026-02-10
 
+[1.8.4]: https://github.com/bazel-contrib/rules_python/releases/tag/1.8.4
+
 ### Fixed
 * (pipstar): A corner case of evaluation of version specifiers (`"1.2" ~= "1.2.0"`)
   has been fixed improving compatibility with the PEP440 standard.
@@ -145,6 +156,8 @@ END_UNRELEASED_TEMPLATE
 {#v1-8-3}
 ## [1.8.3] - 2026-01-27
 
+[1.8.3]: https://github.com/bazel-contrib/rules_python/releases/tag/1.8.3
+
 {#v1-8-3-fixed}
 ### Fixed
 * (pipstar) Fix whl extraction on Windows when bazelrc has XX flags.
@@ -153,6 +166,8 @@ END_UNRELEASED_TEMPLATE
 {#v1-8-2}
 ## [1.8.2] - 2026-01-24
 
+[1.8.2]: https://github.com/bazel-contrib/rules_python/releases/tag/1.8.2
+
 {#v1-8-2-fixed}
 ### Fixed
 * (venvs) relax the C library filename check to make tensorflow work
@@ -161,6 +176,8 @@ END_UNRELEASED_TEMPLATE
 {#v1-8-1}
 ## [1.8.1] - 2026-01-20
 
+[1.8.1]: https://github.com/bazel-contrib/rules_python/releases/tag/1.8.1
+
 {#v1-8-1-fixed}
 ### Fixed
 * (pipstar) Extra resolution that refers back to the package being resolved works again.
@@ -2203,4 +2220,4 @@ Breaking changes:
 * (pip) Create all_data_requirements alias
 * Expose Python C headers through the toolchain.
 
-[0.24.0]: https://github.com/bazel-contrib/rules_python/releases/tag/0.24.0
\ No newline at end of file
+[0.24.0]: https://github.com/bazel-contrib/rules_python/releases/tag/0.24.0

From 50266e48cfa76c218101883a7d1abd00de253d6e Mon Sep 17 00:00:00 2001
From: Richard Levasseur <richardlev@gmail.com>
Date: Sun, 22 Feb 2026 21:29:57 -0800
Subject: [PATCH 2/2] Apply suggestions from code review

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66c908859c..96e86b97fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -145,6 +145,7 @@ END_UNRELEASED_TEMPLATE
 
 [1.8.4]: https://github.com/bazel-contrib/rules_python/releases/tag/1.8.4
 
+{#v1-8-4-fixed}
 ### Fixed
 * (pipstar): A corner case of evaluation of version specifiers (`"1.2" ~= "1.2.0"`)
   has been fixed improving compatibility with the PEP440 standard.