Skip to content

Commit bdbe422

Browse files
authored
Merge pull request #12438 from sbidoul/release/23.3.2
Release/23.3.2
2 parents 417ca92 + 664553f commit bdbe422

File tree

6 files changed

+18
-7
lines changed

6 files changed

+18
-7
lines changed

AUTHORS.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,8 @@ Dwayne Bailey
227227
Ed Morley
228228
Edgar Ramírez
229229
Ee Durbin
230+
Efflam Lemaillet
231+
efflamlemaillet
230232
Eitan Adler
231233
ekristina
232234
elainechan

NEWS.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99
1010
.. towncrier release notes start
1111
12+
23.3.2 (2023-12-17)
13+
===================
14+
15+
Bug Fixes
16+
---------
17+
18+
- Fix a bug in extras handling for link requirements (`#12372 <https://github.com/pypa/pip/issues/12372>`_)
19+
- Fix mercurial revision "parse error": use ``--rev={ref}`` instead of ``-r={ref}`` (`#12373 <https://github.com/pypa/pip/issues/12373>`_)
20+
21+
1222
23.3.1 (2023-10-21)
1323
===================
1424

news/12372.bugfix.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/functional/test_new_resolver.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2295,7 +2295,7 @@ def test_new_resolver_dont_backtrack_on_extra_if_base_constrained_in_requirement
22952295
script, "pkg", "2.0", extras={"ext1": ["dep"], "ext2": ["dep"]}
22962296
)
22972297

2298-
to_install: tuple[str, str] = (
2298+
to_install: Tuple[str, str] = (
22992299
"pkg[ext1]",
23002300
"pkg[ext2]==1.0" if two_extras else "pkg==1.0",
23012301
)
@@ -2342,7 +2342,7 @@ def test_new_resolver_dont_backtrack_on_conflicting_constraints_on_extras(
23422342
script, "pkg", "2.0", extras={"ext1": ["dep"], "ext2": ["dep"]}
23432343
)
23442344

2345-
to_install: tuple[str, str] = (
2345+
to_install: Tuple[str, str] = (
23462346
"pkg[ext1]>1",
23472347
"pkg[ext2]==1.0" if two_extras else "pkg==1.0",
23482348
)
@@ -2506,7 +2506,7 @@ def test_new_resolver_comes_from_with_extra(
25062506
create_basic_wheel_for_package(script, "dep", "1.0")
25072507
create_basic_wheel_for_package(script, "pkg", "1.0", extras={"ext": ["dep"]})
25082508

2509-
to_install: tuple[str, str] = ("pkg", "pkg[ext]")
2509+
to_install: Tuple[str, str] = ("pkg", "pkg[ext]")
25102510

25112511
result = script.pip(
25122512
"install",

tools/update-rtd-redirects.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import os
77
import sys
88
from pathlib import Path
9+
from typing import Dict, List
910

1011
import httpx
1112
import rich
@@ -84,8 +85,8 @@ def get_rtd_api() -> httpx.Client:
8485

8586
next_step("Compare and determine modifications.")
8687

87-
redirects_to_remove: list[int] = []
88-
redirects_to_add: dict[str, str] = {}
88+
redirects_to_remove: List[int] = []
89+
redirects_to_add: Dict[str, str] = {}
8990

9091
for redirect in rtd_redirects["results"]:
9192
if redirect["type"] != "exact":

0 commit comments

Comments
 (0)