python3-setuptools: upgrade 56.2.0 -> 57.0.0

Add a patch to fix a reproducibility issue in the new version.

(From OE-Core rev: ea6fffe4f07cfd105f861ad0d2dc7c7605bf9e64)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-05-28 08:39:23 +00:00
parent 725b711ba3
commit faf001f022
3 changed files with 44 additions and 3 deletions

View File

@@ -1,4 +1,4 @@
From d6339e6b3de0f3be5ca50541d82f99d827700f45 Mon Sep 17 00:00:00 2001
From f6afc18e08a6c428ce8becd114c535a6840f1b9f 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

View File

@@ -0,0 +1,40 @@
The License-File lines in PKG-INFO change ordering depending on the order on disk,
for example for python-packaging, one build shows:
License-File: LICENSE
License-File: LICENSE.APACHE
License-File: LICENSE.BSD
and the other shows:
License-File: LICENSE
License-File: LICENSE.BSD
License-File: LICENSE.APACHE
This is because glob uses os.listdir() which is unsorted. Sort the result to avoid this.
Upstream-Status: Submitted [https://github.com/pypa/setuptools/issues/2691]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Index: setuptools-57.0.0/setuptools/dist.py
===================================================================
--- setuptools-57.0.0.orig/setuptools/dist.py
+++ setuptools-57.0.0/setuptools/dist.py
@@ -15,7 +15,7 @@ import distutils.command
from distutils.util import strtobool
from distutils.debug import DEBUG
from distutils.fancy_getopt import translate_longopt
-from glob import iglob
+from glob import glob
import itertools
import textwrap
from typing import List, Optional, TYPE_CHECKING
@@ -603,7 +603,7 @@ class Distribution(_Distribution):
return (
path
for pattern in patterns
- for path in iglob(pattern)
+ for path in sorted(glob(pattern))
if not path.endswith('~')
and os.path.isfile(path)
)

View File

@@ -8,9 +8,10 @@ inherit pypi setuptools3
SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch"
SRC_URI += "file://0001-change-shebang-to-python3.patch"
SRC_URI += "file://0001-change-shebang-to-python3.patch \
file://reproducibility.patch"
SRC_URI[sha256sum] = "7bb5652625e94e73b9358b7ed8c6431b732e80cf31f4e0972294c64f0e5b849e"
SRC_URI[sha256sum] = "401cbf33a7bf817d08014d51560fc003b895c4cdc1a5b521ad2969e928a07535"
DEPENDS += "${PYTHON_PN}"