From 2cfe5fe5653b3c61c64e4451df37d48d2cbbf483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=87=BA=F0=9F=87=A6=20Sviatoslav=20Sydorenko=20=28?= =?UTF-8?q?=D0=A1=D0=B2=D1=8F=D1=82=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A1?= =?UTF-8?q?=D0=B8=D0=B4=D0=BE=D1=80=D0=B5=D0=BD=D0=BA=D0=BE=29?= Date: Fri, 4 Apr 2025 18:23:56 +0200 Subject: [PATCH 1/2] Offer direct guidance for replacing `bdist_wheel.universal` This is a follow-up to #4617 which deprecated the `universal` flag of `bdist_wheel`. It originally offered people to complain in issues. I, however, think that it's useful to mention the non-deprecated alternative that will keep working past deprecation date. This is what this patch implements. --- setuptools/command/bdist_wheel.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/setuptools/command/bdist_wheel.py b/setuptools/command/bdist_wheel.py index 1e3f637bcc..0cb1ee86a3 100644 --- a/setuptools/command/bdist_wheel.py +++ b/setuptools/command/bdist_wheel.py @@ -171,7 +171,12 @@ class bdist_wheel(Command): "g", "Group name used when creating a tar file [default: current group]", ), - ("universal", None, "*DEPRECATED* make a universal wheel [default: false]"), + ( + "universal", + None, + "*DEPRECATED* make a universal wheel [default: false]\n\n' + 'Set `python_tag = py2.py3` in `setup.cfg` instead.", + ), ( "compression=", None, @@ -267,6 +272,9 @@ def finalize_options(self) -> None: is being obviated. Please discontinue using this option, or if you still need it, file an issue with pypa/setuptools describing your use case. + + The use of this setting can be replaced with `python_tag = py2.py3` + entry in `setup.cfg`.", """, due_date=(2025, 8, 30), # Introduced in 2024-08-30 ) From e7c4b3a8ddd7ed2ea60b0379371b7f7115a3ec19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=87=BA=F0=9F=87=A6=20Sviatoslav=20Sydorenko=20=28?= =?UTF-8?q?=D0=A1=D0=B2=D1=8F=D1=82=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A1?= =?UTF-8?q?=D0=B8=D0=B4=D0=BE=D1=80=D0=B5=D0=BD=D0=BA=D0=BE=29?= Date: Fri, 4 Apr 2025 18:26:43 +0200 Subject: [PATCH 2/2] fixup! Normalize quotes in deprecated flag description --- setuptools/command/bdist_wheel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setuptools/command/bdist_wheel.py b/setuptools/command/bdist_wheel.py index 0cb1ee86a3..0813becd42 100644 --- a/setuptools/command/bdist_wheel.py +++ b/setuptools/command/bdist_wheel.py @@ -174,8 +174,8 @@ class bdist_wheel(Command): ( "universal", None, - "*DEPRECATED* make a universal wheel [default: false]\n\n' - 'Set `python_tag = py2.py3` in `setup.cfg` instead.", + "*DEPRECATED* make a universal wheel [default: false]\n\n" + "Set `python_tag = py2.py3` in `setup.cfg` instead.", ), ( "compression=",