From bcae6429a4989c20dd78b9e3039aff6e61080bb4 Mon Sep 17 00:00:00 2001 From: Sebastian Mohr Date: Wed, 2 Apr 2025 14:43:38 +0200 Subject: [PATCH 1/3] typing extensions is an optional requirement for py>3.10, therefore TypeVarTuple and Unpack need additional handling see https://docs.python.org/3.9/library/typing.html see #5695 --- beets/util/pipeline.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/beets/util/pipeline.py b/beets/util/pipeline.py index 8f7be8194..a37728dd9 100644 --- a/beets/util/pipeline.py +++ b/beets/util/pipeline.py @@ -36,9 +36,13 @@ from __future__ import annotations import queue import sys from threading import Lock, Thread -from typing import Callable, Generator +from typing import Callable, Generator, TypeVar + +if sys.version_info >= (3, 11): + from typing import TypeVarTuple, Unpack +else: + from typing_extensions import TypeVar, TypeVarTuple, Unpack -from typing_extensions import TypeVar, TypeVarTuple, Unpack BUBBLE = "__PIPELINE_BUBBLE__" POISON = "__PIPELINE_POISON__" From 58ab2c696abfc3b2725cb135c0906f4df2b6daf7 Mon Sep 17 00:00:00 2001 From: Sebastian Mohr Date: Wed, 2 Apr 2025 17:25:53 +0200 Subject: [PATCH 2/3] Removed typevar from typing_extensions as it is available in typing since like python 3.3 --- beets/util/pipeline.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/beets/util/pipeline.py b/beets/util/pipeline.py index a37728dd9..98a1addce 100644 --- a/beets/util/pipeline.py +++ b/beets/util/pipeline.py @@ -41,8 +41,7 @@ from typing import Callable, Generator, TypeVar if sys.version_info >= (3, 11): from typing import TypeVarTuple, Unpack else: - from typing_extensions import TypeVar, TypeVarTuple, Unpack - + from typing_extensions import TypeVarTuple, Unpack BUBBLE = "__PIPELINE_BUBBLE__" POISON = "__PIPELINE_POISON__" From 0f2b8b794a5bbfc6b0d8aac4b823c196216bc3cb Mon Sep 17 00:00:00 2001 From: racehd Date: Mon, 24 Mar 2025 21:10:58 +0000 Subject: [PATCH 3/3] Fix Broken link for Arch Linux package --- docs/guides/main.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/main.rst b/docs/guides/main.rst index a933b1333..255484dde 100644 --- a/docs/guides/main.rst +++ b/docs/guides/main.rst @@ -26,7 +26,7 @@ Beets works on Python 3.8 or later. as described below by running: ``apt-get install python-dev python-pip`` -* On **Arch Linux**, `beets is in [community] `_, so just run ``pacman -S +* On **Arch Linux**, `beets is in [extra] `_, so just run ``pacman -S beets``. (There's also a bleeding-edge `dev package `_ in the AUR, which will probably set your computer on fire.) @@ -56,7 +56,7 @@ Beets works on Python 3.8 or later. .. _Debian details: https://tracker.debian.org/pkg/beets .. _Ubuntu details: https://launchpad.net/ubuntu/+source/beets .. _OpenBSD: http://openports.se/audio/beets -.. _Arch community: https://www.archlinux.org/packages/community/any/beets/ +.. _Arch extra: https://archlinux.org/packages/extra/any/beets/ .. _Alpine package: https://pkgs.alpinelinux.org/package/edge/community/x86_64/beets .. _NixOS: https://github.com/NixOS/nixpkgs/tree/master/pkgs/tools/audio/beets .. _MacPorts: https://www.macports.org