diff --git a/jenkins_jobs/registry.py b/jenkins_jobs/registry.py index ab37f663c..249dd4365 100644 --- a/jenkins_jobs/registry.py +++ b/jenkins_jobs/registry.py @@ -20,6 +20,7 @@ import logging import operator import pkg_resources import re +import setuptools import types from six import PY2 @@ -72,6 +73,18 @@ class ModuleRegistry(object): r"(.*)-(?:SNAPSHOT|BETA).*", r"\g<1>.preview", version ) + logger.info( + "setuptools %r: %r", + setuptools, + setuptools.__version__, + ) + + logger.info( + "packaging %r: %r", + pkg_resources.extern.packaging.version, + pkg_resources.extern.packaging.__version__, + ) + if isinstance( pkg_resources.parse_version(plugin_info["version"]), pkg_resources.extern.packaging.version.LegacyVersion, diff --git a/requirements.txt b/requirements.txt index 2f8e5358c..d0a6d8537 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. +setuptools<=66.1.1 six>=1.9.0 # MIT PyYAML>=3.10.0 # MIT pbr>=1.8 # Apache-2.0