python3-setuptools-78.1.1
This commit is contained in:
+41
@@ -0,0 +1,41 @@
|
||||
From 508b1ba9bcc9feec87d622f65509c2d74b263dd4 Mon Sep 17 00:00:00 2001
|
||||
From: Lumir Balhar <lbalhar@redhat.com>
|
||||
Date: Wed, 12 Mar 2025 16:57:37 +0100
|
||||
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 15ef364..05739b7 100644
|
||||
--- a/setuptools/command/install.py
|
||||
+++ b/setuptools/command/install.py
|
||||
@@ -2,6 +2,7 @@ from __future__ import annotations
|
||||
|
||||
import glob
|
||||
import inspect
|
||||
+import os
|
||||
import platform
|
||||
from collections.abc import Callable
|
||||
from typing import TYPE_CHECKING, Any, ClassVar, cast
|
||||
@@ -65,8 +66,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 unzipping the wheel file)
|
||||
# and then add a due_date to this warning.
|
||||
--
|
||||
2.48.1
|
||||
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
From 06a246f1fbd79d70951488d65d5fe6bfa4afd4ef Mon Sep 17 00:00:00 2001
|
||||
From: Lumir Balhar <lbalhar@redhat.com>
|
||||
Date: Thu, 13 Mar 2025 11:52:42 +0100
|
||||
Subject: [PATCH] Revert "Always rewrite a Python shebang to #!python."
|
||||
|
||||
This reverts commit c71266345c64fd662b5f95bbbc6e4536172f496d.
|
||||
---
|
||||
setuptools/_distutils/command/build_scripts.py | 13 ++++++++++++-
|
||||
1 file changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/setuptools/_distutils/command/build_scripts.py b/setuptools/_distutils/command/build_scripts.py
|
||||
index 127c51d8d..05ba2c93c 100644
|
||||
--- a/setuptools/_distutils/command/build_scripts.py
|
||||
+++ b/setuptools/_distutils/command/build_scripts.py
|
||||
@@ -5,6 +5,7 @@ Implements the Distutils 'build_scripts' command."""
|
||||
import os
|
||||
import re
|
||||
import tokenize
|
||||
+from distutils import sysconfig
|
||||
from distutils._log import log
|
||||
from stat import ST_MODE
|
||||
from typing import ClassVar
|
||||
@@ -105,8 +106,18 @@ class build_scripts(Command):
|
||||
if shebang_match:
|
||||
log.info("copying and adjusting %s -> %s", script, self.build_dir)
|
||||
if not self.dry_run:
|
||||
+ if not sysconfig.python_build:
|
||||
+ executable = self.executable
|
||||
+ else:
|
||||
+ executable = os.path.join(
|
||||
+ sysconfig.get_config_var("BINDIR"),
|
||||
+ "python{}{}".format(
|
||||
+ sysconfig.get_config_var("VERSION"),
|
||||
+ sysconfig.get_config_var("EXE"),
|
||||
+ ),
|
||||
+ )
|
||||
post_interp = shebang_match.group(1) or ''
|
||||
- shebang = f"#!python{post_interp}\n"
|
||||
+ shebang = "#!" + executable + post_interp + "\n"
|
||||
self._validate_shebang(shebang, f.encoding)
|
||||
with open(outfile, "w", encoding=f.encoding) as outf:
|
||||
outf.write(shebang)
|
||||
--
|
||||
2.48.1
|
||||
|
||||
Reference in New Issue
Block a user