Merge pull request #1014 from tobast/tobast/pkg_resources_deprecation
Some checks failed
Release / jest (push) Failing after 2m54s
Release / Lint: check-manifest (push) Failing after 1m58s
Release / Lint: flake8 (push) Failing after 6s
Release / Test: Python 3.7 (push) Failing after 7s
Release / Publish: PyPi (push) Has been skipped
Release / Publish: Debian to DockerHub (push) Has been skipped
Release / Publish: Alpine to DockerHub (push) Has been skipped

Setuptools' pkg_resources deprecation: use packaging instead
This commit is contained in:
James Barnsley
2026-04-02 16:28:25 +13:00
committed by GitHub
3 changed files with 6 additions and 5 deletions

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):

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]

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]