diff options
author | wangmy <wangmy@fujitsu.com> | 2021-07-12 15:56:48 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-13 14:27:53 +0100 |
commit | 262d2c6b6c4f357a8ec083af0934dcbb3acd169c (patch) | |
tree | b15d8bf334bdec397f78b55b95ec6c33c8aafb81 /meta | |
parent | 98185559344bf3d43d1253d0f1da466abcd4891c (diff) | |
download | poky-262d2c6b6c4f357a8ec083af0934dcbb3acd169c.tar.gz |
python3-setuptools: upgrade 57.0.0 -> 57.1.0
reproducibility.patch
deleted since it's been merged upstream.
v57.1.0
-------
Changes
^^^^^^^
* #2692: Globs are now sorted in 'license_files' restoring reproducibility by eliminating variance from disk order.
* #2714: Update to distutils at pypa/distutils@e2627b7.
* #2715: Removed reliance on deprecated ssl.match_hostname by removing the ssl support. Now any index operations rely on the native SSL implementation.
Documentation changes
^^^^^^^^^^^^^^^^^^^^^
* #2604: Revamped the backward/cross tool compatibility section to remove
some confusion.
Add some examples and the version since when ``entry_points`` are
supported in declarative configuration.
Tried to make the reading flow a bit leaner, gather some informations
that were a bit dispersed.
(From OE-Core rev: 9720cce06206895e2e85b171d58a289172bb9092)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/python/python3-setuptools/reproducibility.patch | 40 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-setuptools_57.1.0.bb (renamed from meta/recipes-devtools/python/python3-setuptools_57.0.0.bb) | 5 |
2 files changed, 2 insertions, 43 deletions
diff --git a/meta/recipes-devtools/python/python3-setuptools/reproducibility.patch b/meta/recipes-devtools/python/python3-setuptools/reproducibility.patch deleted file mode 100644 index 149d8ad5ce..0000000000 --- a/meta/recipes-devtools/python/python3-setuptools/reproducibility.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | The License-File lines in PKG-INFO change ordering depending on the order on disk, | ||
2 | for example for python-packaging, one build shows: | ||
3 | |||
4 | License-File: LICENSE | ||
5 | License-File: LICENSE.APACHE | ||
6 | License-File: LICENSE.BSD | ||
7 | |||
8 | and the other shows: | ||
9 | |||
10 | License-File: LICENSE | ||
11 | License-File: LICENSE.BSD | ||
12 | License-File: LICENSE.APACHE | ||
13 | |||
14 | This is because glob uses os.listdir() which is unsorted. Sort the result to avoid this. | ||
15 | |||
16 | Upstream-Status: Submitted [https://github.com/pypa/setuptools/issues/2691] | ||
17 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
18 | |||
19 | Index: setuptools-57.0.0/setuptools/dist.py | ||
20 | =================================================================== | ||
21 | --- setuptools-57.0.0.orig/setuptools/dist.py | ||
22 | +++ setuptools-57.0.0/setuptools/dist.py | ||
23 | @@ -15,7 +15,7 @@ import distutils.command | ||
24 | from distutils.util import strtobool | ||
25 | from distutils.debug import DEBUG | ||
26 | from distutils.fancy_getopt import translate_longopt | ||
27 | -from glob import iglob | ||
28 | +from glob import glob | ||
29 | import itertools | ||
30 | import textwrap | ||
31 | from typing import List, Optional, TYPE_CHECKING | ||
32 | @@ -603,7 +603,7 @@ class Distribution(_Distribution): | ||
33 | return ( | ||
34 | path | ||
35 | for pattern in patterns | ||
36 | - for path in iglob(pattern) | ||
37 | + for path in sorted(glob(pattern)) | ||
38 | if not path.endswith('~') | ||
39 | and os.path.isfile(path) | ||
40 | ) | ||
diff --git a/meta/recipes-devtools/python/python3-setuptools_57.0.0.bb b/meta/recipes-devtools/python/python3-setuptools_57.1.0.bb index a15b51e31c..c066d8209f 100644 --- a/meta/recipes-devtools/python/python3-setuptools_57.0.0.bb +++ b/meta/recipes-devtools/python/python3-setuptools_57.1.0.bb | |||
@@ -8,10 +8,9 @@ inherit pypi setuptools3 | |||
8 | 8 | ||
9 | SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" | 9 | SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" |
10 | 10 | ||
11 | SRC_URI += "file://0001-change-shebang-to-python3.patch \ | 11 | SRC_URI += "file://0001-change-shebang-to-python3.patch" |
12 | file://reproducibility.patch" | ||
13 | 12 | ||
14 | SRC_URI[sha256sum] = "401cbf33a7bf817d08014d51560fc003b895c4cdc1a5b521ad2969e928a07535" | 13 | SRC_URI[sha256sum] = "cfca9c97e7eebbc8abe18d5e5e962a08dcad55bb63afddd82d681de4d22a597b" |
15 | 14 | ||
16 | DEPENDS += "${PYTHON_PN}" | 15 | DEPENDS += "${PYTHON_PN}" |
17 | 16 | ||