summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Finucane <sfinucan@redhat.com>2021-03-15 17:11:31 +0000
committerStephen Finucane <sfinucan@redhat.com>2021-03-15 17:18:07 +0000
commit5195593256f167d7843c14fa9b8b932bcd2afa34 (patch)
tree3e87a92c4c6bec74c54d124f40ea1d0e38125a22
parent8e47cad9012c3781e82fc435499da4c1faca916e (diff)
downloadpbr-5195593256f167d7843c14fa9b8b932bcd2afa34.tar.gz
Revert "Map requires-python to python-requires"
This reverts commit d5da2121f875109a94809eeb8aa271fd5a0b3edd. This was done incorrectly. The 'D1_D2_SETUP_ARGS' dictionary modified here is a mapping of distutils (and by extension, setuptools) supported options to their legacy distutils2 equivalents, and is used to transform the latter to the former. For example, consider the following entry: "long_description": ("metadata", "description"), This will transform an entry like so in a 'setup.cfg' file: [metadata] description = ... Into the following equivalent call to setuptools' 'setup' function: setup( ..., long_description='...', ... ) By that measure, the entry added in this change, namely: "requires_python": ("metadata", "python_requires"), Will result in a 'requires_python' argument being added to the 'setup' call. That's not what we want. Rather, we likely want to transform a '[metadata] requires_python' entry to a 'python_requires' argument to 'setup'. The change is reverted here in expectation of a forthcoming proper fix. Change-Id: I7158e75934535b80eb60d6b4b7dcef08866b5bab Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
-rw-r--r--pbr/util.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/pbr/util.py b/pbr/util.py
index 6e8d231..2d7ef93 100644
--- a/pbr/util.py
+++ b/pbr/util.py
@@ -114,7 +114,6 @@ D1_D2_SETUP_ARGS = {
"install_requires": ("metadata", "requires_dist"),
"setup_requires": ("metadata", "setup_requires_dist"),
"python_requires": ("metadata",),
- "requires_python": ("metadata", "python_requires"),
"provides": ("metadata", "provides_dist"), # **
"provides_extras": ("metadata",),
"obsoletes": ("metadata", "obsoletes_dist"), # **