jjb/jenkins-job-builder
Code Issues Proposed changes

Fix the build with setuptools >= 71

Browse Source 
The `pkg_resources` module no longer bundles a vendored version of the
`packaging` module. Add an explicit dependency on `packaging` and
directly use its classes.

Change-Id: I9362ca6d6323b56bc579db30e7f5bb40b57da65a
This commit is contained in:
Christoph Erhardt 2024-07-07 11:03:52 +02:00
parent 413e765aea
commit 7bf0dacd80
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins_jobs/registry.py
View File

@ -18,10 +18,10 @@
import inspect import inspect
import logging import logging
import operator import operator
import packaging.version
import pkg_resources import pkg_resources
import sys import sys
import types import types
from pkg_resources.extern.packaging.version import InvalidVersion
from six import PY2 from six import PY2
@ -76,8 +76,8 @@ class ModuleRegistry(object):
version = plugin_info["version"] version = plugin_info["version"]
try: try:
pkg_resources.parse_version(version) packaging.version.Version(version)
except InvalidVersion: except packaging.version.InvalidVersion:
plugin_name = short_name or long_name plugin_name = short_name or long_name
if plugin_name: if plugin_name:
logger.warning( logger.warning(

4
requirements.txt
View File

@ -9,5 +9,5 @@ stevedore>=1.17.1; python_version >= '3.0' # Apache-2.0
python-jenkins>=1.8.2 python-jenkins>=1.8.2
fasteners fasteners
Jinja2 Jinja2
setuptools==69.5.1; python_version >= '3.8' packaging
setuptools; python_version < '3.8' setuptools