Skip to content

Commit 7b952b4

Browse files
committed
Update setuptools
Upgrades setuptools from 39.0.1 to: - 44.1.1 for Python 2.7 (since it's the last supported version) - 43.0.0 for Python 3.4 (since it's the last supported version) - 47.1.1 for Python 3.5+ (since we can't use 47.2.0+ until #1006 fixed) https://setuptools.readthedocs.io/en/latest/history.html#v47-1-1 Fixes #949. Closes #973.
1 parent 81874da commit 7b952b4

File tree

4 files changed

+22
-12
lines changed

4 files changed

+22
-12
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
# Unreleased
44

5+
- Update setuptools from 39.0.1 to: (#1024)
6+
- 44.1.1 for Python 2.7
7+
- 43.0.0 for Python 3.4
8+
- 47.1.1 for Python 3.5+
59
- Switch the `heroku-buildpack-python` repository default branch from `master` to `main` (#1029).
610

711
# 174 (2020-07-30)

bin/steps/python

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,19 @@ fi
138138
set -e
139139

140140
PIP_VERSION='20.0.2'
141-
SETUPTOOLS_VERSION='39.0.1'
141+
# Must use setuptools <47.2.0 until we fix:
142+
# https://github.com/heroku/heroku-buildpack-python/issues/1006
143+
SETUPTOOLS_VERSION='47.1.1'
142144
WHEEL_VERSION='0.34.2'
143145

144146
if [[ "${PYTHON_VERSION}" == ${PY34}* ]]; then
145-
# Python 3.4 support was dropped in pip 19.2+ and wheel 0.34.0+.
147+
# Python 3.4 support was dropped in pip 19.2+, setuptools 44+ and wheel 0.34+.
146148
PIP_VERSION='19.1.1'
149+
SETUPTOOLS_VERSION='43.0.0'
147150
WHEEL_VERSION='0.33.6'
151+
elif [[ "${PYTHON_VERSION}" == ${PY27}* || "${PYTHON_VERSION}" == ${PYPY27}* ]]; then
152+
# Python 2.7 support was dropped in setuptools 45+.
153+
SETUPTOOLS_VERSION='44.1.1'
148154
fi
149155

150156
# We don't use get-pip.py, since:

test/run-features

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ testStandardRequirements() {
4444

4545
testPipenv() {
4646
compile "pipenv"
47-
assertCaptured "Installing pip 9.0.2, setuptools 39.0.1 and wheel 0.34.2"
47+
assertCaptured "Installing pip 9.0.2, setuptools 47.1.1 and wheel 0.34.2"
4848
assertCapturedSuccess
4949
}
5050

test/run-versions

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ testPythonDefault() {
99
compile "pythonDefault"
1010
assertCaptured $DEFAULT_PYTHON_VERSION
1111
assertNotCaptured "security update"
12-
assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
12+
assertCaptured "Installing pip 20.0.2, setuptools 47.1.1 and wheel 0.34.2"
1313
assertCaptured "Installing SQLite3"
1414
assertCapturedSuccess
1515
}
@@ -25,7 +25,7 @@ testPython2() {
2525
assertNotCaptured "python-2-7-eol-faq";
2626
fi
2727
assertNotCaptured "security update"
28-
assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
28+
assertCaptured "Installing pip 20.0.2, setuptools 44.1.1 and wheel 0.34.2"
2929
assertCaptured "Installing SQLite3"
3030
assertCapturedSuccess
3131
}
@@ -53,7 +53,7 @@ testPython3_4() {
5353
compile "python3_4"
5454
assertCaptured $LATEST_34
5555
assertNotCaptured "security update"
56-
assertCaptured "Installing pip 19.1.1, setuptools 39.0.1 and wheel 0.33.6"
56+
assertCaptured "Installing pip 19.1.1, setuptools 43.0.0 and wheel 0.33.6"
5757
# if cedar 14 and legacy binaries, fail. if cedar 14 and staging, succeed.
5858
if [[ ! -n $USE_STAGING_BINARIES ]] && [[ $STACK == "cedar-14" ]]; then
5959
assertCapturedError
@@ -89,7 +89,7 @@ testPython3_5() {
8989
compile "python3_5"
9090
assertCaptured $LATEST_35
9191
assertNotCaptured "security update"
92-
assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
92+
assertCaptured "Installing pip 20.0.2, setuptools 47.1.1 and wheel 0.34.2"
9393
assertCaptured "Installing SQLite3"
9494
assertCapturedSuccess
9595
}
@@ -112,7 +112,7 @@ testPython3_6() {
112112
compile "python3_6"
113113
assertCaptured $LATEST_36
114114
assertNotCaptured "security update"
115-
assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
115+
assertCaptured "Installing pip 20.0.2, setuptools 47.1.1 and wheel 0.34.2"
116116
assertCaptured "Installing SQLite3"
117117
assertCapturedSuccess
118118
}
@@ -139,7 +139,7 @@ testPython3_7() {
139139
else
140140
assertNotCaptured "security update"
141141
assertCaptured $LATEST_37
142-
assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
142+
assertCaptured "Installing pip 20.0.2, setuptools 47.1.1 and wheel 0.34.2"
143143
assertCaptured "Installing SQLite3"
144144
assertCapturedSuccess
145145
fi
@@ -183,7 +183,7 @@ testPython3_8() {
183183
else
184184
assertNotCaptured "security update"
185185
assertCaptured $LATEST_38
186-
assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
186+
assertCaptured "Installing pip 20.0.2, setuptools 47.1.1 and wheel 0.34.2"
187187
assertCaptured "Installing SQLite3"
188188
assertCapturedSuccess
189189
fi
@@ -202,7 +202,7 @@ testPypy3_6() {
202202
else
203203
assertCaptured "Installing pypy"
204204
assertCaptured "$PYPY_36"
205-
assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
205+
assertCaptured "Installing pip 20.0.2, setuptools 47.1.1 and wheel 0.34.2"
206206
assertCapturedSuccess
207207
fi
208208
}
@@ -214,7 +214,7 @@ testPypy2_7() {
214214
else
215215
assertCaptured "Installing pypy"
216216
assertCaptured "$PYPY_27"
217-
assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
217+
assertCaptured "Installing pip 20.0.2, setuptools 44.1.1 and wheel 0.34.2"
218218
assertCapturedSuccess
219219
fi
220220
}

0 commit comments

Comments
 (0)