From d8b2ee339a8c10701dc5ee5967556eda27d2790d Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 1 Apr 2024 08:20:20 +0000 Subject: [PATCH] import CS python3.12-setuptools-68.2.2-3.el9 --- ...setup.py-install-deprecation-message.patch | 41 +++++++++++++++++++ SPECS/python3.12-setuptools.spec | 9 ++-- 2 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 SOURCES/Adjust-the-setup.py-install-deprecation-message.patch diff --git a/SOURCES/Adjust-the-setup.py-install-deprecation-message.patch b/SOURCES/Adjust-the-setup.py-install-deprecation-message.patch new file mode 100644 index 0000000..62e5c56 --- /dev/null +++ b/SOURCES/Adjust-the-setup.py-install-deprecation-message.patch @@ -0,0 +1,41 @@ +From 58f33f0aef5b137287e6f425b922a03123735a77 Mon Sep 17 00:00:00 2001 +From: Lumir Balhar +Date: Wed, 20 Sep 2023 17:18:47 +0200 +Subject: [PATCH] Adjust the setup.py install deprecation message and URL + +But only when building RPM packages. +--- + setuptools/command/install.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/setuptools/command/install.py b/setuptools/command/install.py +index 606cce9..0af1631 100644 +--- a/setuptools/command/install.py ++++ b/setuptools/command/install.py +@@ -1,6 +1,7 @@ + from distutils.errors import DistutilsArgError + import inspect + import glob ++import os + import platform + import distutils.command.install as orig + +@@ -40,8 +41,13 @@ class install(orig.install): + Please avoid running ``setup.py`` directly. + Instead, use pypa/build, pypa/installer or other + standards-based tools. +- """, +- see_url="https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html", ++ """ ++ + (""" ++ Follow the current Python packaging guidelines when building ++ Python RPM packages. ++ """ if "RPM_BUILD_ROOT" in os.environ else ""), ++ see_url=("https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html" + ++ ("\nand https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/" if "RPM_BUILD_ROOT" in os.environ else "")), + # TODO: Document how to bootstrap setuptools without install + # (e.g. by unziping the wheel file) + # and then add a due_date to this warning. +-- +2.41.0 + diff --git a/SPECS/python3.12-setuptools.spec b/SPECS/python3.12-setuptools.spec index 2f02580..2845ca9 100644 --- a/SPECS/python3.12-setuptools.spec +++ b/SPECS/python3.12-setuptools.spec @@ -3,11 +3,6 @@ %global srcname setuptools -# Workaround for https://issues.redhat.com/browse/CS-1907 -# By defining the %%{__bootstrap} value, -# we prevent misconfigured Koji putting a literal %%{__bootstrap} in %%dist. -%{!?__bootstrap:%global __bootstrap %{nil}} - # used when bootstrapping new Python versions %bcond_with bootstrap @@ -43,6 +38,10 @@ License: MIT and ASL 2.0 and (BSD or ASL 2.0) and Python URL: https://pypi.python.org/pypi/%{srcname} Source0: %{pypi_source %{srcname} %{version}} +# The `setup.py install` deprecation notice might be confusing for RPM packagers +# adjust it, but only when $RPM_BUILD_ROOT is set +Patch: Adjust-the-setup.py-install-deprecation-message.patch + BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel