diff --git a/AUTHORS.txt b/AUTHORS.txt index 49e30f69678..e02de32bcf3 100644 --- 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 index 26d00a3f144..6af01e3d6c6 100644 --- 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 `_) +- Fix mercurial revision "parse error": use ``--rev={ref}`` instead of ``-r={ref}`` (`#12373 `_) + + 23.3.1 (2023-10-21) =================== diff --git a/news/12372.bugfix.rst b/news/12372.bugfix.rst deleted file mode 100644 index 6c0b48dec3c..00000000000 --- a/news/12372.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix a bug in extras handling for link requirements diff --git a/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst b/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst deleted file mode 100644 index 76a8e6b96db..00000000000 --- a/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix mercurial revision "parse error": use ``--rev={ref}`` instead of ``-r={ref}`` diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py index 3ff3f9425c2..62e56adb2b5 100644 --- 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 index 8515c026cb7..abb6473e87f 100644 --- 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":