Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/python-setuptools: bump to version 68.2.2
@ 2023-11-05  9:57 James Hilliard
  2023-11-06 21:27 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: James Hilliard @ 2023-11-05  9:57 UTC (permalink / raw)
  To: buildroot; +Cc: James Hilliard, Asaf Kahlon

Refresh add executable patch.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 .../0001-add-executable.patch                 | 27 ++++++++++---------
 .../python-setuptools/python-setuptools.hash  |  4 +--
 .../python-setuptools/python-setuptools.mk    |  4 +--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/package/python-setuptools/0001-add-executable.patch b/package/python-setuptools/0001-add-executable.patch
index b688745ce4..d93298e118 100644
--- a/package/python-setuptools/0001-add-executable.patch
+++ b/package/python-setuptools/0001-add-executable.patch
@@ -1,4 +1,4 @@
-From 9b3d307f8f6a1af88f3f810f5a6cf0835830e1e8 Mon Sep 17 00:00:00 2001
+From 975379e84ae3229fac94cd0499fd4ba7baa574ba Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
 Date: Mon, 7 Dec 2015 01:14:33 +0100
 Subject: [PATCH] add executable
@@ -15,13 +15,14 @@ force the shebang line in installed python scripts.
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
 ---
  setuptools/command/install.py         | 2 ++
  setuptools/command/install_scripts.py | 9 +++++++++
  2 files changed, 11 insertions(+)
 
 diff --git a/setuptools/command/install.py b/setuptools/command/install.py
-index 72b9a3e..6781d2b 100644
+index 606cce9d8..f158e1b51 100644
 --- a/setuptools/command/install.py
 +++ b/setuptools/command/install.py
 @@ -16,6 +16,7 @@ class install(orig.install):
@@ -30,9 +31,9 @@ index 72b9a3e..6781d2b 100644
      user_options = orig.install.user_options + [
 +        ('executable=', 'e', "specify final destination interpreter path"),
          ('old-and-unmanageable', None, "Try not to use this!"),
-         ('single-version-externally-managed', None,
-          "used by system package builders to create 'flat' eggs"),
-@@ -38,6 +39,7 @@ class install(orig.install):
+         (
+             'single-version-externally-managed',
+@@ -48,6 +49,7 @@ class install(orig.install):
          )
  
          orig.install.initialize_options(self)
@@ -41,10 +42,10 @@ index 72b9a3e..6781d2b 100644
          self.single_version_externally_managed = None
  
 diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
-index 9cd8eb0..7786150 100644
+index 72b2e45cb..146a0bb58 100644
 --- a/setuptools/command/install_scripts.py
 +++ b/setuptools/command/install_scripts.py
-@@ -13,6 +13,13 @@ class install_scripts(orig.install_scripts):
+@@ -12,6 +12,13 @@ class install_scripts(orig.install_scripts):
      def initialize_options(self):
          orig.install_scripts.initialize_options(self)
          self.no_ep = False
@@ -57,16 +58,16 @@ index 9cd8eb0..7786150 100644
 +        )
  
      def run(self):
-         import setuptools.command.easy_install as ei
-@@ -33,6 +40,8 @@ class install_scripts(orig.install_scripts):
+         self.run_command("egg_info")
+@@ -38,6 +45,8 @@ class install_scripts(orig.install_scripts):
          )
          bs_cmd = self.get_finalized_command('build_scripts')
          exec_param = getattr(bs_cmd, 'executable', None)
 +        if self.executable is not None:
 +            exec_param = self.executable
-         try:
-             bw_cmd = self.get_finalized_command("bdist_wininst")
-             is_wininst = getattr(bw_cmd, '_is_running', False)
+         writer = ei.ScriptWriter
+         if exec_param == sys.executable:
+             # In case the path to the Python executable contains a space, wrap
 -- 
-2.30.2
+2.34.1
 
diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash
index 45413af27e..6e1df42e3f 100644
--- a/package/python-setuptools/python-setuptools.hash
+++ b/package/python-setuptools/python-setuptools.hash
@@ -1,4 +1,4 @@
 # From https://pypi.org/pypi/setuptools/json
-md5  c5e4ff6557d99204464aa300c0bad7d4  setuptools-68.0.0.tar.gz
-sha256  baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235  setuptools-68.0.0.tar.gz
+md5  d967ca2ba7f46db887daee2d5c9bd6a2  setuptools-68.2.2.tar.gz
+sha256  4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87  setuptools-68.2.2.tar.gz
 sha256  86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741  LICENSE
diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
index 39ead10f55..f26f427ccc 100644
--- a/package/python-setuptools/python-setuptools.mk
+++ b/package/python-setuptools/python-setuptools.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_SETUPTOOLS_VERSION = 68.0.0
+PYTHON_SETUPTOOLS_VERSION = 68.2.2
 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz
-PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/dc/98/5f896af066c128669229ff1aa81553ac14cfb3e5e74b6b44594132b8540e
+PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/cc/93f7213b2ab5ed383f98ce8020e632ef256b406b8569606c3f160ed8e1c9
 PYTHON_SETUPTOOLS_LICENSE = MIT
 PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE
 PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/python-setuptools: bump to version 68.2.2
  2023-11-05  9:57 [Buildroot] [PATCH 1/1] package/python-setuptools: bump to version 68.2.2 James Hilliard
@ 2023-11-06 21:27 ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-11-06 21:27 UTC (permalink / raw)
  To: James Hilliard; +Cc: Asaf Kahlon, buildroot

On Sun,  5 Nov 2023 02:57:31 -0700
James Hilliard <james.hilliard1@gmail.com> wrote:

> Refresh add executable patch.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  .../0001-add-executable.patch                 | 27 ++++++++++---------
>  .../python-setuptools/python-setuptools.hash  |  4 +--
>  .../python-setuptools/python-setuptools.mk    |  4 +--
>  3 files changed, 18 insertions(+), 17 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-11-06 21:27 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-05  9:57 [Buildroot] [PATCH 1/1] package/python-setuptools: bump to version 68.2.2 James Hilliard
2023-11-06 21:27 ` Thomas Petazzoni via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox