Merge pull request #12438 from sbidoul/release/23.3.2

Release/23.3.2
pypa · Dec 17, 2023 · bdbe422 · bdbe422
2 parents 417ca92 + 664553f
commit bdbe422
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -227,6 +227,8 @@ Dwayne Bailey
 Ed Morley
 Edgar Ramírez
 Ee Durbin
+Efflam Lemaillet
+efflamlemaillet
 Eitan Adler
 ekristina
 elainechan

diff --git a/NEWS.rst b/NEWS.rst
@@ -9,6 +9,16 @@
 
 .. towncrier release notes start
 
+23.3.2 (2023-12-17)
+===================
+
+Bug Fixes
+---------
+
+- Fix a bug in extras handling for link requirements (`#12372 <https://github.com/pypa/pip/issues/12372>`_)
+- Fix mercurial revision "parse error": use ``--rev={ref}`` instead of ``-r={ref}`` (`#12373 <https://github.com/pypa/pip/issues/12373>`_)
+
+
 23.3.1 (2023-10-21)
 ===================
 

diff --git a/news/12372.bugfix.rst b/news/12372.bugfix.rst
diff --git a/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst b/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst
diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py
@@ -2295,7 +2295,7 @@ def test_new_resolver_dont_backtrack_on_extra_if_base_constrained_in_requirement
         script, "pkg", "2.0", extras={"ext1": ["dep"], "ext2": ["dep"]}
     )
 
-    to_install: tuple[str, str] = (
+    to_install: Tuple[str, str] = (
         "pkg[ext1]",
         "pkg[ext2]==1.0" if two_extras else "pkg==1.0",
     )
@@ -2342,7 +2342,7 @@ def test_new_resolver_dont_backtrack_on_conflicting_constraints_on_extras(
         script, "pkg", "2.0", extras={"ext1": ["dep"], "ext2": ["dep"]}
     )
 
-    to_install: tuple[str, str] = (
+    to_install: Tuple[str, str] = (
         "pkg[ext1]>1",
         "pkg[ext2]==1.0" if two_extras else "pkg==1.0",
     )
@@ -2506,7 +2506,7 @@ def test_new_resolver_comes_from_with_extra(
     create_basic_wheel_for_package(script, "dep", "1.0")
     create_basic_wheel_for_package(script, "pkg", "1.0", extras={"ext": ["dep"]})
 
-    to_install: tuple[str, str] = ("pkg", "pkg[ext]")
+    to_install: Tuple[str, str] = ("pkg", "pkg[ext]")
 
     result = script.pip(
         "install",

diff --git a/tools/update-rtd-redirects.py b/tools/update-rtd-redirects.py
@@ -6,6 +6,7 @@
 import os
 import sys
 from pathlib import Path
+from typing import Dict, List
 
 import httpx
 import rich
@@ -84,8 +85,8 @@ def get_rtd_api() -> httpx.Client:
 
 next_step("Compare and determine modifications.")
 
-redirects_to_remove: list[int] = []
-redirects_to_add: dict[str, str] = {}
+redirects_to_remove: List[int] = []
+redirects_to_add: Dict[str, str] = {}
 
 for redirect in rtd_redirects["results"]:
     if redirect["type"] != "exact":