diff mbox series

[39/48] python3-setuptools: upgrade 69.0.3 -> 69.1.1

Message ID 1709105575-24259-39-git-send-email-wangmy@fujitsu.com
State Accepted, archived
Commit a953d88346d4ee93b5669c079586ae27d71552dc
Headers show
Series [01/48] bash-completion: upgrade 2.11 -> 2.12.0 | expand

Commit Message

Mingyu Wang (Fujitsu) Feb. 28, 2024, 7:32 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch
0001-conditionally-do-not-fetch-code-by-easy_install.patch
refreshed for 69.1.1

Changelog:
==========
-Updated and removed obsolete Python < 3.8 code and comments.
-Updated Package Discovery and Resource Access using pkg_resources to use stdlib
 importlib.machinery instead of importlib_machinery
-In tests, rely on pytest-home for reusable fixture.
-Explicitely marked as Protocol and fixed missing self argument in interfaces
 pkg_resources.IMetadataProvider and pkg_resources.IResourceProvider
-Restored expectation that egg-link files would be named with dash separators
 for compatibility with pip prior to version 24.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...stutils-sysconfig.py-make-it-possible-to-substite.patch | 3 +--
 ...1-conditionally-do-not-fetch-code-by-easy_install.patch | 7 +++----
 ...3-setuptools_69.0.3.bb => python3-setuptools_69.1.1.bb} | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)
 rename meta/recipes-devtools/python/{python3-setuptools_69.0.3.bb => python3-setuptools_69.1.1.bb} (94%)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch b/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch
index 7cafde4d5d..fc0631ffd2 100644
--- a/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch
+++ b/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch
@@ -1,4 +1,4 @@ 
-From bfa655d63e79ba5a75441604ca14a70800794189 Mon Sep 17 00:00:00 2001
+From 85e65daf5e3ce4741e3653dc8912dc7555f84e78 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Wed, 11 May 2022 21:41:14 +0200
 Subject: [PATCH] _distutils/sysconfig.py: make it possible to substite the
@@ -15,7 +15,6 @@  would happen to this module in light of distutils deprecation.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
 ---
  setuptools/_distutils/sysconfig.py | 12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch
index 9b17dba178..71bb77227c 100644
--- a/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch
+++ b/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch
@@ -1,4 +1,4 @@ 
-From 519e2845014f04b4c23b5cf8f92fc4e5dcf40f20 Mon Sep 17 00:00:00 2001
+From 6fe7afb3fd1612325f6dde94738adacc5d8d7659 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Tue, 17 Jul 2018 10:13:38 +0800
 Subject: [PATCH] conditionally do not fetch code by easy_install
@@ -9,16 +9,15 @@  internet by easy_install.
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-
 ---
  setuptools/command/easy_install.py | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
-index 8ba4f09..8ea40c5 100644
+index cc0c409..948bcf2 100644
 --- a/setuptools/command/easy_install.py
 +++ b/setuptools/command/easy_install.py
-@@ -676,6 +676,11 @@ class easy_install(Command):
+@@ -671,6 +671,11 @@ class easy_install(Command):
              os.path.exists(tmpdir) and _rmtree(tmpdir)
  
      def easy_install(self, spec, deps=False):
diff --git a/meta/recipes-devtools/python/python3-setuptools_69.0.3.bb b/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb
similarity index 94%
rename from meta/recipes-devtools/python/python3-setuptools_69.0.3.bb
rename to meta/recipes-devtools/python/python3-setuptools_69.1.1.bb
index 715c89338f..77d4e0aa03 100644
--- a/meta/recipes-devtools/python/python3-setuptools_69.0.3.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb
@@ -11,7 +11,7 @@  SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-e
 SRC_URI += " \
             file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch"
 
-SRC_URI[sha256sum] = "be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78"
+SRC_URI[sha256sum] = "5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8"
 
 DEPENDS += "python3"