secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Python: do not depend on setuptools' pkg_resources

Browse Source 
Following its removal in setuptools v82
This commit is contained in:
Théophile Bastian
2026-03-23 23:21:03 +01:00
parent d5039642e5
commit 7d6aecbdb9
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mopidy_iris/core.py
View File

@ -9,8 +9,8 @@ import sys
import tornado.web import tornado.web
import tornado.ioloop import tornado.ioloop
import time import time
import packaging
import pickle import pickle
from pkg_resources import parse_version
from tornado.escape import json_encode from tornado.escape import json_encode
from tornado.httpclient import AsyncHTTPClient, HTTPRequest from tornado.httpclient import AsyncHTTPClient, HTTPRequest
@ -437,9 +437,9 @@ class IrisCore(pykka.ThreadingActor):
current_version = Extension.version current_version = Extension.version
# compare our versions, and convert result to boolean # compare our versions, and convert result to boolean
upgrade_available = parse_version(latest_version) > parse_version( upgrade_available = packaging.version.parse(
current_version latest_version
) ) > packaging.version.parse(current_version)
upgrade_available = upgrade_available == 1 upgrade_available = upgrade_available == 1
except (urllib.request.HTTPError, urllib.request.URLError): except (urllib.request.HTTPError, urllib.request.URLError):

2
pyproject.toml
View File

@ -1,5 +1,5 @@
[build-system] [build-system]
requires = ["setuptools >= 30.3.0", "wheel"] requires = ["setuptools >= 30.3.0", "wheel", "packaging"]
[tool.black] [tool.black]

1
setup.cfg
View File

@ -28,6 +28,7 @@ install_requires =
Mopidy >= 3.0 Mopidy >= 3.0
Pykka >= 2.0.1 Pykka >= 2.0.1
setuptools setuptools
packaging
[options.extras_require] [options.extras_require]