From db35ac8d793506bc43b62e7e39d27a75de1043ed Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 6 Jul 2026 15:26:00 +0200 Subject: Migrate to pyproject.toml [tool.setuptools.data-files] does not support recursive directory installation. The old setup.cfg [files] worked because PBR's FilesConfig.expand_globs() used os.walk() to expand docker/*, but this hook is not triggered by the pbr.build PEP-517 backend. Move docker/ into kolla/ and use [tool.setuptools.package-data] instead. Update kolla_worker._get_images_dir() to check the kolla package directory first so both editable and regular installs work. Change-Id: I4fc452c03740ef22ebbb4e8d0d86c4f4783e2d09 Signed-off-by: Michal Nasiadka --- setup.cfg | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'setup.cfg') diff --git a/setup.cfg b/setup.cfg index 2634ee512..f75aa848d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,43 +1,2 @@ [metadata] name = kolla -summary = Kolla OpenStack Deployment -description_file = - README.rst -author = OpenStack -author_email = openstack-discuss@lists.openstack.org -home_page = https://docs.openstack.org/kolla/latest/ -python_requires = >=3.10 -license = Apache License, Version 2.0 -classifier = - Environment :: OpenStack - Intended Audience :: Information Technology - Intended Audience :: System Administrators - License :: OSI Approved :: Apache Software License - Operating System :: POSIX :: Linux - Programming Language :: Python - Programming Language :: Python :: Implementation :: CPython - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: 3.12 - Programming Language :: Python :: 3.13 - -[files] -packages = - kolla -data_files = - share/kolla/docker = docker/* - share/kolla/tools = tools/validate-docker-execute.sh - share/kolla/tools = tools/cleanup-images - share/kolla/tools = tools/start-registry - share/kolla/doc = doc/* - share/kolla/etc_examples = etc/* - share/kolla/contrib = contrib/* - share/kolla = setup.cfg - -[entry_points] -console_scripts = - kolla-build = kolla.cmd.build:main -oslo.config.opts = - kolla = kolla.opts:list_opts -- cgit v1.2.3