Skip to content

Commit 105da32

Browse files
committed
downloads: upgrade setuptools from 58.1.0 to 59.1.1
setuptools finally upgraded the vendored packaging package, so we can remove the patch we contributed upstream in pypa/packaging#294. A similar patch for pip still lingers (perhaps we haven't tried to contribute that upstream yet).
1 parent ee7fe10 commit 105da32

File tree

2 files changed

+4
-32
lines changed

2 files changed

+4
-32
lines changed

cpython-unix/build-cpython.sh

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -60,34 +60,6 @@ zip -r "${PIP_WHEEL}" *
6060
popd
6161
rm -rf pip-tmp
6262

63-
mkdir setuptools-tmp
64-
pushd setuptools-tmp
65-
unzip "${SETUPTOOLS_WHEEL}"
66-
rm -f "${SETUPTOOLS_WHEEL}"
67-
68-
patch -p1 <<EOF
69-
diff --git a/setuptools/_vendor/packaging/tags.py b/setuptools/_vendor/packaging/tags.py
70-
index 9064910b..c541e648 100644
71-
--- a/setuptools/_vendor/packaging/tags.py
72-
+++ b/setuptools/_vendor/packaging/tags.py
73-
@@ -475,7 +475,10 @@ def _glibc_version_string_ctypes():
74-
# which libc our process is actually using.
75-
#
76-
# Note: typeshed is wrong here so we are ignoring this line.
77-
- process_namespace = ctypes.CDLL(None) # type: ignore
78-
+ try:
79-
+ process_namespace = ctypes.CDLL(None) # type: ignore
80-
+ except OSError:
81-
+ return None
82-
try:
83-
gnu_get_libc_version = process_namespace.gnu_get_libc_version
84-
except AttributeError:
85-
EOF
86-
87-
zip -r "${SETUPTOOLS_WHEEL}" *
88-
popd
89-
rm -rf setuptools-tmp
90-
9163
# If we are cross-compiling, we need to build a host Python to use during
9264
# the build.
9365
if [ "${BUILD_TRIPLE}" != "${TARGET_TRIPLE}" ]; then

pythonbuild/downloads.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,10 @@
284284
"license_file": "LICENSE.readline.txt",
285285
},
286286
"setuptools": {
287-
"url": "https://files.pythonhosted.org/packages/4e/2e/f8e006dbaaa46ed1e762c287585b92476deb8d3ccb79b720ed3b86bc6113/setuptools-58.1.0-py3-none-any.whl",
288-
"size": 816725,
289-
"sha256": "7324fd4b66efa05cdfc9c89174573a4410acc7848f318cc0565c7fb659dfdc81",
290-
"version": "58.1.0",
287+
"url": "https://files.pythonhosted.org/packages/ed/60/15ee37d6d3385e6a432d39b5ac51f8467178ad989ba50f2b55681c1a038e/setuptools-59.1.1-py3-none-any.whl",
288+
"size": 951244,
289+
"sha256": "fb537610c2dfe77b5896e3ee53dd53fbdd9adc48076c8f28cee3a30fb59a5038",
290+
"version": "59.1.1",
291291
},
292292
"sqlite": {
293293
"url": "https://www.sqlite.org/2021/sqlite-autoconf-3360000.tar.gz",

0 commit comments

Comments
 (0)