From 7d6aecbdb97d62a911e06168d5a2295e5fc05890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= Date: Mon, 23 Mar 2026 23:21:03 +0100 Subject: [PATCH] Python: do not depend on setuptools' pkg_resources Following its removal in setuptools v82 --- mopidy_iris/core.py | 8 ++++---- pyproject.toml | 2 +- setup.cfg | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mopidy_iris/core.py b/mopidy_iris/core.py index 83183a8f..a4f3b6e5 100755 --- a/mopidy_iris/core.py +++ b/mopidy_iris/core.py @@ -9,8 +9,8 @@ import sys import tornado.web import tornado.ioloop import time +import packaging import pickle -from pkg_resources import parse_version from tornado.escape import json_encode from tornado.httpclient import AsyncHTTPClient, HTTPRequest @@ -437,9 +437,9 @@ class IrisCore(pykka.ThreadingActor): current_version = Extension.version # compare our versions, and convert result to boolean - upgrade_available = parse_version(latest_version) > parse_version( - current_version - ) + upgrade_available = packaging.version.parse( + latest_version + ) > packaging.version.parse(current_version) upgrade_available = upgrade_available == 1 except (urllib.request.HTTPError, urllib.request.URLError): diff --git a/pyproject.toml b/pyproject.toml index de8ff959..1e7db19c 100755 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools >= 30.3.0", "wheel"] +requires = ["setuptools >= 30.3.0", "wheel", "packaging"] [tool.black] diff --git a/setup.cfg b/setup.cfg index 1fba27f6..c0c4718e 100755 --- a/setup.cfg +++ b/setup.cfg @@ -28,6 +28,7 @@ install_requires = Mopidy >= 3.0 Pykka >= 2.0.1 setuptools + packaging [options.extras_require]