Skip to content

Commit 159de35

Browse files
committed
downloads: upgrade pip and setuptools to latest versions
We want to stay current. setuptools changed the location of some binary sniffing code. So we update our patch accordingly.
1 parent 69e1539 commit 159de35

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

cpython-unix/build-cpython.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ make -j ${NUM_CPUS} install DESTDIR=${ROOT}/out/python
158158
# setuptools has the same bug! So we need to install a patched version.
159159
pushd ${ROOT}/setuptools-${SETUPTOOLS_VERSION}
160160
patch -p1 <<EOF
161-
diff --git a/setuptools/glibc.py b/setuptools/glibc.py
162-
index a134591c..c9c3f378 100644
163-
--- a/setuptools/glibc.py
164-
+++ b/setuptools/glibc.py
165-
@@ -14,7 +14,10 @@ def glibc_version_string():
161+
diff --git a/setuptools/_vendor/packaging/tags.py b/setuptools/_vendor/packaging/tags.py
162+
index ec9942f0..1b306ca7 100644
163+
--- a/setuptools/_vendor/packaging/tags.py
164+
+++ b/setuptools/_vendor/packaging/tags.py
165+
@@ -283,7 +283,10 @@ def _glibc_version_string():
166166
# manpage says, "If filename is NULL, then the returned handle is for the
167167
# main program". This way we can let the linker do the work to figure out
168168
# which libc our process is actually using.

pythonbuild/downloads.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,10 @@
282282
"version": "2.11.06",
283283
},
284284
"pip": {
285-
"url": "https://files.pythonhosted.org/packages/ce/ea/9b445176a65ae4ba22dce1d93e4b5fe182f953df71a145f557cffaffc1bf/pip-19.3.1.tar.gz",
286-
"size": 1393609,
287-
"sha256": "21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7",
288-
"version": "19.3.1",
285+
"url": "https://files.pythonhosted.org/packages/8e/76/66066b7bc71817238924c7e4b448abdb17eb0c92d645769c223f9ace478f/pip-20.0.2.tar.gz",
286+
"size": 1433827,
287+
"sha256": "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f",
288+
"version": "20.0.2",
289289
},
290290
"readline": {
291291
"url": "ftp://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz",
@@ -303,10 +303,10 @@
303303
"version": "1.30.1",
304304
},
305305
"setuptools": {
306-
"url": "https://files.pythonhosted.org/packages/f4/d5/a6c19dcbcbc267aca376558797f036d9bcdff344c9f785fe7d0fe9a5f2a7/setuptools-41.4.0.zip",
307-
"size": 855608,
308-
"sha256": "7eae782ccf36b790c21bde7d86a4f303a441cd77036b25c559a602cf5186ce4d",
309-
"version": "41.4.0",
306+
"url": "https://files.pythonhosted.org/packages/68/75/d1d7b7340b9eb6e0388bf95729e63c410b381eb71fe8875cdfd949d8f9ce/setuptools-45.2.0.zip",
307+
"size": 859896,
308+
"sha256": "89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f",
309+
"version": "45.2.0",
310310
},
311311
"sqlite": {
312312
"url": "https://www.sqlite.org/2020/sqlite-autoconf-3310100.tar.gz",

0 commit comments

Comments
 (0)