From 066263b8d0eb107fe8f61766d89ece4cdc3f6ae9 Mon Sep 17 00:00:00 2001 From: niuke Date: Thu, 4 May 2023 13:38:20 +0800 Subject: [PATCH] setup.cfg: Replace dashes with underscores Setuptools v54.1.0 introduces a warning that the use of dash-separated options in 'setup.cfg' will not be supported in a future version [1]. Get ahead of the issue by replacing the dashes with underscores. Without this, we see 'UserWarning' messages like the following on new enough versions of setuptools: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead [1] https://github.com/pypa/setuptools/commit/a2e9ae4cb Change-Id: I54d4f816d8de765035aa1607740345c13f9b6cc9 --- setup.cfg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup.cfg b/setup.cfg index 5549d40..7e5076d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,11 +1,11 @@ [metadata] name = ansible-role-collect-logs summary = ansible-role-collect-logs - An Ansible role for aggregating logs from different nodes. -description-file = +description_file = README.rst author = TripleO Team -author-email = openstack-discuss@lists.openstack.org -home-page = https://opendev.org/openstack/ansible-role-collect-logs +author_email = openstack-discuss@lists.openstack.org +home_page = https://opendev.org/openstack/ansible-role-collect-logs classifier = License :: OSI Approved :: Apache Software License Development Status :: 4 - Beta @@ -15,7 +15,7 @@ classifier = Topic :: Utilities [global] -setup-hooks = +setup_hooks = pbr.hooks.setup_hook [files] @@ -36,9 +36,9 @@ skip_changelog = True [flake8] # black compatible settings # https://black.readthedocs.io/en/stable/the_black_code_style.html -max-line-length = 88 -extend-ignore = E203,E501,W503,BLK100 -show-source = True +max_line_length = 88 +extend_ignore = E203,E501,W503,BLK100 +show_source = True builtins = _ [isort]