Add latest version of setuptools for Python 3.

Python2 stays on the original vendered setuptools: 39.0.1.

Force installation of new setuptools.

Fix python version check.

iasdfasdf

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Docs: Fix explanation of runtime.txt generation when using pipenv
 - Bugfix: Correctly detect Python version when using a `python_version` of `3.8` in `Pipfile.lock`
+- Updated setuptools to v46.1.3 for python3 installations.
 
 --------------------------------------------------------------------------------
 

bin/steps/python

@@ -157,7 +157,12 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_UPDATE* ]]; then
   rm -fr /app/.heroku/python/lib/python*/site-packages/setuptools-*
 
   /app/.heroku/python/bin/python "$GETPIP_PY" pip=="$PIP_UPDATE" &> /dev/null
-  /app/.heroku/python/bin/pip install "$ROOT_DIR/vendor/setuptools-39.0.1-py2.py3-none-any.whl" &> /dev/null
+  if [ "$PYTHON_VERSION" == "$PYPY_27" ]; then
+    /app/.heroku/python/bin/pip install "$ROOT_DIR/vendor/setuptools-39.0.1-py2.py3-none-any.whl" &> /dev/null
+  else
+    /app/.heroku/python/bin/pip install "$ROOT_DIR/vendor/setuptools-46.1.3-py3-none-any.whl" &> /dev/null
+  fi
+
 fi
 
 set -e