openstack/charm-barbican
Code Issues Proposed changes

Resolve pkg_resources error

Browse Source 
pkg_resources was deprecated from setuptools recently and a
newer version of cliff is required, so drop cliff pin from
test-requirements.txt to resolve this error.

Pin setuptools<82 in src/test-requirements.txt for Python
3.12+ compatibility in Zaza tests, as setuptools is no
longer part of the stdlib from Python 3.12, causing
pkg_resources import failures in test environments.

Change-Id: I664cdeeadf7e184d38217593a6c1641736670d15
Signed-off-by: Munir Siddiqui <munir.siddiqui@canonical.com>
This commit is contained in:
Munir Siddiqui
2026-03-06 14:02:29 +05:00
parent 40d60d738b
commit 59471a8faf
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test-requirements.txt
+4 -4
View File
@@ -1,9 +1,9 @@
# This file is managed centrally by release-tools and should not be modified
# within individual charm repos. See the 'global' dir contents for available
# choices of *requirements.txt files for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
# This file was originally managed centrally by release-tools but has been
# locally modified and is no longer in sync with the central management system.
#
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
setuptools<82.0.0 # setuptools>=82 removed pkg_resources.
test-requirements.txt
+7 -7
View File
@@ -1,15 +1,15 @@
# This file is managed centrally by release-tools and should not be modified
# within individual charm repos. See the 'global' dir contents for available
# choices of *requirements.txt files for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
# This file was originally managed centrally by release-tools but has been
# locally modified and is no longer in sync with the central management system.
#
pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
stestr>=2.2.0
# Dependency of stestr. Workaround for
# https://github.com/mtreinish/stestr/issues/145
cliff<3.0.0
# Charmhelpers depends on 'distutils', which has been deprecated since
# python3.12 [0], but can be substituted with setuptools.
#
# [0] https://docs.python.org/3.12/library/distutils.html
setuptools
requests>=2.18.4
charms.reactive