[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH 61/70] python3-setuptools: upgrade 45.2.0 -> 47.1.1
From:       "Alexander Kanavin" <alex.kanavin () gmail ! com>
Date:       2020-05-31 15:52:45
Message-ID: 20200531155254.10283-61-alex.kanavin () gmail ! com
[Download RAW message or body]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...ly-do-not-fetch-code-by-easy_install.patch |  6 +++---
 .../python/python-setuptools.inc              |  3 +--
 .../0001-change-shebang-to-python3.patch      | 21 ++++---------------
 ...45.2.0.bb => python3-setuptools_47.1.1.bb} |  0
 4 files changed, 8 insertions(+), 22 deletions(-)
 rename meta/recipes-devtools/python/{python3-setuptools_45.2.0.bb => \
python3-setuptools_47.1.1.bb} (100%)

diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch \
b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
 index 5f99cd2512..c7acdd2d55 100644
--- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
                
+++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
 @@ -1,4 +1,4 @@
-From a8f871c9ebc4fcb99d4163b226aabeef26567099 Mon Sep 17 00:00:00 2001
+From f1d625cad6db3958507b8c6f3785788a1b17970c 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
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
-index 426301d..55c8062 100644
+index 6bcdc98..0bf0c24 100644
 --- a/setuptools/command/easy_install.py
 +++ b/setuptools/command/easy_install.py
-@@ -649,6 +649,11 @@ class easy_install(Command):
+@@ -651,6 +651,11 @@ class easy_install(Command):
              os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir))
  
      def easy_install(self, spec, deps=False):
diff --git a/meta/recipes-devtools/python/python-setuptools.inc \
b/meta/recipes-devtools/python/python-setuptools.inc index e9ad93dbee..eae6095e3a \
                100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -12,8 +12,7 @@ SRC_URI_append_class-native = " \
file://0001-conditionally-do-not-fetch-code-by-e  
 SRC_URI += "file://0001-change-shebang-to-python3.patch"
 
-SRC_URI[md5sum] = "0c956eea142af9c2b02d72e3c042af30"
-SRC_URI[sha256sum] = \
"89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f" \
+SRC_URI[sha256sum] = \
"145fa62b9d7bb544fce16e9b5a9bf4ab2032d2f758b7cd674af09a92736aff74"  
 DEPENDS += "${PYTHON_PN}"
 
diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch \
b/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch
 index 33af8daed7..5ed4cb8bef 100644
--- a/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch
                
+++ b/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch
 @@ -1,4 +1,4 @@
-From c39d0896930e25c224cc897660fc8511ccae30c8 Mon Sep 17 00:00:00 2001
+From f80880c6b8823f78937ade1cb9f395a6c60bf0ed Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 23 Apr 2020 10:01:12 +0000
 Subject: [PATCH] change shebang to python3
@@ -6,10 +6,10 @@ Subject: [PATCH] change shebang to python3
 Upstream-Status: Pending
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
+
 ---
- pkg_resources/_vendor/appdirs.py   | 2 +-
- setuptools/command/easy_install.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ pkg_resources/_vendor/appdirs.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py
 index ae67001..933e398 100644
@@ -21,16 +21,3 @@ index ae67001..933e398 100644
  # -*- coding: utf-8 -*-
  # Copyright (c) 2005-2010 ActiveState Software Inc.
  # Copyright (c) 2013 Eddy Petrișor
-diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
-index abca1ae..6bcdc98 100644
---- a/setuptools/command/easy_install.py
-+++ b/setuptools/command/easy_install.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- """
- Easy Install
- ------------
--- 
-2.24.1
-
diff --git a/meta/recipes-devtools/python/python3-setuptools_45.2.0.bb \
b/meta/recipes-devtools/python/python3-setuptools_47.1.1.bb similarity index 100%
rename from meta/recipes-devtools/python/python3-setuptools_45.2.0.bb
rename to meta/recipes-devtools/python/python3-setuptools_47.1.1.bb
-- 
2.26.2



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138994): https://lists.openembedded.org/g/openembedded-core/message/138994
Mute This Topic: https://lists.openembedded.org/mt/74584226/4454766
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  [openembedded-core@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-


[prev in list] [next in list] [prev in thread] [next in thread]