Release v180 (#1078 )

Closes @W-8120452@.
Add support for Python 3.8.6 (#1072 )
2026-06-05 23:10:16 +00:00 · 2020-09-24 19:17:18 +01:00 · 2020-09-24 18:55:27 +01:00 · 2020-09-23 14:49:46 +01:00 · 2020-09-23 11:15:54 +01:00 · 2020-09-22 18:48:31 +01:00
47 changed files with 332 additions and 610 deletions
@@ -0,0 +1,6 @@
+{
+  "productTag": "a1aB0000000MR0RIAW",
+  "issueTypeLabels": { "gus: story": "USER STORY", "gus: bug": "BUG P3" },
+  "defaultBuild": "Heroku Unscheduled",
+  "statusWhenClosed": "CLOSED"
+}
@@ -0,0 +1,15 @@
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "c: dependencies"
+
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "c: dependencies"
@@ -1,7 +0,0 @@
-repos:
-   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
-    hooks:
-    -   id: check-yaml
-    -   id: end-of-file-fixer
-    -   id: trailing-whitespace
@@ -1,8 +1,8 @@
 language: minimal
-dist: bionic
+dist: focal
 branches:
  only:
-  - master
+  - main

 script:
  - make test STACK="${STACK}" TEST_CMD="${TEST_CMD}"
@@ -12,14 +12,13 @@ jobs:
  - name: Bash linting (shellcheck)
    script: make check
  - name: Hatchet integration tests
-    if: env(TRAVIS_PULL_REQUEST_SLUG) = env(TRAVIS_REPO_SLUG)
+    if: env(HEROKU_API_USER) IS present AND env(HEROKU_API_KEY) IS present
    language: ruby
    rvm:
-      - 2.6.6
+      - 2.7
    before_script:
-      - gem install bundler -v 1.16.2
-    script:
      - bundle exec hatchet ci:setup
+    script:
      - PARALLEL_SPLIT_TEST_PROCESSES=11 bundle exec parallel_split_test spec/hatchet/

 env:
@@ -40,5 +39,3 @@ env:
    - IS_RUNNING_ON_CI=true
    - HATCHET_APP_LIMIT=80
    - HATCHET_DEPLOY_STRATEGY=git
-    - secure: yjtlPE5FbVxTKnjUy/tZUBgSEf4qADD3QOxtgziuid73S0U/1IEXlMGFULsQzIjtlHKmHeywZqpVVEpthIH4RuT7uoX1Pb7SSM/g0T8fT3VoEFbFK1uYl0oZQbUS4Klxv9tPiumj8if3m6ULEGIz1X0wZcMOC0tMLwVCnwmap0E=
-    - secure: ZeFTHWwnpIKE9nAqs88ocmiQh7bKce84lilGm5J23nf3N6V4wNyLwqlkvsM008WGBCaOg9AUx7ZunasT0ANsR5gLP3eV2UUg7ILdRgV2Gy13eNRFheC4PHdN92RqQ3aKoqlIv2K999xlhVjod0NzhkQQXB6PddfQINbuU7ks6As=
@@ -1,9 +1,43 @@
 # Python Buildpack Changelog

-# Master
+## Unreleased


-# 174 (2020-07-30)
+## v180 (2020-09-24)
+
+- Python 3.8.6 is now available (CPython) (#1072).
+
+## v179 (2020-09-23)
+
+- Remove duplicate pipenv metric event (#1070).
+- Emit metrics for how the Python version was chosen for an app (#1069).
+- Emit Python version metric events for all builds, not just clean installs (#1066).
+
+## v178 (2020-09-07)
+
+- Python 3.5.10 is now available (CPython) (#1062).
+
+## v177 (2020-08-18)
+
+- Python 3.6.12 and 3.7.9 are now available (CPython) (#1054).
+- The default Python version for new apps is now 3.6.12 (previously 3.6.11) (#1054).
+
+## v176 (2020-08-12)
+
+- Rebuild the Python 3.4.10 archives with the correct version of Python (#1048).
+- Fix the security update version check message for apps using PyPy (#1040).
+- Remove `vendor/test-utils` (#1043).
+
+## v175 (2020-08-05)
+
+- Update pip from 20.0.2 to 20.1.1 for Python 2.7 and Python 3.5+ (#1030).
+- Update setuptools from 39.0.1 to: (#1024)
+  - 44.1.1 for Python 2.7
+  - 43.0.0 for Python 3.4
+  - 47.1.1 for Python 3.5+
+- Switch the `heroku-buildpack-python` repository default branch from `master` to `main` (#1029).
+
+## v174 (2020-07-30)

 - For repeat builds, also manage the installed versions of setuptools/wheel, rather than just that of pip (#1007).
 - Install an explicit version of wheel rather than the latest release at the time (#1007).
@@ -12,87 +46,85 @@
 - Install pip using itself rather than `get-pip.py` (#1007).
 - Disable pip's version check + cache when installing pip/setuptools/wheel (#1007).
 - Install setuptools from PyPI rather than a vendored copy (#1007).
- Reduce the number of environment variables exposed to `bin/{pre,post}_compile` and other subprocesses (#1011)
+- Reduce the number of environment variables exposed to `bin/{pre,post}_compile` and other subprocesses (#1011).

-# 173 (2020-07-21)
+## v173 (2020-07-21)

- Python 3.8.5 is now available (CPython)
+- Python 3.8.5 is now available (CPython).

-# 172 (2020-07-17)
+## v172 (2020-07-17)

- Python 3.8.4 is now available (CPython)
+- Python 3.8.4 is now available (CPython).

-# 171 (2020-07-07)
+## v171 (2020-07-07)

 - Python 3.6.11 and 3.7.8 are now available (CPython).

-# 170 (2020-05-19)
+## v170 (2020-05-19)

 - Python 2.7.18, 3.5.9, 3.7.7 and 3.8.3 are now available (CPython).
- PyPy 2.7 and 3.6, version 7.3.1 are now available (Note: PyPy support is in beta)
- 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`
+- PyPy 2.7 and 3.6, version 7.3.1 are now available (Note: PyPy support is in beta).
+- 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`.

--------------------------------------------------------------------------------
-
-# 169 (2020-04-22)
+## v169 (2020-04-22)

 - Add a Hatchet test for python 3.8.2
 - Set Code Owners to @heroku/langauges
 - Bugfix: Caching on subsequent redeploys
 - Update tests to support latest version of Python

-# 168 (2020-04-06)
+## v168 (2020-04-06)

 - Doc: Update Readme with version numbers
 - update Code Owners to include the Heroku Buildpack Maintainers team
- Deprecation warning: BUILD_WITH_GEO_LIBRARIES is now deprecated. See warning for details.
+- Deprecation warning: `BUILD_WITH_GEO_LIBRARIES` is now deprecated. See warning for details.
 - Clean up build log output
 - Update Python versions in README to match docs
 - Django version detection fixed, link updated

-# 167 (2020-03-26)
+## v167 (2020-03-26)

 - Add failcase for cache busting
 - Bugfix: Clearing pip dependencies

-# 166 (2020-03-05)
+## v166 (2020-03-05)

 - Correct ftp to https in vendored file
 - Warn for Django 1.11 approaching EOL, provide link to roadmap

-# 165 (2020-02-27)
+## v165 (2020-02-27)

 - Python 3.8.2 now available.

-# 164 (2020-02-20)
+## v164 (2020-02-20)

 - Update requirements.txt builds to use Pip 20.0.2
 - Download get-pip.py to tmpdir instead of root dir

-# 163 (2019-12-23)
+## v163 (2019-12-23)

 - New pythons released:
  Python 3.8.1, 3.7.6, 3.6.10 (CPython)
  Beta Release: Pypy 2.7 and 3.6, version 7.2.0

-# 162 (2019-12-06)
+## v162 (2019-12-06)

 - Bug fix: fragile sqlite3 install

-# 161 (2019-12-2)
+## v161 (2019-12-2)

 - Bug fix: Sqlite3 version bump

-# 160 (2019-10-23)
+## v160 (2019-10-23)

 - Bugfix: Pipenv no longer installs twice in CI

-# 159 (2019-10-22)
+## v159 (2019-10-22)

 - Python 2.7.17 now available on Heroku 18 and 16.

-# 158 (2019-10-21)
+## v158 (2019-10-21)

 - Python 3.7.5 and 3.8.0 now available on Heroku 18 and 16.
 - Add support for Python 3.8 branch
@@ -100,11 +132,11 @@
  - Test Improvements
 - Add support for staging binary testing

-# 157 (2019-09-18)
+## v157 (2019-09-18)

 - Typo fixes

-# 156 (2019-09-12)
+## v156 (2019-09-12)

 - Python 3.6.9 and 3.7.4 now available.

@@ -112,125 +144,125 @@
 - Build utility and documentation updates
 - Bump Hatchet tests to point at new default python version.

-# 155 (2019-08-22)
+## v155 (2019-08-22)

 add docs and make target for heroku-18 bob builds

-# 154 (2019-07-17)
+## v154 (2019-07-17)

 Fix python 3.5.7 formula actually building 3.7.2

-# 153 (2019-06-21)
+## v153 (2019-06-21)

 Hotfix for broken heroku-16 deploys

-# 152 (2019-04-04)
+## v152 (2019-04-04)

 Python 3.7.3 now available.

-# 151 (2019-03-21)
+## v151 (2019-03-21)

 Python 3.5.7 and 3.4.10 now available on all Heroku stacks.

-# 150 (2019-03-13)
+## v150 (2019-03-13)

 Python 2.7.16 now available on all Heroku stacks.

-# 149 (2019-03-04)
+## v149 (2019-03-04)

 Hotfix for broken Cedar 14 deploys

-# 148 (2019-02-21)
+## v148 (2019-02-21)

 No user facing changes, improving internal metrics

-# 147 (2019-02-07)
+## v147 (2019-02-07)

 Python 3.7.2 and 3.6.8 now available on all Heroku stacks.

-# 146 (2018-11-11)
+## v146 (2018-11-11)

 Python 3.7.1, 3.6.7, 3.5.6 and 3.4.9 now available on all Heroku stacks.

-# 145 (2018-11-08)
+## v145 (2018-11-08)

 Testing and tooling expanded to better support new runtimes

-# 144 (2018-10-10)
+## v144 (2018-10-10)

 Switch to cautious upgrade for Pipenv install to ensure the pinned pip version
 is used with Pipenv

-# 143 (2018-10-09)
+## v143 (2018-10-09)

-Add support for detecting SLUGIFY_USES_TEXT_UNIDECODE, which is required to
+Add support for detecting `SLUGIFY_USES_TEXT_UNIDECODE`, which is required to
 install Apache Airflow version 1.10 or higher.

-# 142 (2018-10-08)
+## v142 (2018-10-08)

 Improvements to Python install messaging

-# 139, 140, 141
+## v139, 140, 141

 No user-facing changes, documenting for version clarity

-# 138 (2018-08-01)
+## v138 (2018-08-01)

 Use stack image SQLite3 instead of vendoring

-# 137 (2018-07-17)
+## v137 (2018-07-17)

 Prevent 3.7.0 from appearing as unsupported in buildpack messaging.

-# 136 (2018-06-28)
+## v136 (2018-06-28)

 Upgrade to 3.6.6 and support 3.7.0 on all runtimes.

-# 135 (2018-05-29)
+## v135 (2018-05-29)

 Upgrade Pipenv to v2018.5.18.

-# 134 (2018-05-02)
+## v134 (2018-05-02)

 Default to 3.6.5, bugfixes.

-# 133
+## v133

 Fixes for Pip 10 release.

-# 132
+## v132

 Improve pip installation, with the release of v9.0.2.

-# 131
+## v131

 Fix bug with pip.

-# 130
+## v130

 Better upgrade strategy for pip.

-# 129
+## v129

 Don't upgrade pip (from v128).

-# 128
+## v128

 Upgrade pip, pin to Pipenv v11.8.2.

-# 127
+## v127

 Pin to Pipenv v11.7.1.

-# 126
+## v126

 Bugfixes.

-# 125
+## v125

 Bugfixes.

-# 124
+## v124

 Update buildpack to automatically install `[dev-packages]` during Heroku CI Pipenv builds.

@@ -239,101 +271,101 @@ Update buildpack to automatically install `[dev-packages]` during Heroku CI Pipe
 - No longer warn if there is no `Procfile`.
 - Update Pipenv's "3.6" runtime specifier to point to "3.6.4".

-# 123
+## v123

 Update gunicorn `init.d` script to allow overrides.

-# 122
+## v122

 Update default Python to v3.6.4.

-# 121
+## v121

 Update default Python to v3.6.3.

-# 120
+## v120

 Use `$ pipenv --deploy`.

-# 119
+## v119

 Improvements to Pipenv support, warning on unsupported Python versions.

 - We now warn when a user is not using latest 2.x or 3.x Python.
 - Heroku now supports `[requires]` `python_full_version` in addition to `python_version`.

-# 118
+## v118

 Improvements to Pipenv support.

-# 117
+## v117

 Bug fix.

-# 116
+## v116

 Vendoring improvements.

 - Geos libraries should work on Heroku-16 now.
 - The libffi/libmemcached vendoring step is now skipped on Heroku-16 (since they are installed in the base image).

-# 115
+## v115

 Revert a pull request.

 - No longer using `sub_env` for `pip install` step.

-# 114
+## v114

 - Bugfixes.

 Blacklisting `PYTHONHOME` and `PYTHONPATH` for older apps. Upgrades to nltk support.

-# 113
+## v113

 Updates to Pipenv support.

-# 112
+## v112

 Bugfix.

 - Fixed grep output bug.

-# 111
+## v111

 Linting, bugfixes.

-# 110
+## v110

 Update default Python to 3.6.2.

-# 109
+## v109

 Update Default Python to 3.6.1, bugfixes.

 - Fixed automatic pip uninstall of dependencies removed from requirements.txt.

-# 108
+## v108

 Fix output for collectstatic step.

-# 107
+## v107

 Bugfix for C dependency installation.

-# 106
+## v106

- Don't install packages that could mess up packaging.
+Don't install packages that could mess up packaging.

 - The Python buildpack will automatically remove `six`, `pyparsing`, `appdirs`,
   `setuptools`, and `distribute` from a `requirements.txt` file now, as these
   packages are provided by the Python buildpack.

- # 105
+## v105

- Improvements to output messaging.
+Improvements to output messaging.

-# 104
+## v104

 General improvements.

@@ -343,52 +375,52 @@ General improvements.

 [395]: https://github.com/heroku/heroku-buildpack-python/pull/395

-## 103
+## v103

 Bug fixes and improvements.

 - Fix for Pipenv.
 - Fix for Heroku CI.
- Improve handling of WEB_CONCURRENCY when using multiple buildpacks.
- Adjust environment variables set during the build to more closely match those in the dyno environment (DYNO is now available, STACK is not).
+- Improve handling of `WEB_CONCURRENCY` when using multiple buildpacks.
+- Adjust environment variables set during the build to more closely match those in the dyno environment (`DYNO` is now available, `STACK` is not).
 - Restore the build cache prior to running bin/pre_compile.

-## 102
+## v102

 Buildpack code cleanup.

 - Improved messaging around NLTK.

-## 101
+## v101

 Updated setuptools installation method.

 - Improved pipenv support.

-## 100
+## v100

 Preliminary pipenv support.

-## 99
+## v99

 Cleanup.

-## 98
+## v98

 Official NLTK support and other improvements.

 - Support for `nltk.txt` file for declaring corpora to be downloaded.
- Leading zeros for auto-set WEB_CONCURRENCY.
+- Leading zeros for auto-set `WEB_CONCURRENCY`.

-## 97
+## v97

 Improved egg-link functionality.

-## 96
+## v96

 Bugfix.

-## 95
+## v95

 Improved output support.

@@ -424,7 +456,7 @@ Fixed bug with editable pip installations.

 Updated default Python 2.7.13.

- Python 2.7.13 uses UCS-4 build, more compatibile with linux wheels.
+- Python 2.7.13 uses UCS-4 build, more compatible with linux wheels.
 - Updated setuptools to v32.1.0.

 ## v86
@@ -450,7 +482,7 @@ Support for Heroku CI.

 ## v82 (2016-08-22)

-Update to library detection mechnisms (pip-pop).
+Update to library detection mechanisms (pip-pop).

 - Updated setuptools to v25.5.0

@@ -524,7 +556,7 @@ Revert to v66.

 ## v68 (2015-10-12)

-Fixed .heroku/venv error with modern apps.
+Fixed `.heroku/venv` error with modern apps.

 ## v67 (2015-10-12)

@@ -549,7 +581,6 @@ Updated Pip and Setuptools.
 - Setuptools updated to v18.3.2
 - Pip updated to v7.1.2

-
 ## v62 (2015-08-07)

 Updated Pip and Setuptools.
@@ -1,68 +1,50 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (6.0.3.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
    erubis (2.7.0)
-    excon (0.73.0)
-    heroics (0.0.25)
+    excon (0.76.0)
+    heroics (0.1.1)
      erubis (~> 2.0)
      excon
      moneta
      multi_json (>= 1.9.2)
-    heroku_hatchet (5.0.3)
+    heroku_hatchet (7.2.0)
      excon (~> 0)
-      minitest-retry (~> 0.1.9)
-      platform-api (~> 2)
-      repl_runner (~> 0.0.3)
+      platform-api (~> 3)
      rrrretry (~> 1)
      thor (~> 0)
      threaded (~> 0)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
-    minitest-retry (0.1.9)
-      minitest (>= 5.0)
    moneta (1.0.0)
-    multi_json (1.14.1)
-    parallel (1.19.1)
-    parallel_split_test (0.7.0)
+    multi_json (1.15.0)
+    parallel (1.19.2)
+    parallel_split_test (0.8.0)
      parallel (>= 0.5.13)
      rspec (>= 3.1.0)
-    platform-api (2.2.0)
-      heroics (~> 0.0.25)
+    platform-api (3.0.0)
+      heroics (~> 0.1.1)
      moneta (~> 1.0.0)
-    rake (12.3.3)
-    repl_runner (0.0.3)
-      activesupport
+      rate_throttle_client (~> 0.1.0)
+    rake (13.0.1)
+    rate_throttle_client (0.1.2)
    rrrretry (1.0.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-retry (0.6.1)
+      rspec-support (~> 3.9.0)
+    rspec-retry (0.6.2)
      rspec-core (> 3.3)
-    rspec-support (3.8.0)
+    rspec-support (3.9.3)
    thor (0.20.3)
-    thread_safe (0.3.6)
    threaded (0.0.4)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.3.0)

 PLATFORMS
  ruby
@@ -2,7 +2,7 @@

 # Heroku Buildpack: Python

-[![Build Status](https://travis-ci.org/heroku/heroku-buildpack-python.svg?branch=master)](https://travis-ci.org/heroku/heroku-buildpack-python)
+[![Build Status](https://travis-ci.com/heroku/heroku-buildpack-python.svg?branch=main)](https://travis-ci.com/heroku/heroku-buildpack-python)

 This is the official [Heroku buildpack](https://devcenter.heroku.com/articles/buildpacks) for Python apps.

@@ -16,7 +16,7 @@ See it in Action
 $ ls
 my-application		requirements.txt	runtime.txt

-$ git push heroku master
+$ git push heroku main
 Counting objects: 4, done.
 Delta compression using up to 8 threads.
 Compressing objects: 100% (2/2), done.
@@ -26,7 +26,7 @@ remote: Compressing source files... done.
 remote: Building source:
 remote:
 remote: -----> Python app detected
-remote: -----> Installing python-3.7.4
+remote: -----> Installing python
 remote: -----> Installing pip
 remote: -----> Installing SQLite3
 remote: -----> Installing requirements with pip
@@ -44,7 +44,7 @@ A `requirements.txt` must be present at the root of your application's repositor

 To specify your python version, you also need a `runtime.txt` file - unless you are using the default Python runtime version.

-Current default Python Runtime: Python 3.6.9
+Current default Python Runtime: Python 3.6.12

 Alternatively, you can provide a `setup.py` file, or a `Pipfile`.
 Using `pipenv` will generate `runtime.txt` at build time if one of the field `python_version` or `python_full_version` is specified in the `requires` section of your `Pipfile`.
@@ -62,9 +62,9 @@ Specify a Python Runtime

 Supported runtime options include:

- `python-3.8.5`
- `python-3.7.8`
- `python-3.6.11`
+- `python-3.8.6`
+- `python-3.7.9`
+- `python-3.6.12`
 - `python-2.7.18`

 ## Tests
@@ -137,6 +137,10 @@ export LIBRARY_PATH=/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LIBRARY_PAT
 export LD_LIBRARY_PATH=/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LD_LIBRARY_PATH
 export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:/app/.heroku/python/lib/pkg-config:$PKG_CONFIG_PATH

+# Global pip options (https://pip.pypa.io/en/stable/user_guide/#environment-variables).
+# Disable pip's warnings about EOL Python since we show our own.
+export PIP_NO_PYTHON_VERSION_WARNING=1
+
 # The Application Code
 # --------------------

@@ -185,7 +189,7 @@ source "$BIN_DIR/steps/hooks/pre_compile"
 # continue to use that version of Python in perpituity (warnings will be raised if
 # they are out–of–date).
 if [ -f "$CACHE_DIR/.heroku/python-version" ]; then
-  DEFAULT_PYTHON_VERSION=$(cat "$CACHE_DIR/.heroku/python-version")
+  CACHED_PYTHON_VERSION=$(cat "$CACHE_DIR/.heroku/python-version")
 fi

 # We didn't always record the stack version. This code is in place because of that.
@@ -202,9 +206,14 @@ fi
 # shellcheck source=bin/steps/pipenv-python-version
 source "$BIN_DIR/steps/pipenv-python-version"

-# If no runtime was provided by the user, assume the default Python runtime version.
-if [ ! -f runtime.txt ]; then
-  echo "$DEFAULT_PYTHON_VERSION" > runtime.txt
+if [[ -f runtime.txt ]]; then
+  mcount "version.reason.python.specified"
+elif [[ -n "${CACHED_PYTHON_VERSION:-}" ]]; then
+  mcount "version.reason.python.cached"
+  echo "${CACHED_PYTHON_VERSION}" > runtime.txt
+else
+  mcount "version.reason.python.default"
+  echo "${DEFAULT_PYTHON_VERSION}" > runtime.txt
 fi

 # Create the directory for .profile.d, if it doesn't exist.
@@ -5,12 +5,12 @@
 # the env vars to subprocesses.
 # shellcheck disable=2034

-DEFAULT_PYTHON_VERSION="python-3.6.11"
-LATEST_38="python-3.8.5"
-LATEST_37="python-3.7.8"
-LATEST_36="python-3.6.11"
-LATEST_35="python-3.5.9"
+DEFAULT_PYTHON_VERSION="python-3.6.12"
+LATEST_38="python-3.8.6"
+LATEST_37="python-3.7.9"
+LATEST_36="python-3.6.12"
+LATEST_35="python-3.5.10"
 LATEST_34="python-3.4.10"
 LATEST_27="python-2.7.18"
-PYPY_36="pypy3.6-7.3.1"
-PYPY_27="pypy2.7-7.3.1"
+LATEST_PYPY_36="pypy3.6-7.3.1"
+LATEST_PYPY_27="pypy2.7-7.3.1"
@@ -9,10 +9,7 @@ set -e
 if [[ -f Pipfile.lock ]]; then
    if [[ -f .heroku/python/Pipfile.lock.sha256 ]]; then
        if [[ $(openssl dgst -sha256 Pipfile.lock) == $(cat .heroku/python/Pipfile.lock.sha256) ]]; then
-            # Measure that we're using Pipenv.
-            mcount "tool.pipenv"
-
-            # Don't skip installation of there are git deps.
+            # Don't skip installation if there are git deps.
            if ! grep -q 'git' Pipfile.lock; then
                echo "Skipping installation, as Pipfile.lock hasn't changed since last deploy." | indent

@@ -8,6 +8,7 @@ PYTHON_VERSION=$(cat runtime.txt)
 VENDORED_PYTHON="${VENDOR_URL}/runtimes/$PYTHON_VERSION.tar.gz"

 SECURITY_UPDATE="Python has released a security update! Please consider upgrading to"
+SECURITY_UPDATE_PYPY="The PyPy project has released a security update! Please consider upgrading to"

 ONLY_SUPPORTED_2_VERSION="Only the latest version of Python 2 is supported on the platform. Please consider upgrading to"

@@ -51,11 +52,9 @@ if curl --output /dev/null --silent --head --fail "$VENDORED_PYTHON"; then
    fi
  fi
  if [[ "$PYTHON_VERSION" == $PY27* ]]; then
+    puts-warn "$PYTHON_2_EOL_UPDATE"
+    echo "       Learn More: https://devcenter.heroku.com/articles/python-2-7-eol-faq"
    # security update note
-    if [[ "$(date "+%Y")" -gt "2019" ]]; then
-      puts-warn "$PYTHON_2_EOL_UPDATE"
-      echo "       Learn More: https://devcenter.heroku.com/articles/python-2-7-eol-faq"
-    fi
    if [ "$PYTHON_VERSION" != "$LATEST_27" ]; then
      puts-warn "$ONLY_SUPPORTED_2_VERSION" "$LATEST_27"
      echo "       Learn More: https://devcenter.heroku.com/articles/python-runtimes"
@@ -63,15 +62,15 @@ if curl --output /dev/null --silent --head --fail "$VENDORED_PYTHON"; then
  fi
  if [[ "$PYTHON_VERSION" == $PYPY27* ]]; then
    # security update note
-    if [ "$PYTHON_VERSION" != "$PYPY_27" ]; then
-      puts-warn "Could not find that Pypy version. Did you mean" "${PYPY_27}?"
+    if [ "$PYTHON_VERSION" != "$LATEST_PYPY_27" ]; then
+      puts-warn "$SECURITY_UPDATE_PYPY" "$LATEST_PYPY_27"
      echo "       Learn More: https://devcenter.heroku.com/articles/python-runtimes"
    fi
  fi
  if [[ "$PYTHON_VERSION" == $PYPY36* ]]; then
    # security update note
-    if [ "$PYTHON_VERSION" != "$PYPY_36" ]; then
-      puts-warn "Could not find that Pypy version. Did you mean" "${PYPY_36}?"
+    if [ "$PYTHON_VERSION" != "$LATEST_PYPY_36" ]; then
+      puts-warn "$SECURITY_UPDATE_PYPY" "$LATEST_PYPY_36"
      echo "       Learn More: https://devcenter.heroku.com/articles/python-runtimes"
    fi
  fi
@@ -81,6 +80,8 @@ else
  exit 1
 fi

+mcount "version.python.${PYTHON_VERSION}"
+
 if [[ "$STACK" != "$CACHED_PYTHON_STACK" ]]; then
    puts-step "Stack has changed from $CACHED_PYTHON_STACK to $STACK, clearing cache"
    rm -fr .heroku/python-stack .heroku/python-version .heroku/python .heroku/vendor .heroku/python .heroku/python-sqlite3-version
@@ -120,8 +121,6 @@ if [ ! "$SKIP_INSTALL" ]; then
    # Prepare destination directory.
    mkdir -p .heroku/python

-    mcount "version.python.$PYTHON_VERSION"
-
    if ! curl "${VENDORED_PYTHON}" -s | tar zxv -C .heroku/python &> /dev/null; then
      puts-warn "Requested runtime ($PYTHON_VERSION) is not available for this stack ($STACK)."
      puts-warn "Aborting.  More info: https://devcenter.heroku.com/articles/python-support"
@@ -137,14 +136,20 @@ fi

 set -e

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

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

 # We don't use get-pip.py, since:
@@ -1,27 +1,4 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/python/

-OUT_PREFIX=$1
-BIN_DIR="$(cd "$(dirname "$0")"/../.. || exit; pwd)/bin"
-export BIN_DIR
-
-# shellcheck source=bin/utils
-source "$BIN_DIR/steps/sqlite3"
-
-sqlite3_version
-echo "Setting up SQLite3 Headers for $SQLITE3_VERSION"
-sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1
-
-echo "Building Python…"
-SOURCE_TARBALL='https://python.org/ftp/python/2.7.17/Python-2.7.17.tgz'
-curl -L $SOURCE_TARBALL | tar xz
-mv Python-2.7.17 src
-cd src
-
-./configure --prefix=$OUT_PREFIX  --enable-unicode=ucs4 --with-ensurepip=no
-make
-make install
-
-# Remove unneeded test directories, similar to the official Docker Python images:
-# https://github.com/docker-library/python
-find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' +
+source $(dirname $0)/python2
@@ -1,27 +1,4 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/python/

-OUT_PREFIX=$1
-BIN_DIR="$(cd "$(dirname "$0")"/../.. || exit; pwd)/bin"
-export BIN_DIR
-
-# shellcheck source=bin/utils
-source "$BIN_DIR/steps/sqlite3"
-
-sqlite3_version
-echo "Setting up SQLite3 Headers for $SQLITE3_VERSION"
-sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1
-
-echo "Building Python…"
-SOURCE_TARBALL='https://python.org/ftp/python/2.7.18/Python-2.7.18.tgz'
-curl -L $SOURCE_TARBALL | tar xz
-mv Python-2.7.18 src
-cd src
-
-./configure --prefix=$OUT_PREFIX  --enable-unicode=ucs4 --with-ensurepip=no
-make
-make install
-
-# Remove unneeded test directories, similar to the official Docker Python images:
-# https://github.com/docker-library/python
-find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' +
+source $(dirname $0)/python2
@@ -1,32 +1,4 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/python/

-OUT_PREFIX=$1
-BIN_DIR="$(cd "$(dirname "$0")"/../.. || exit; pwd)/bin"
-export BIN_DIR
-
-# shellcheck source=bin/utils
-source "$BIN_DIR/steps/sqlite3"
-
-sqlite3_version
-echo "Setting up SQLite3 Headers for $SQLITE3_VERSION"
-sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1
-
-echo "Building Python…"
-SOURCE_TARBALL='https://python.org/ftp/python/3.7.2/Python-3.7.2.tgz'
-curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.7.2 src
-cd src
-
-./configure --prefix=$OUT_PREFIX --with-ensurepip=no
-make
-make install
-
-# Remove unneeded test directories, similar to the official Docker Python images:
-# https://github.com/docker-library/python
-find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' +
-
-# Remove spare /
-LOCATION=${OUT_PREFIX%?}
-
-ln $LOCATION/bin/python3 $LOCATION/bin/python
+source $(dirname $0)/python3
@@ -1,32 +1,4 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/python/

-OUT_PREFIX=$1
-BIN_DIR="$(cd "$(dirname "$0")"/../.. || exit; pwd)/bin"
-export BIN_DIR
-
-# shellcheck source=bin/utils
-source "$BIN_DIR/steps/sqlite3"
-
-sqlite3_version
-echo "Setting up SQLite3 Headers for $SQLITE3_VERSION"
-sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1
-
-echo "Building Python…"
-SOURCE_TARBALL='https://python.org/ftp/python/3.4.9/Python-3.4.9.tgz'
-curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.4.9 src
-cd src
-
-./configure --prefix=$OUT_PREFIX --with-ensurepip=no
-make
-make install
-
-# Remove unneeded test directories, similar to the official Docker Python images:
-# https://github.com/docker-library/python
-find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' +
-
-# Remove spare /
-LOCATION=${OUT_PREFIX%?}
-
-ln $LOCATION/bin/python3 $LOCATION/bin/python
+source $(dirname $0)/python3
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+
+source $(dirname $0)/python3
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+
+source $(dirname $0)/python3
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+
+source $(dirname $0)/python3
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+
+source $(dirname $0)/python3
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-sudo apt-get -qq update
-sudo apt-get install software-properties-common
-curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 30 https://cli-assets.heroku.com/install-ubuntu.sh | sh
@@ -14,9 +14,9 @@ case "$choice" in
  * ) exit 1;;
 esac

-originMaster=$(git rev-parse origin/master)
-echo "Tagging commit $originMaster with $newVersion... "
-git tag "$newVersion" "${originMaster:?}"
+originMain=$(git rev-parse origin/main)
+echo "Tagging commit $originMain with $newVersion... "
+git tag "$newVersion" "${originMain:?}"
 git push origin refs/tags/$newVersion

 heroku buildpacks:publish "$BP_NAME" "$newVersion"
@@ -31,7 +31,7 @@ if [ $(git tag | grep -q latest-version) ]; then
    echo "Updating latest-version tag"
    git tag -d latest-version
    git push origin :latest-version
-    git tag latest-version "${originMaster:?}"
+    git tag latest-version "${originMain:?}"
    git push --tags
 fi

@@ -1,5 +1,5 @@
 ---
 - - "./repos/python/python-getting-started"
-  - master
+  - main
 - - "./repos/python/python_default"
  - ca947f69027b2a30be5d26f9a42f25e54f4d7a1a
@@ -1,3 +1,3 @@
 docopt==0.6.2
-bob-builder==0.0.17
-boto==2.48.0
+bob-builder==0.0.18
+boto==2.49.0
@@ -1 +1 @@
-pypy2.7-7.2.0
+pypy2.7-7.3.1
@@ -0,0 +1 @@
+pypy2.7-7.2.0
@@ -1 +1 @@
-pypy3.6-7.2.0
+pypy3.6-7.3.1
@@ -0,0 +1 @@
+pypy3.6-7.2.0
@@ -1 +0,0 @@
-requests
@@ -1 +0,0 @@
-python-2.7.99
@@ -1 +0,0 @@
-flask
@@ -1 +0,0 @@
-python-3.4.99
@@ -1 +1 @@
-python-3.5.9
+python-3.5.10
@@ -1 +0,0 @@
-flask
@@ -1 +0,0 @@
-python-3.5.99
@@ -1 +0,0 @@
-flask
@@ -1 +0,0 @@
-python-3.6.99
@@ -1 +0,0 @@
-flask
@@ -1 +0,0 @@
-python-3.7.99
@@ -1 +0,0 @@
-flask
@@ -44,7 +44,7 @@ testStandardRequirements() {

 testPipenv() {
  compile "pipenv"
-  assertCaptured "Installing pip 9.0.2, setuptools 39.0.1 and wheel 0.34.2"
+  assertCaptured "Installing pip 9.0.2, setuptools 47.1.1 and wheel 0.34.2"
  assertCapturedSuccess
 }

@@ -108,6 +108,7 @@ testHooks() {
    LIBRARY_PATH
    OLDPWD
    PATH
+    PIP_NO_PYTHON_VERSION_WARNING
    PKG_CONFIG_PATH
    PROFILE_PATH
    PWD
@@ -9,7 +9,7 @@ testPythonDefault() {
  compile "pythonDefault"
  assertCaptured $DEFAULT_PYTHON_VERSION
  assertNotCaptured "security update"
-  assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
+  assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2"
  assertCaptured "Installing SQLite3"
  assertCapturedSuccess
 }
@@ -19,13 +19,9 @@ testPython2() {
    echo $LATEST_27 > "runtime.txt"
    compile "python2"
    assertCaptured $LATEST_27
-    if [[ $(date "+%Y") > "2019" ]]; then
-      assertCaptured "python-2-7-eol-faq";
-    else
-      assertNotCaptured "python-2-7-eol-faq";
-    fi
+    assertCaptured "python-2-7-eol-faq";
    assertNotCaptured "security update"
-    assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
+    assertCaptured "Installing pip 20.1.1, setuptools 44.1.1 and wheel 0.34.2"
    assertCaptured "Installing SQLite3"
    assertCapturedSuccess
 }
@@ -33,63 +29,32 @@ testPython2() {
 testPython2_warn() {
    compile "python2_warn"
    assertCaptured "python-2.7.15"
-    if [[ $(date "+%Y") > "2019" ]]; then
-      assertCaptured "python-2-7-eol-faq";
-    else
-      assertNotCaptured "python-2-7-eol-faq";
-    fi
+    assertCaptured "python-2-7-eol-faq";
    assertCaptured "Only the latest version"
    assertCaptured "Installing SQLite3"
    assertCapturedSuccess
 }

-testPython2_fail() {
-    compile "python2_fail"
-    assertCaptured "Aborting"
-    assertCapturedError
-}
-
 testPython3_4() {
  compile "python3_4"
  assertCaptured $LATEST_34
  assertNotCaptured "security update"
-  assertCaptured "Installing pip 19.1.1, setuptools 39.0.1 and wheel 0.33.6"
-  # if cedar 14 and legacy binaries, fail. if cedar 14 and staging, succeed.
-  if [[ ! -n $USE_STAGING_BINARIES ]] && [[ $STACK == "cedar-14" ]]; then
-      assertCapturedError
-# if heroku 18 and legacy binaries, succeed. if heroku 18 and staging, fail.
-  elif [[ -n $USE_STAGING_BINARIES ]] && [[ $STACK == "heroku-18" ]]; then
-      assertCapturedError
-  else
-#   all else succeed
-    assertCapturedSuccess
-  fi
+  assertCaptured "Installing pip 19.1.1, setuptools 43.0.0 and wheel 0.33.6"
+  assertCapturedSuccess
 }

 testPython3_4_warn() {
  compile "python3_4_warn"
  assertCaptured "python-3.4.9"
  assertCaptured "security update!"
-# if heroku 18 and legacy binaries, succeed. if heroku 18 and staging, fail.
-  if [[ -n $USE_STAGING_BINARIES ]] && [[ $STACK == "heroku-18" ]]; then
-      assertCapturedError
-  else
-#   all else succeed
-    assertCapturedSuccess
-  fi
-}
-
-testPython3_4_fail() {
-    compile "python3_4_fail"
-    assertCaptured "Aborting"
-    assertCapturedError
+  assertCapturedSuccess
 }

 testPython3_5() {
  compile "python3_5"
  assertCaptured $LATEST_35
  assertNotCaptured "security update"
-  assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
+  assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2"
  assertCaptured "Installing SQLite3"
  assertCapturedSuccess
 }
@@ -101,18 +66,12 @@ testPython3_5_warn() {
  assertCapturedSuccess
 }

-testPython3_5_fail() {
-    compile "python3_5_fail"
-    assertCaptured "Aborting"
-    assertCapturedError
-}
-
 testPython3_6() {
  updateVersion "python3_6" $LATEST_36
  compile "python3_6"
  assertCaptured $LATEST_36
  assertNotCaptured "security update"
-  assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
+  assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2"
  assertCaptured "Installing SQLite3"
  assertCapturedSuccess
 }
@@ -125,12 +84,6 @@ testPython3_6_warn() {
  assertCapturedSuccess
 }

-testPython3_6_fail() {
-    compile "python3_6_fail"
-    assertCaptured "Aborting"
-    assertCapturedError
-}
-
 testPython3_7() {
  updateVersion "python3_7" $LATEST_37
  compile "python3_7"
@@ -139,7 +92,7 @@ testPython3_7() {
  else
    assertNotCaptured "security update"
    assertCaptured $LATEST_37
-    assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
+    assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2"
    assertCaptured "Installing SQLite3"
    assertCapturedSuccess
  fi
@@ -157,13 +110,21 @@ testPython3_7_warn() {
  fi
 }

-testPython3_7_fail() {
-  compile "python3_7_fail"
-  assertCaptured "Aborting"
-  assertCapturedError
+testPython3_8() {
+  updateVersion "python3_8" $LATEST_38
+  compile "python3_8"
+  if [[ $STACK = "cedar-14" ]]; then
+    assertCapturedError
+  else
+    assertNotCaptured "security update"
+    assertCaptured $LATEST_38
+    assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2"
+    assertCaptured "Installing SQLite3"
+    assertCapturedSuccess
+  fi
 }

-testPython3_7_warn() {
+testPython3_8_warn() {
  compile "python3_8_warn"
  if [[ $STACK = "cedar-14" ]]; then
    assertCapturedError
@@ -175,50 +136,79 @@ testPython3_7_warn() {
  fi
 }

-testPython3_8() {
-  updateVersion "python3_8" $LATEST_38
-  compile "python3_8"
-  if [[ $STACK = "cedar-14" ]]; then
-    assertCapturedError
-  else
-    assertNotCaptured "security update"
-    assertCaptured $LATEST_38
-    assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
-    assertCaptured "Installing SQLite3"
-    assertCapturedSuccess
-  fi
-}
-
-testPython3_8_fail() {
-  compile "python3_8_fail"
+testPythonVersionInvalid() {
+  compile "python_version_invalid"
+  assertCaptured "Requested runtime (python-3.8.99) is not available for this stack"
  assertCaptured "Aborting"
  assertCapturedError
 }

 testPypy3_6() {
  compile "pypy3_6"
+  assertCaptured "Installing pypy"
+  assertNotCaptured "security update"
+  assertCaptured "$LATEST_PYPY_36"
+  assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2"
+  assertCapturedSuccess
+}
+
+testPypy3_6_warn() {
+  compile "pypy3_6_warn"
  if [[ $STACK = "cedar-14" ]]; then
    assertCapturedError
  else
    assertCaptured "Installing pypy"
-    assertCaptured "$PYPY_36"
-    assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
+    assertCaptured "security update!"
+    assertCaptured "$LATEST_PYPY_36"
    assertCapturedSuccess
  fi
 }

 testPypy2_7() {
  compile "pypy2_7"
+  assertCaptured "Installing pypy"
+  assertNotCaptured "security update"
+  assertCaptured "$LATEST_PYPY_27"
+  assertCaptured "Installing pip 20.1.1, setuptools 44.1.1 and wheel 0.34.2"
+  assertCapturedSuccess
+}
+
+testPypy2_7_warn() {
+  compile "pypy2_7_warn"
  if [[ $STACK = "cedar-14" ]]; then
    assertCapturedError
  else
    assertCaptured "Installing pypy"
-    assertCaptured "$PYPY_27"
-    assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
+    assertCaptured "security update!"
+    assertCaptured "$LATEST_PYPY_27"
    assertCapturedSuccess
  fi
 }

+testStickyPythonVersion() {
+  local cache_dir="$(mktmpdir)"
+  compile "python3_6_warn" "$cache_dir"
+  assertCaptured "Installing python-3.6.7"
+  assertCapturedSuccess
+  compile "no-runtime-txt" "$cache_dir"
+  assertCaptured "Installing python-3.6.7"
+  assertCapturedSuccess
+  # Whilst this file seems like an implementation detail (so something that should
+  # not be tested), we must guarantee the filename remains consistent for backwards
+  # compatibility across buildpack versions for already-built apps.
+  assertFile "python-3.6.7" ".heroku/python-version"
+}
+
+testPythonVersionChange() {
+  local cache_dir="$(mktmpdir)"
+  compile "python3_6_warn" "$cache_dir"
+  assertCaptured "Installing python-3.6.7"
+  assertCapturedSuccess
+  compile "python3_6" "$cache_dir"
+  assertCaptured "Found python-3.6.7, removing"
+  assertCapturedSuccess
+}
+
 pushd $(dirname 0) >/dev/null
 popd >/dev/null

@@ -1,204 +0,0 @@
-#!/bin/sh
-
-# taken from
-# https://github.com/ryanbrainard/heroku-buildpack-testrunner/blob/master/lib/test_utils.sh
-
-oneTimeSetUp()
-{
-   TEST_SUITE_CACHE="$(mktemp -d ${SHUNIT_TMPDIR}/test_suite_cache.XXXX)"
-}
-
-oneTimeTearDown()
-{
-  rm -rf ${TEST_SUITE_CACHE}
-}
-
-setUp()
-{
-  OUTPUT_DIR="$(mktemp -d ${SHUNIT_TMPDIR}/output.XXXX)"
-  STD_OUT="${OUTPUT_DIR}/stdout"
-  STD_ERR="${OUTPUT_DIR}/stderr"
-  BUILD_DIR="${OUTPUT_DIR}/build"
-  CACHE_DIR="${OUTPUT_DIR}/cache"
-  mkdir -p ${OUTPUT_DIR}
-  mkdir -p ${BUILD_DIR}
-  mkdir -p ${CACHE_DIR}
-}
-
-tearDown()
-{
-  rm -rf ${OUTPUT_DIR}
-}
-
-capture()
-{
-  resetCapture
-
-  LAST_COMMAND="$@"
-
-  "$@" >${STD_OUT} 2>${STD_ERR}
-  RETURN=$?
-  rtrn=${RETURN} # deprecated
-}
-
-resetCapture()
-{
-  if [ -f ${STD_OUT} ]; then
-    rm ${STD_OUT}
-  fi
-
-  if [ -f ${STD_ERR} ]; then
-    rm ${STD_ERR}
-  fi
-
-  unset LAST_COMMAND
-  unset RETURN
-  unset rtrn # deprecated
-}
-
-detect()
-{
-  capture ${BUILDPACK_HOME}/bin/detect ${BUILD_DIR}
-}
-
-compile()
-{
-  capture ${BUILDPACK_HOME}/bin/compile ${BUILD_DIR} ${CACHE_DIR}
-}
-
-release()
-{
-  capture ${BUILDPACK_HOME}/bin/release ${BUILD_DIR}
-}
-
-assertCapturedEquals()
-{
-  assertEquals "$@" "$(cat ${STD_OUT})"
-}
-
-assertCapturedNotEquals()
-{
-  assertNotEquals "$@" "$(cat ${STD_OUT})"
-}
-
-assertCaptured()
-{
-  assertFileContains "$@" "${STD_OUT}"
-}
-
-assertNotCaptured()
-{
-  assertFileNotContains "$@" "${STD_OUT}"
-}
-
-assertCapturedSuccess()
-{
-  assertEquals "Expected captured exit code to be 0; was <${RETURN}>" "0" "${RETURN}"
-  assertEquals "Expected STD_ERR to be empty; was <$(cat ${STD_ERR})>" "" "$(cat ${STD_ERR})"
-}
-
-# assertCapturedError [[expectedErrorCode] expectedErrorMsg]
-assertCapturedError()
-{
-  if [ $# -gt 1 ]; then
-    expectedErrorCode=${1}
-    shift
-  fi
-
-  expectedErrorMsg=${1:-""}
-
-  if [ -z ${expectedErrorCode} ]; then
-    assertTrue "Expected captured exit code to be greater than 0; was <${RETURN}>" "[ ${RETURN} -gt 0 ]"
-  else
-    assertTrue "Expected captured exit code to be <${expectedErrorCode}>; was <${RETURN}>" "[ ${RETURN} -eq ${expectedErrorCode} ]"
-  fi
-
-  assertFileContains "Expected STD_OUT to contain error <${expectedErrorMsg}>" "${expectedErrorMsg}" "${STD_OUT}"
-  assertEquals       "STD_ERR should always be empty" "" "$(cat ${STD_ERR})"
-}
-
-assertAppDetected()
-{
-  expectedAppType=${1?"Must provide app type"}
-
-  assertCapturedSuccess
-  assertEquals "${expectedAppType}" "$(cat ${STD_OUT})"
-}
-
-assertNoAppDetected()
-{
-  assertEquals "1" "${RETURN}"
-  assertEquals "no" "$(cat ${STD_OUT})"
-  assertEquals "" "$(cat ${STD_ERR})"
-}
-
-_assertContains()
-{
-  if [ 5 -eq $# ]; then
-    msg=$1
-    shift
-  elif [ ! 4 -eq $# ]; then
-    fail "Expected 4 or 5 parameters; Receieved $# parameters"
-  fi
-
-  needle=$1
-  haystack=$2
-  expectation=$3
-  haystack_type=$4
-
-  case "${haystack_type}" in
-    "file") grep -q -F -e "${needle}" ${haystack} ;;
-    "text") echo "${haystack}" | grep -q -F -e "${needle}" ;;
-  esac
-
-  if [ "${expectation}" != "$?" ]; then
-    case "${expectation}" in
-      0) default_msg="Expected <${haystack}> to contain <${needle}>" ;;
-      1) default_msg="Did not expect <${haystack}> to contain <${needle}>" ;;
-    esac
-
-    fail "${msg:-${default_msg}}"
-  fi
-}
-
-assertContains()
-{
-  _assertContains "$@" 0 "text"
-}
-
-assertNotContains()
-{
-  _assertContains "$@" 1 "text"
-}
-
-assertFileContains()
-{
-  _assertContains "$@" 0 "file"
-}
-
-assertFileNotContains()
-{
-  _assertContains "$@" 1 "file"
-}
-
-command_exists () {
-    type "$1" > /dev/null 2>&1 ;
-}
-
-assertFileMD5()
-{
-  expectedHash=$1
-  filename=$2
-
-  if command_exists "md5sum"; then
-    md5_cmd="md5sum ${filename}"
-    expected_md5_cmd_output="${expectedHash}  ${filename}"
-  elif command_exists "md5"; then
-    md5_cmd="md5 ${filename}"
-    expected_md5_cmd_output="MD5 (${filename}) = ${expectedHash}"
-  else
-    fail "no suitable MD5 hashing command found on this system"
-  fi
-
-  assertEquals "${expected_md5_cmd_output}" "`${md5_cmd}`"
-}
Author	SHA1	Message	Date
Ed Morley	6c612a7fb1	Release v180 (#1078 ) Closes @W-8120452@.	2020-09-24 19:17:18 +01:00
Ed Morley	f91f4ee4ce	Add support for Python 3.8.6 (#1072 ) https://www.python.org/downloads/release/python-386/ https://pythoninsider.blogspot.com/2020/09/python-386-is-now-available.html Closes @W-7791243@.	2020-09-24 18:55:27 +01:00
Eric Carmichael	eea9a7fd0f	Fix code comment typo in bin/steps/pipenv (#1076 )	2020-09-23 14:49:46 +01:00
Ed Morley	215a3e3670	Release v179 (#1073 )	2020-09-23 11:15:54 +01:00
Ed Morley	4505968fcb	Tests: Remove redundant Python version tests (#1075 ) There were previously 6 virtually identical tests checking the handling of a non-existent Python version being specified in `runtime.txt`. Only one is necessary - removing the rest will improve CI run time. Closes @W-8110383@. [skip changelog]	2020-09-22 18:48:31 +01:00
Ed Morley	37d1474bee	Tests: Prevent shadowing of the Python 3.7 version warning test (#1074 ) Previously the test for Python 3.8 version warnings was named the same as an earlier test for Python 3.7, meaning the earlier test definition was overwritten and so never run. The later test has now been renamed to the correct version, and the test ordering adjusted for consistency with the rest of the file. Closes @W-8110123@. [skip changelog]	2020-09-22 18:04:11 +01:00
dependabot[bot]	40167d83f6	Bump heroku_hatchet from 7.1.3 to 7.2.0 (#1071 ) Bumps [heroku_hatchet](https://github.com/heroku/hatchet) from 7.1.3 to 7.2.0. - [Release notes](https://github.com/heroku/hatchet/releases) - [Changelog](https://github.com/heroku/hatchet/blob/main/CHANGELOG.md) - [Commits](https://github.com/heroku/hatchet/compare/v7.1.3...v7.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-21 12:41:14 +01:00
Ed Morley	64fb396b73	Remove duplicate pipenv metric event (#1070 ) Since the `tool.pipenv` event is being emitted twice per pipenv build, inflating its usage. This whole file could do with a massive refactor (4 levels deep of conditionals is never a good sign), but that can wait until a later PR. In the future it would also be great to have testing of metrics events. Closes @W-8094963@.	2020-09-18 19:04:28 +01:00
Ed Morley	eb6ee49dfe	Emit metrics for how the Python version was chosen (#1069 ) Currently an app's Python version can be set via a few different means: - explicitly by the user (via `runtime.txt` or `Pipfile.lock`) - implicitly via the sticky versions feature (for existing apps) - implicitly via default version for new apps / those with empty cache In order to determine the priority of features like automatic Python patch version upgrades for sticky-versioned apps, it's useful to have metrics for these. There were previously no tests for either the sticky versions feature, or changing the Python version by updating the `runtime.txt` file, so I've added some now (given that I updated the conditional to add the metrics, so useful to have coverage). I've also removed the confusing overwrite of `DEFAULT_PYTHON_VERSION` with the cached version, and kept them as two separate variables. Closes @W-8099632@. Closes @W-8099645@.	2020-09-18 18:48:57 +01:00
Ed Morley	64abfb2978	Emit Python version metric events for all builds (#1066 ) Previously the metric events describing the chosen Python version were only emitted when that Python version was installed, and not when it was being used from the build cache (the common case). Now the version is emitted for all builds, improving visibility into the distribution of Python usage, and helping determine the priority of features like opt-in automatic Python patch updates. Closes @W-8059668@.	2020-09-16 12:28:15 +01:00
Ed Morley	12d1cbb3be	Tests: Switch to branch 'main' of python-getting-started repo (#1065 ) Since the default branch for that repository has been changed from `master` to `main` in W-7903771. Closes @W-8047331@. [skip changelog]	2020-09-16 12:21:53 +01:00
dependabot[bot]	7817aa3fc3	Bump heroku_hatchet from 7.1.1 to 7.1.3 (#1064 ) Bumps [heroku_hatchet](https://github.com/heroku/hatchet) from 7.1.1 to 7.1.3. - [Release notes](https://github.com/heroku/hatchet/releases) - [Changelog](https://github.com/heroku/hatchet/blob/main/CHANGELOG.md) - [Commits](https://github.com/heroku/hatchet/compare/v7.1.1...v7.1.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-14 08:19:46 +01:00
Ed Morley	ae56342a81	Release v178 (#1063 )	2020-09-07 13:12:36 +01:00
Ed Morley	3e49aeb940	Add support for Python 3.5.10 (#1062 ) Since it was released over the weekend: https://www.python.org/downloads/release/python-3510/ https://docs.python.org/3.5/whatsnew/changelog.html#python-3-5-10 Closes @W-7835961@.	2020-09-07 13:01:09 +01:00
dependabot[bot]	a91a5427de	Bump heroku_hatchet from 7.1.0 to 7.1.1 (#1061 ) Bumps [heroku_hatchet](https://github.com/heroku/hatchet) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/heroku/hatchet/releases) - [Changelog](https://github.com/heroku/hatchet/blob/main/CHANGELOG.md) - [Commits](https://github.com/heroku/hatchet/compare/v7.1.0...v7.1.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-07 10:28:06 +01:00
dependabot[bot]	ab69658efb	Bump heroku_hatchet from 7.0.0 to 7.1.0 (#1057 ) Bumps [heroku_hatchet](https://github.com/heroku/hatchet) from 7.0.0 to 7.1.0. - [Release notes](https://github.com/heroku/hatchet/releases) - [Changelog](https://github.com/heroku/hatchet/blob/main/CHANGELOG.md) - [Commits](https://github.com/heroku/hatchet/compare/v7.0.0...v7.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> [skip changelog]	2020-08-24 10:24:16 +01:00
Ed Morley	dfbe8ddaf5	Release v177 (#1055 ) Closes @W-7975422@.	2020-08-18 12:50:17 +01:00
Ed Morley	60b9d1a562	Add support for Python 3.6.12 and 3.7.9 (#1054 ) Since they were released yesterday: https://www.python.org/downloads/release/python-3612/ https://www.python.org/downloads/release/python-379/ Closes @W-7975179@. Closes @W-7975181@.	2020-08-18 12:38:54 +01:00
Ed Morley	3fa3f15d35	Remove unnecessary date conditional for Python 2 EOL warning (#1053 ) Since we're past the end of 2019, so the conditional is always true. Closes @W-7952394@. [skip changelog]	2020-08-12 22:49:31 +01:00
Ed Morley	a510c47b26	Make etc/publish.sh executable (#1052 ) Since otherwise: ``` $ ./etc/publish.sh -bash: ./etc/publish.sh: Permission denied ``` Closes @W-7952258@. [skip changelog]	2020-08-12 22:48:59 +01:00
Ed Morley	1972e6094e	Travis: Switch to Ubuntu 20.04 base image (#1051 ) Since it's a smaller, more up to date image, with fewer services starting at boot, improving start times: https://blog.travis-ci.com/2020-08-10-focal-build-environment https://docs.travis-ci.com/user/reference/focal/ Closes @W-7951908@. [skip changelog]	2020-08-12 22:48:48 +01:00
Ed Morley	84ac34b1d4	Release v176 (#1050 )	2020-08-12 16:17:33 +01:00
Ed Morley	7c4f55bc32	Switch the remaining build formulas to the shared script approach (#1049 ) To be consistent with the other build formulas after #799. Refs @W-7947035@. [skip changelog]	2020-08-12 15:19:53 +01:00
Ed Morley	eabe71d578	Update the Python 3.4.10 build script to use the correct Python version (#1048 ) The existing Python 3.4.10 archive actually contained Python 3.7.2, since the version in the source URL was not updated when the file was created in #813. The build formula now uses the shared build script approach like all of the other build scripts, which ensures the version can never get out of sync (since it's extracted from the formula filename). The build for Heroku-18 failed to compile `_ssl` properly (even though the build exited zero) since Python 3.4.10 is old enough it doesn't work well with libssl1.1. Installing `libssl1.0-dev` in the build image locally resolved the issue - however we don't want to use that in the future for newer Python, so I've not updated the `heroku-18.Dockerfile`. In addition, with the rebuilt archives the tests now pass on Cedar-14, so no longer need to be marked as failing. Closes @W-7947035@.	2020-08-12 15:19:31 +01:00
Ed Morley	95fca53d38	Travis: Correctly skip Hatchet on PRs from forks (#1045 ) The Hatchet run requires a valid Heroku login, the credentials for which are set via Travis secure environment variables, which by design are not revealed to PRs from forks. The previous conditional wasn't working as intended - the Hatchet job was still being triggered for forks from PRs. The new conditional fixes this, and also means that forks could set their own credentials via Travis environment variables if they wanted a way to run the tests in CI on their own repo. See: https://docs.travis-ci.com/user/conditions-v1 Fixes #1019. Closes @W-7918482@. [skip changelog]	2020-08-12 11:17:38 +01:00
Ed Morley	ff4f677435	Travis: Remove Hatchet credentials from .travis.yml (#1047 ) Since they are now set via the Travis repository level secrets feature instead. This both works around the Travis bug seen in #1045, and also means its easier to set up Travis on forks, since otherwise the `.travis.yml` secrets would overwrite the global secrets. As part of this move the test account used has also been changed, and will be documented here: https://github.com/heroku/languages-team/blob/main/guides/create_test_users_for_ci.md#known-usernames Closes @W-7949880@. [skip changelog]	2020-08-12 10:49:57 +01:00
Ed Morley	cba3201ac2	Rename confusing PYPY_* variables (#1044 ) Since these variables refer to the latest version of PyPy, compared to the similarly named `PYPY27` and `PYPY36` variables (ie same name except without the underscore) which refer to the major/minor version only. The similar names caused me to use the wrong one locally whilst working on another PR, which was caught by tests but demonstrates why we should rename them. Closes @W-7935256@. [skip changelog]	2020-08-11 19:31:53 +01:00
Ed Morley	ac29db32f8	Remove unused vendor/test-utils (#1043 ) Since the unit tests instead use the utilities in this separate file: https://github.com/heroku/heroku-buildpack-python/blob/419ef479969c4d5945f2c0620292229ef464f4c8/test/utils A changelog entry has been added since whilst this file is for internal testing only, the buildpack's `vendor/` directory is put on `PATH`, so in theory it could have been called outside the buildpack (though this seems extremely unlikely since the script isn't very useful externally). Fixes #1027. Closes @W-7918496@.	2020-08-11 19:31:07 +01:00
Ed Morley	e83576f6b4	Remove unused .pre-commit-config.yaml (#1042 ) Since we don't use that tool (<https://pre-commit.com>), and there are better alternatives should we want to expand coverage of these kind of things. Closes @W-7923935@. [skip changelog]	2020-08-11 19:21:40 +01:00
Ed Morley	43600f25a5	Remove unused etc/ci-setup.sh (#1041 ) It stopped being used as of #781. ``` $ rg ci-setup.sh --stats 0 matches $ git-content-search ci-setup.sh `e7da63f` update to newer hatchet integration M .travis.yml `576def4` fix travis dependency blocker M .travis.yml $ git show `e7da63f` \| rg ci-setup.sh -C 1 -before_install: - - sudo bash etc/ci-setup.sh + - bundle exec hatchet ci:setup ``` Hatchet embeds its own setup script, which is called via the rake task: https://github.com/heroku/hatchet/blob/v6.0.0/etc/ci_setup.rb Closes @W-7923930@. [skip changelog]	2020-08-11 19:21:03 +01:00
Ed Morley	f508bd538d	Fix the security update version check message for PyPy (#1040 ) Previously if an app was using an older version of PyPy, the buildpack would show a confusing "Could not find that version" message (even though the version was found), when it really meant to warn about there being a newer release available. It looks like the version check messages were perhaps copied and pasted from something else, but the message wording not updated at the time. I've also added tests since there were none for this feature. Fixes #1004. Closes @W-7918745@.	2020-08-11 19:15:16 +01:00
Richard Schneeman	bc7e34dbad	Tests: Update Hatchet from 6.0.0 to 7.0.0 (#1046 ) - ActiveSupport's Object#blank? and Object#present? are no longer provided by default (https://github.com/heroku/hatchet/pull/107) - Remove deprecated support for passing a block to `App#run` (https://github.com/heroku/hatchet/pull/105) - Ignore 403 on app delete due to race condition (https://github.com/heroku/hatchet/pull/101) - The hatchet.lock file can now be locked to "main" in addition to "master" (https://github.com/heroku/hatchet/pull/86) - Allow concurrent one-off dyno runs with the `run_multi: true` flag on apps (https://github.com/heroku/hatchet/pull/94) - Apps are now marked as being "finished" by enabling maintenance mode on them when `teardown!` is called. Finished apps can be reaped immediately (https://github.com/heroku/hatchet/pull/97) - Applications that are not marked as "finished" will be allowed to live for a HATCHET_ALIVE_TTL_MINUTES duration before they're deleted by the reaper to protect against deleting an app mid-deploy, default is seven minutes (https://github.com/heroku/hatchet/pull/97) - The HEROKU_APP_LIMIT env var no longer does anything, instead hatchet application reaping is manually executed if an app cannot be created (https://github.com/heroku/hatchet/pull/97) - App#deploy without a block will no longer run `teardown!` automatically (https://github.com/heroku/hatchet/pull/97) - Calls to `git push heroku` are now rate throttled (https://github.com/heroku/hatchet/pull/98) - Calls to `app.run` are now rate throttled (https://github.com/heroku/hatchet/pull/99) - Deployment now raises and error when the release failed (https://github.com/heroku/hatchet/pull/93) [skip changelog]	2020-08-11 19:06:18 +01:00
dependabot[bot]	419ef47996	Bump bob-builder from 0.0.17 to 0.0.18 (#1039 ) Bumps [bob-builder](https://github.com/heroku-python/bob-builder) from 0.0.17 to 0.0.18. - [Release notes](https://github.com/heroku-python/bob-builder/releases) - [Commits](https://github.com/heroku-python/bob-builder/compare/v0.0.17...v0.0.18) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-10 14:25:42 +01:00
dependabot[bot]	c1f6679dd7	Bump boto from 2.48.0 to 2.49.0 (#1038 ) Bumps [boto](https://github.com/boto/boto) from 2.48.0 to 2.49.0. - [Release notes](https://github.com/boto/boto/releases) - [Commits](https://github.com/boto/boto/compare/2.48.0...2.49.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-10 13:11:48 +01:00
Ed Morley	de81e41336	Add config file for Dependabot (#1037 ) GitHub are gradually integrating Dependabot into GitHub as a native feature. The native integration now supports updating not only security updates, but all dependencies - however this must be explicitly enabled by adding a config file: https://docs.github.com/en/github/administering-a-repository/enabling-and-disabling-version-updates The config options are described here: https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates Closes @W-7937066@. [skip changelog]	2020-08-10 12:30:32 +01:00
Ed Morley	99c1027cb2	Tests: Update Hatchet dependencies (#1036 ) * `bundler update` * Ruby 2.6 -> 2.7 * Remove unnecessary bundler version downgrade Of note this picks up: https://github.com/grosser/parallel_split_test/pull/20 @W-7930909@ [skip changelog]	2020-08-10 11:29:34 +01:00
Ed Morley	46d3d2b042	Travis: Move hatchet ci:setup to before_script (#1035 ) So that any failures during `hatchet ci:setup` cause the build to fail early, rather than try to proceed with running the Hatchet tests. @W-7929878@ [skip changelog]	2020-08-07 17:53:33 +01:00
Ed Morley	7b4f16145b	Add a configuration file for Git2Gus (#1034 ) This will allow for one-way sync of GitHub issues in this repository into our internal issues tracker, GUS. Issues are only synced when the specified GitHub label is added. In the future I may switch the chosen label to just be the standard `t: bug` type labels, but for now I'm choosing a separate label so that we have more control over what is synced. See: https://lwc-gus-bot.herokuapp.com/#getting-started @W-7918433@	2020-08-05 10:48:25 +01:00
Ed Morley	a165deadfb	Release v175 (#1032 )	2020-08-05 09:12:16 +01:00
Ed Morley	b64897a0b7	Fix inconsistent formatting in CHANGELOG.md (#1031 ) - Switches releases to always using H2 (`##`) rather than a mixture of H1s (meaning multiple H1s in the same document) and H2s. - Always refers to the versions as `vNNN` rather than sometimes without the `v` prefix. - Other formatting and typo fixes. @W-7905079@	2020-08-03 20:18:18 +01:00
Ed Morley	fc6698e597	Update pip to 20.1.1 (#1030 ) Updates pip from 20.0.2 to 20.1.1 for Python 2.7 and Python 3.5+: https://pip.pypa.io/en/stable/news/#id40 The version used for Python 3.4 remains unchanged at 19.1.1, since it's the last version of pip that supports it. Pip has been updated to 20.1.1 rather than the recently released 20.2, since the latter has a few regressions and even though these will be fixed shortly in 20.2.1, we should let the changes soak for longer before picking them up. The `PIP_NO_PYTHON_VERSION_WARNING` environment variable has been set (equivalent to passing `--no-python-version-warning`) to prevent the Python 2.7 EOL warnings added in pip 20.1 from spamming the build log: https://github.com/pypa/pip/blob/20.1.1/src/pip/_internal/cli/base_command.py#L139-L154 This was set via environment variable rather than CLI flag, since: * otherwise we'd have to pass it to every pip invocation * older pip (such as the 19.1.1 used by Python 3.4) doesn't support this option and would error out due to an unknown CLI flag being passed, unless we added conditional flags throughout. The new pip wheel was uploaded to S3 using: ``` $ pip download --no-cache pip==20.1.1 Collecting pip==20.1.1 Downloading pip-20.1.1-py2.py3-none-any.whl (1.5 MB) Saved ./pip-20.1.1-py2.py3-none-any.whl Successfully downloaded pip $ aws s3 sync . s3://lang-python/common/ --exclude "" --include ".whl" --acl public-read --dryrun (dryrun) upload: ./pip-20.1.1-py2.py3-none-any.whl to s3://lang-python/common/pip-20.1.1-py2.py3-none-any.whl $ aws s3 sync . s3://lang-python/common/ --exclude "" --include ".whl" --acl public-read upload: ./pip-20.1.1-py2.py3-none-any.whl to s3://lang-python/common/pip-20.1.1-py2.py3-none-any.whl ``` Fixes #1005. @W-7659489@	2020-08-03 19:45:41 +01:00
Ed Morley	6fa6feb75d	Update setuptools (#1024 ) 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.	2020-08-03 18:36:01 +01:00
Ed Morley	81874dad47	Replace 'master' branch references with 'main' (#1029 ) For #1028.	2020-08-03 17:31:08 +01:00