kennethreitz/heroku-buildpack-python
1
0
Fork 0
mirror of https://github.com/kennethreitz/heroku-buildpack-python.git synced 2026-06-05 23:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: kennethreitz/heroku-buildpack-python:v174
Branches Tags
kennethreitz/heroku-buildpack-python:main kennethreitz/heroku-buildpack-python:release-v187 kennethreitz/heroku-buildpack-python:python-3.8.7 kennethreitz/heroku-buildpack-python:cedar-14
kennethreitz/heroku-buildpack-python:v186 kennethreitz/heroku-buildpack-python:v185 kennethreitz/heroku-buildpack-python:v184 kennethreitz/heroku-buildpack-python:v183 kennethreitz/heroku-buildpack-python:v182 kennethreitz/heroku-buildpack-python:v181 kennethreitz/heroku-buildpack-python:v180 kennethreitz/heroku-buildpack-python:v179 kennethreitz/heroku-buildpack-python:v178 kennethreitz/heroku-buildpack-python:v177 kennethreitz/heroku-buildpack-python:v176 kennethreitz/heroku-buildpack-python:v175 kennethreitz/heroku-buildpack-python:v174 kennethreitz/heroku-buildpack-python:v173 kennethreitz/heroku-buildpack-python:v172 kennethreitz/heroku-buildpack-python:v171 kennethreitz/heroku-buildpack-python:v170 kennethreitz/heroku-buildpack-python:v169 kennethreitz/heroku-buildpack-python:v168 kennethreitz/heroku-buildpack-python:v167 kennethreitz/heroku-buildpack-python:v166 kennethreitz/heroku-buildpack-python:v165 kennethreitz/heroku-buildpack-python:v164 kennethreitz/heroku-buildpack-python:v163 kennethreitz/heroku-buildpack-python:v162 kennethreitz/heroku-buildpack-python:v161 kennethreitz/heroku-buildpack-python:v160 kennethreitz/heroku-buildpack-python:v159 kennethreitz/heroku-buildpack-python:v158 kennethreitz/heroku-buildpack-python:v157 kennethreitz/heroku-buildpack-python:v156 kennethreitz/heroku-buildpack-python:v155 kennethreitz/heroku-buildpack-python:v154 kennethreitz/heroku-buildpack-python:v153 kennethreitz/heroku-buildpack-python:v152 kennethreitz/heroku-buildpack-python:v151 kennethreitz/heroku-buildpack-python:v150 kennethreitz/heroku-buildpack-python:v149 kennethreitz/heroku-buildpack-python:v148 kennethreitz/heroku-buildpack-python:v147 kennethreitz/heroku-buildpack-python:v146 kennethreitz/heroku-buildpack-python:v145 kennethreitz/heroku-buildpack-python:v144 kennethreitz/heroku-buildpack-python:v143 kennethreitz/heroku-buildpack-python:v142 kennethreitz/heroku-buildpack-python:v138 kennethreitz/heroku-buildpack-python:v137 kennethreitz/heroku-buildpack-python:v136 kennethreitz/heroku-buildpack-python:v135 kennethreitz/heroku-buildpack-python:v134 kennethreitz/heroku-buildpack-python:v132 kennethreitz/heroku-buildpack-python:v131 kennethreitz/heroku-buildpack-python:v130 kennethreitz/heroku-buildpack-python:v128 kennethreitz/heroku-buildpack-python:v126 kennethreitz/heroku-buildpack-python:v124 kennethreitz/heroku-buildpack-python:v123 kennethreitz/heroku-buildpack-python:v120 kennethreitz/heroku-buildpack-python:v119 kennethreitz/heroku-buildpack-python:v118 kennethreitz/heroku-buildpack-python:v117 kennethreitz/heroku-buildpack-python:v116 kennethreitz/heroku-buildpack-python:v115 kennethreitz/heroku-buildpack-python:v114 kennethreitz/heroku-buildpack-python:v113 kennethreitz/heroku-buildpack-python:v112 kennethreitz/heroku-buildpack-python:v111 kennethreitz/heroku-buildpack-python:v110 kennethreitz/heroku-buildpack-python:v109 kennethreitz/heroku-buildpack-python:v108 kennethreitz/heroku-buildpack-python:v107 kennethreitz/heroku-buildpack-python:v106 kennethreitz/heroku-buildpack-python:v104 kennethreitz/heroku-buildpack-python:v103 kennethreitz/heroku-buildpack-python:v102 kennethreitz/heroku-buildpack-python:v101 kennethreitz/heroku-buildpack-python:v100 kennethreitz/heroku-buildpack-python:v99 kennethreitz/heroku-buildpack-python:v98 kennethreitz/heroku-buildpack-python:v97 kennethreitz/heroku-buildpack-python:v96 kennethreitz/heroku-buildpack-python:v95 kennethreitz/heroku-buildpack-python:v94 kennethreitz/heroku-buildpack-python:v93 kennethreitz/heroku-buildpack-python:v92 kennethreitz/heroku-buildpack-python:v90 kennethreitz/heroku-buildpack-python:v89 kennethreitz/heroku-buildpack-python:v91 kennethreitz/heroku-buildpack-python:v88 kennethreitz/heroku-buildpack-python:v87 kennethreitz/heroku-buildpack-python:v86 kennethreitz/heroku-buildpack-python:v85 kennethreitz/heroku-buildpack-python:v84 kennethreitz/heroku-buildpack-python:v83 kennethreitz/heroku-buildpack-python:v82 kennethreitz/heroku-buildpack-python:v81 kennethreitz/heroku-buildpack-python:v80 kennethreitz/heroku-buildpack-python:v79 kennethreitz/heroku-buildpack-python:v78 kennethreitz/heroku-buildpack-python:v77 kennethreitz/heroku-buildpack-python:v76 kennethreitz/heroku-buildpack-python:v75 kennethreitz/heroku-buildpack-python:v74 kennethreitz/heroku-buildpack-python:v73 kennethreitz/heroku-buildpack-python:v72 kennethreitz/heroku-buildpack-python:v70 kennethreitz/heroku-buildpack-python:v68 kennethreitz/heroku-buildpack-python:v67 kennethreitz/heroku-buildpack-python:v66 kennethreitz/heroku-buildpack-python:v69 kennethreitz/heroku-buildpack-python:v65 kennethreitz/heroku-buildpack-python:v64 kennethreitz/heroku-buildpack-python:v62 kennethreitz/heroku-buildpack-python:v61 kennethreitz/heroku-buildpack-python:v60 kennethreitz/heroku-buildpack-python:v59 kennethreitz/heroku-buildpack-python:v58 kennethreitz/heroku-buildpack-python:v57 kennethreitz/heroku-buildpack-python:v56 kennethreitz/heroku-buildpack-python:v55 kennethreitz/heroku-buildpack-python:v54 kennethreitz/heroku-buildpack-python:v53 kennethreitz/heroku-buildpack-python:v52 kennethreitz/heroku-buildpack-python:v51 kennethreitz/heroku-buildpack-python:v50 kennethreitz/heroku-buildpack-python:v49 kennethreitz/heroku-buildpack-python:v48 kennethreitz/heroku-buildpack-python:v47 kennethreitz/heroku-buildpack-python:v46 kennethreitz/heroku-buildpack-python:v45 kennethreitz/heroku-buildpack-python:v44 kennethreitz/heroku-buildpack-python:v43 kennethreitz/heroku-buildpack-python:v42 kennethreitz/heroku-buildpack-python:v41 kennethreitz/heroku-buildpack-python:v40 kennethreitz/heroku-buildpack-python:v39 kennethreitz/heroku-buildpack-python:v38 kennethreitz/heroku-buildpack-python:v37 kennethreitz/heroku-buildpack-python:v36 kennethreitz/heroku-buildpack-python:v35 kennethreitz/heroku-buildpack-python:v34 kennethreitz/heroku-buildpack-python:v33 kennethreitz/heroku-buildpack-python:v32 kennethreitz/heroku-buildpack-python:v30 kennethreitz/heroku-buildpack-python:v29 kennethreitz/heroku-buildpack-python:v31 kennethreitz/heroku-buildpack-python:v28 kennethreitz/heroku-buildpack-python:v27 kennethreitz/heroku-buildpack-python:v25 kennethreitz/heroku-buildpack-python:v24 kennethreitz/heroku-buildpack-python:v21 kennethreitz/heroku-buildpack-python:v20 kennethreitz/heroku-buildpack-python:v19 kennethreitz/heroku-buildpack-python:v18 kennethreitz/heroku-buildpack-python:v17 kennethreitz/heroku-buildpack-python:v16 kennethreitz/heroku-buildpack-python:v15 kennethreitz/heroku-buildpack-python:v14 kennethreitz/heroku-buildpack-python:v13 kennethreitz/heroku-buildpack-python:v12 kennethreitz/heroku-buildpack-python:v11 kennethreitz/heroku-buildpack-python:v10 kennethreitz/heroku-buildpack-python:v9 kennethreitz/heroku-buildpack-python:v8 kennethreitz/heroku-buildpack-python:v7 kennethreitz/heroku-buildpack-python:v6 kennethreitz/heroku-buildpack-python:v5 kennethreitz/heroku-buildpack-python:v4 kennethreitz/heroku-buildpack-python:v3
...
compare: kennethreitz/heroku-buildpack-python:v183
Branches Tags
kennethreitz/heroku-buildpack-python:main kennethreitz/heroku-buildpack-python:release-v187 kennethreitz/heroku-buildpack-python:python-3.8.7 kennethreitz/heroku-buildpack-python:cedar-14
kennethreitz/heroku-buildpack-python:v186 kennethreitz/heroku-buildpack-python:v185 kennethreitz/heroku-buildpack-python:v184 kennethreitz/heroku-buildpack-python:v183 kennethreitz/heroku-buildpack-python:v182 kennethreitz/heroku-buildpack-python:v181 kennethreitz/heroku-buildpack-python:v180 kennethreitz/heroku-buildpack-python:v179 kennethreitz/heroku-buildpack-python:v178 kennethreitz/heroku-buildpack-python:v177 kennethreitz/heroku-buildpack-python:v176 kennethreitz/heroku-buildpack-python:v175 kennethreitz/heroku-buildpack-python:v174 kennethreitz/heroku-buildpack-python:v173 kennethreitz/heroku-buildpack-python:v172 kennethreitz/heroku-buildpack-python:v171 kennethreitz/heroku-buildpack-python:v170 kennethreitz/heroku-buildpack-python:v169 kennethreitz/heroku-buildpack-python:v168 kennethreitz/heroku-buildpack-python:v167 kennethreitz/heroku-buildpack-python:v166 kennethreitz/heroku-buildpack-python:v165 kennethreitz/heroku-buildpack-python:v164 kennethreitz/heroku-buildpack-python:v163 kennethreitz/heroku-buildpack-python:v162 kennethreitz/heroku-buildpack-python:v161 kennethreitz/heroku-buildpack-python:v160 kennethreitz/heroku-buildpack-python:v159 kennethreitz/heroku-buildpack-python:v158 kennethreitz/heroku-buildpack-python:v157 kennethreitz/heroku-buildpack-python:v156 kennethreitz/heroku-buildpack-python:v155 kennethreitz/heroku-buildpack-python:v154 kennethreitz/heroku-buildpack-python:v153 kennethreitz/heroku-buildpack-python:v152 kennethreitz/heroku-buildpack-python:v151 kennethreitz/heroku-buildpack-python:v150 kennethreitz/heroku-buildpack-python:v149 kennethreitz/heroku-buildpack-python:v148 kennethreitz/heroku-buildpack-python:v147 kennethreitz/heroku-buildpack-python:v146 kennethreitz/heroku-buildpack-python:v145 kennethreitz/heroku-buildpack-python:v144 kennethreitz/heroku-buildpack-python:v143 kennethreitz/heroku-buildpack-python:v142 kennethreitz/heroku-buildpack-python:v138 kennethreitz/heroku-buildpack-python:v137 kennethreitz/heroku-buildpack-python:v136 kennethreitz/heroku-buildpack-python:v135 kennethreitz/heroku-buildpack-python:v134 kennethreitz/heroku-buildpack-python:v132 kennethreitz/heroku-buildpack-python:v131 kennethreitz/heroku-buildpack-python:v130 kennethreitz/heroku-buildpack-python:v128 kennethreitz/heroku-buildpack-python:v126 kennethreitz/heroku-buildpack-python:v124 kennethreitz/heroku-buildpack-python:v123 kennethreitz/heroku-buildpack-python:v120 kennethreitz/heroku-buildpack-python:v119 kennethreitz/heroku-buildpack-python:v118 kennethreitz/heroku-buildpack-python:v117 kennethreitz/heroku-buildpack-python:v116 kennethreitz/heroku-buildpack-python:v115 kennethreitz/heroku-buildpack-python:v114 kennethreitz/heroku-buildpack-python:v113 kennethreitz/heroku-buildpack-python:v112 kennethreitz/heroku-buildpack-python:v111 kennethreitz/heroku-buildpack-python:v110 kennethreitz/heroku-buildpack-python:v109 kennethreitz/heroku-buildpack-python:v108 kennethreitz/heroku-buildpack-python:v107 kennethreitz/heroku-buildpack-python:v106 kennethreitz/heroku-buildpack-python:v104 kennethreitz/heroku-buildpack-python:v103 kennethreitz/heroku-buildpack-python:v102 kennethreitz/heroku-buildpack-python:v101 kennethreitz/heroku-buildpack-python:v100 kennethreitz/heroku-buildpack-python:v99 kennethreitz/heroku-buildpack-python:v98 kennethreitz/heroku-buildpack-python:v97 kennethreitz/heroku-buildpack-python:v96 kennethreitz/heroku-buildpack-python:v95 kennethreitz/heroku-buildpack-python:v94 kennethreitz/heroku-buildpack-python:v93 kennethreitz/heroku-buildpack-python:v92 kennethreitz/heroku-buildpack-python:v90 kennethreitz/heroku-buildpack-python:v89 kennethreitz/heroku-buildpack-python:v91 kennethreitz/heroku-buildpack-python:v88 kennethreitz/heroku-buildpack-python:v87 kennethreitz/heroku-buildpack-python:v86 kennethreitz/heroku-buildpack-python:v85 kennethreitz/heroku-buildpack-python:v84 kennethreitz/heroku-buildpack-python:v83 kennethreitz/heroku-buildpack-python:v82 kennethreitz/heroku-buildpack-python:v81 kennethreitz/heroku-buildpack-python:v80 kennethreitz/heroku-buildpack-python:v79 kennethreitz/heroku-buildpack-python:v78 kennethreitz/heroku-buildpack-python:v77 kennethreitz/heroku-buildpack-python:v76 kennethreitz/heroku-buildpack-python:v75 kennethreitz/heroku-buildpack-python:v74 kennethreitz/heroku-buildpack-python:v73 kennethreitz/heroku-buildpack-python:v72 kennethreitz/heroku-buildpack-python:v70 kennethreitz/heroku-buildpack-python:v68 kennethreitz/heroku-buildpack-python:v67 kennethreitz/heroku-buildpack-python:v66 kennethreitz/heroku-buildpack-python:v69 kennethreitz/heroku-buildpack-python:v65 kennethreitz/heroku-buildpack-python:v64 kennethreitz/heroku-buildpack-python:v62 kennethreitz/heroku-buildpack-python:v61 kennethreitz/heroku-buildpack-python:v60 kennethreitz/heroku-buildpack-python:v59 kennethreitz/heroku-buildpack-python:v58 kennethreitz/heroku-buildpack-python:v57 kennethreitz/heroku-buildpack-python:v56 kennethreitz/heroku-buildpack-python:v55 kennethreitz/heroku-buildpack-python:v54 kennethreitz/heroku-buildpack-python:v53 kennethreitz/heroku-buildpack-python:v52 kennethreitz/heroku-buildpack-python:v51 kennethreitz/heroku-buildpack-python:v50 kennethreitz/heroku-buildpack-python:v49 kennethreitz/heroku-buildpack-python:v48 kennethreitz/heroku-buildpack-python:v47 kennethreitz/heroku-buildpack-python:v46 kennethreitz/heroku-buildpack-python:v45 kennethreitz/heroku-buildpack-python:v44 kennethreitz/heroku-buildpack-python:v43 kennethreitz/heroku-buildpack-python:v42 kennethreitz/heroku-buildpack-python:v41 kennethreitz/heroku-buildpack-python:v40 kennethreitz/heroku-buildpack-python:v39 kennethreitz/heroku-buildpack-python:v38 kennethreitz/heroku-buildpack-python:v37 kennethreitz/heroku-buildpack-python:v36 kennethreitz/heroku-buildpack-python:v35 kennethreitz/heroku-buildpack-python:v34 kennethreitz/heroku-buildpack-python:v33 kennethreitz/heroku-buildpack-python:v32 kennethreitz/heroku-buildpack-python:v30 kennethreitz/heroku-buildpack-python:v29 kennethreitz/heroku-buildpack-python:v31 kennethreitz/heroku-buildpack-python:v28 kennethreitz/heroku-buildpack-python:v27 kennethreitz/heroku-buildpack-python:v25 kennethreitz/heroku-buildpack-python:v24 kennethreitz/heroku-buildpack-python:v21 kennethreitz/heroku-buildpack-python:v20 kennethreitz/heroku-buildpack-python:v19 kennethreitz/heroku-buildpack-python:v18 kennethreitz/heroku-buildpack-python:v17 kennethreitz/heroku-buildpack-python:v16 kennethreitz/heroku-buildpack-python:v15 kennethreitz/heroku-buildpack-python:v14 kennethreitz/heroku-buildpack-python:v13 kennethreitz/heroku-buildpack-python:v12 kennethreitz/heroku-buildpack-python:v11 kennethreitz/heroku-buildpack-python:v10 kennethreitz/heroku-buildpack-python:v9 kennethreitz/heroku-buildpack-python:v8 kennethreitz/heroku-buildpack-python:v7 kennethreitz/heroku-buildpack-python:v6 kennethreitz/heroku-buildpack-python:v5 kennethreitz/heroku-buildpack-python:v4 kennethreitz/heroku-buildpack-python:v3

60 Commits
v174 ... v183

Author SHA1 Message Date
Ed Morley ac8fd555b8 Release v183 (#1097) 2020-10-12 12:31:44 +01:00
dependabot[bot] f825896c4e Bump heroku_hatchet from 7.3.0 to 7.3.1 (#1095) 
Bumps [heroku_hatchet](https://github.com/heroku/hatchet) from 7.3.0 to 7.3.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.3.0...v7.3.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-12 10:01:20 +01:00
Ed Morley fcf696b835 Add support for Heroku-20 (#968) 
This adds support for the upcoming Heroku-20 stack.

The Heroku-20 Dockerfile is identical to that for Heroku-18, other
than the base image, and stack-related env var changes.

The initial Python versions made available will be those in:
https://devcenter.heroku.com/articles/python-support#supported-runtimes
https://devcenter.heroku.com/articles/python-support#supported-pypy-runtimes

...minus CPython 2.7, since it's EOL.

Which are:
* `python-3.6.12`
* `python-3.7.9`
* `python-3.8.6`
* `python-3.9.0`
* `pypy2.7-7.3.2`
* `pypy3.6-7.3.2`

Note: Unlike CPython 2.7, the PyPy 2.7 branch is still supported:
https://doc.pypy.org/en/latest/faq.html#how-long-will-pypy-support-python2

In addition, I've generated binaries for each patch release immediately
prior to the latest versions (with the exception of 3.9.0, since there
isn't one), otherwise it's not possible to run the "out of date Python"
warning tests.

The binaries were generated using the process here:
https://github.com/heroku/heroku-buildpack-python/blob/main/builds/README.md

Specifically:

```
make deploy-runtimes STACKS='heroku-20' \
  RUNTIMES='python-3.6.11 python-3.6.12 python-3.7.8 python-3.7.9 python-3.8.5 python-3.8.6 python-3.9.0 pypy2.7-7.3.1 pypy2.7-7.3.2 pypy3.6-7.3.1 pypy3.6-7.3.2' \
  ENV_FILE=...
```

Binaries for the GDAL/GEOS/PROJ feature have not been generated, since
it's deprecated and due for removal shortly:
https://help.heroku.com/D5INLB1A/python-s-build_with_geo_libraries-legacy-feature-is-now-deprecated

Note: Like the Python 3.9.0 release, this uses the new S3 bucket, so
apps will need to be using a recent version of the buildpack in order
to build on Heroku-20:
https://devcenter.heroku.com/articles/python-support#checking-the-python-buildpack-version

Closes @W-7485877@.
 2020-10-07 19:44:33 +01:00
Ed Morley a98ef91566 Tests: Clean up the Python version unit tests (#1092) 
* Fixes the "Installing <version>" assertions so that they don't false
  positive against the "please upgrade to <version>" output.
* Removes modification of test fixtures during tests, since it can lead
  to failures depending on test order, and confusion when debugging.
* Updates the PyPy version warning tests to use a slightly newer (but
  still not latest) PyPy version, which means that the test now passes
  on Cedar-14 and can be unskipped.
* Switches to using an empty requirements file for version tests that
  duplicate the main test, to save spending time installing dependencies
  unnecessarily.
* Switches the NLTK test to using the default buildpack Python version,
  rather than an ancient Python 3.6.
* Skips the Python 3.7/3.8 tests on Cedar-14 rather than asserting
  failure, since we know they'll never pass due to Cedar-14's libssl being
  older than required.
* Removes redundant `testSqliteInstall` test since it duplicates the
  Python version install tests.

Longer term I'll be moving many of the unit tests to Hatchet, however
this at least makes the tests more dependable in the meantime.

Closes @W-8060219@.
Closes @W-8176779@.

[skip changelog]
 2020-10-07 15:10:20 +01:00
Ed Morley e67235f906 Release v182 (#1091) 2020-10-06 10:25:07 +01:00
Ed Morley b1690e9f47 Add support for Python 3.9.0 (#1090) 
https://pythoninsider.blogspot.com/2020/10/python-390-is-now-available-and-you-can.html
https://www.python.org/downloads/release/python-390/
https://docs.python.org/release/3.9.0/whatsnew/3.9.html

Binaries generated using:

```
make deploy-runtimes RUNTIMES='python-3.9.0' STACKS='heroku-16 heroku-18' ENV_FILE=...
```

Closes @W-7791272@.
 2020-10-06 09:35:36 +01:00
Ed Morley b250300b74 Migrate to a new S3 bucket (#1089) 
Since:
* We want the S3 bucket to be owned by a different AWS account and it's
  not possible to transfer ownership of an existing bucket.
* In the future we want to rebuild some of the Python runtime archives
  (for example to improve the sqlite3 handling, or to tweak the compile
  flags used), and it will be easier to reason about the change if we
  can guarantee only recent buildpack versions are using the assets
  rather than several year old unmaintained forks.

The assets were synced from the old bucket using (minus the `--dryrun`):

```
aws s3 sync s3://lang-python s3://heroku-buildpack-python \
  --dryrun \
  --metadata-directive REPLACE \
  --exclude "*" \
  --include 'common/*' \
  --include 'heroku-*/runtimes/*' \
  --include 'heroku-*/libraries/vendor/gdal.tar.gz' \
  --include 'heroku-*/libraries/vendor/geos.tar.gz' \
  --include 'heroku-*/libraries/vendor/proj.tar.gz' \
  --exclude 'common/pip-20.0.2-py2.py3-none-any.whl' \
  --exclude '*/runtimes/*-opt.tar.gz' \
  --exclude '*/runtimes/sqlite-free/*'
```

The files that were `--exclude`d are those that are no longer used,
or test assets that were not officially released.

The Cedar-14 assets were not migrated since it's EOL next month.

The old S3 bucket will be left untouched for the foreseeable future
(ie: we won't be deleting it), since builds using older versions of this
buildpack (either due to pinning to a tag or via a fork) will still be
using assets from it.

Closes @W-8060097@.
 2020-10-06 09:23:38 +01:00
dependabot[bot] 096709dcf7 Bump bob-builder from 0.0.18 to 0.0.19 (#1088) 
Bumps [bob-builder](https://github.com/heroku-python/bob-builder) from 0.0.18 to 0.0.19.
- [Release notes](https://github.com/heroku-python/bob-builder/releases)
- [Commits](https://github.com/heroku-python/bob-builder/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-05 08:47:36 +01:00
Ed Morley ff8945c0c2 Tests: Make assertCapturedSuccess check stderr is empty again (#1087) 
`assertCapturedSuccess` used to check that `stderr` was empty, until:
https://github.com/heroku/heroku-buildpack-python/commit/797652a75d69a1fece96a26bf4514fe9e9e1c020#diff-65c067a6f0a3aef292fb54ec21a1fe8cR98

Adding back the assertion exposes some new bugs, which I'll fix in
later PRs. In the meantime affected tests have been adjusted to use
a new `assertCapturedSuccessWithStdErr`.

The test harness output for the failing case has also been improved,
to ease debugging.

Closes @W-7918492@.

[skip changelog]
 2020-10-01 17:29:13 +01:00
Ed Morley 4e78b5d57c Remove duplicate copy of shunit2 (#1086) 
The tests use `test/shunit2` so the copy under `vendor/` is redundant.

I've added to the CHANGELOG since `vendor/` is added by the buildpack to
`PATH` (something long term we should stop doing), increasing the chance
an app was accidentally relying upon `shunit2` (albeit still unlikely).

Closes @W-8145517@.
 2020-10-01 16:02:09 +01:00
Ed Morley b74a41395e Refactor S3 asset URL handling (#1085) 
Previously the buildpack's S3 bucket was defined in two places - once
in `VENDOR_URL` and again during the pip installation step. This
duplication was necessary since `VENDOR_URL` also contained the stack's
name, whereas the pip use-case used a non-stack-specific S3 key prefix.

In order to:
* reduce this duplication
* simplify this buildpack's S3 bucket migration (where we'll soon be
  needing the vary the bucket name and wouldn't want to have to
  duplicate that logic in multiple places)
* allow overriding of the URL for the pip use-case

...the `VENDOR_URL` variable has been replaced with `S3_BASE_URL` which
no longer contains the stack name.

The user-configurable override has similarly been renamed from
`BUILDPACK_VENDOR_URL` to `BUILDPACK_S3_BASE_URL`. Note: As before,
this override cannot be set via standard app variables (see #989).

The unused `USE_STAGING_BINARIES` environment variable has been
removed, since it's a leftover from the project to stand up a staging S3 bucket.
It's redundant given the `BUILDPACK_S3_BASE_URL` variable.

Closes @W-8142401@.
 2020-10-01 10:13:26 +01:00
Ed Morley c550143a59 Use 'rm -rf' instead of 'rm -fr' (#1084) 
Not super urgent, but seeing as it closes #927, might as well do now.

[skip changelog]
 2020-09-29 15:34:13 +01:00
Ed Morley 838f4c125b Simplify binary build process and documentation (#1083) 
* Moves all manual build steps to make targets, to simplify
  the commands run, and reduce chance for error.
* Removes the need to remember to rebuild the builder
  image by building it automatically prior to launching.
* Adds a new make target for deploying multiple runtime
  versions at once to speed up the common case.
* Reduces repetition/superfluous content in documentation.
* Removes unused `S3_REGION` from `dockerenv.default`
  (the contents of S3 buckets inherit the region of the bucket).
* Documents build dependencies in `requirements.txt`.

Closes @W-8119717@.

[skip changelog]
 2020-09-29 13:40:56 +01:00
Ed Morley 0020aae078 Release v181 (#1082) 
Closes @W-8133372@.
 2020-09-29 13:14:41 +01:00
Ed Morley 63651e042f Add support for PyPy 2.7 and 3.6 version 7.3.2 (#1081) 
Since they were released yesterday:
https://morepypy.blogspot.com/2020/09/pypy-732-triple-release-python-27-36.html

The archive URL had to be updated now that PyPy has migrated from BitBucket.
The new URLs are from:
https://www.pypy.org/download.html

Skipping PyPy 3.7 for now, since it's in alpha.

Closes @W-8128094@.
 2020-09-29 09:30:51 +01:00
Ed Morley c0609a881c Clean up binary generation Dockerfiles (#1080) 
* Switches from using Python 2 to Python 3 for `bob-builder`
* Adds `--no-install-recommends` to reduce unnecessary packages
* Removes unnecessary pinning of pip for Heroku-18 build
* Moves `DEBIAN_FRONTEND` to RUN level env var, given:
   https://serverfault.com/a/797318

Refs @W-8119717@.

[skip changelog]
 2020-09-29 09:29:33 +01:00
dependabot[bot] ef4696a922 Bump heroku_hatchet from 7.2.0 to 7.3.0 (#1079) 
Bumps [heroku_hatchet](https://github.com/heroku/hatchet) from 7.2.0 to 7.3.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.2.0...v7.3.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-28 10:38:03 +01:00
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
88 changed files with 762 additions and 1910 deletions
Expand all files Collapse all files
.git2gus/config.json
+6
View File
@@ -0,0 +1,6 @@
{
"productTag": "a1aB0000000MR0RIAW",
"issueTypeLabels": { "gus: story": "USER STORY", "gus: bug": "BUG P3" },
"defaultBuild": "Heroku Unscheduled",
"statusWhenClosed": "CLOSED"
}
.github/dependabot.yml
+15
View File
@@ -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"
.pre-commit-config.yaml
-7
View File
@@ -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
.travis.yml
+9 -8
View File
@@ -1,8 +1,8 @@
language: minimal language: minimal
dist: bionic dist: focal
branches: branches:
only: only:
- master - main
script: script:
- make test STACK="${STACK}" TEST_CMD="${TEST_CMD}" - make test STACK="${STACK}" TEST_CMD="${TEST_CMD}"
@@ -12,14 +12,13 @@ jobs:
- name: Bash linting (shellcheck) - name: Bash linting (shellcheck)
script: make check script: make check
- name: Hatchet integration tests - 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 language: ruby
rvm: rvm:
- 2.6.6 - 2.7
before_script: before_script:
- gem install bundler -v 1.16.2
script:
- bundle exec hatchet ci:setup - bundle exec hatchet ci:setup
script:
- PARALLEL_SPLIT_TEST_PROCESSES=11 bundle exec parallel_split_test spec/hatchet/ - PARALLEL_SPLIT_TEST_PROCESSES=11 bundle exec parallel_split_test spec/hatchet/
env: env:
@@ -35,10 +34,12 @@ env:
- STACK=heroku-18 TEST_CMD=test/run-deps - STACK=heroku-18 TEST_CMD=test/run-deps
- STACK=heroku-18 TEST_CMD=test/run-versions - STACK=heroku-18 TEST_CMD=test/run-versions
- STACK=heroku-18 TEST_CMD=test/run-features - STACK=heroku-18 TEST_CMD=test/run-features
- STACK=heroku-20 TEST_CMD=test/run-deps
- STACK=heroku-20 TEST_CMD=test/run-versions
- STACK=heroku-20 TEST_CMD=test/run-features
global: global:
- HATCHET_RETRIES=3 - HATCHET_RETRIES=3
- IS_RUNNING_ON_CI=true - IS_RUNNING_ON_CI=true
- HATCHET_APP_LIMIT=80 - HATCHET_APP_LIMIT=80
- HATCHET_DEPLOY_STRATEGY=git - HATCHET_DEPLOY_STRATEGY=git
- secure: yjtlPE5FbVxTKnjUy/tZUBgSEf4qADD3QOxtgziuid73S0U/1IEXlMGFULsQzIjtlHKmHeywZqpVVEpthIH4RuT7uoX1Pb7SSM/g0T8fT3VoEFbFK1uYl0oZQbUS4Klxv9tPiumj8if3m6ULEGIz1X0wZcMOC0tMLwVCnwmap0E=
- secure: ZeFTHWwnpIKE9nAqs88ocmiQh7bKce84lilGm5J23nf3N6V4wNyLwqlkvsM008WGBCaOg9AUx7ZunasT0ANsR5gLP3eV2UUg7ILdRgV2Gy13eNRFheC4PHdN92RqQ3aKoqlIv2K999xlhVjod0NzhkQQXB6PddfQINbuU7ks6As=
CHANGELOG.md
+144 -98
View File
@@ -1,9 +1,58 @@
# Python Buildpack Changelog # Python Buildpack Changelog
# Master ## Unreleased
# 174 (2020-07-30) ## v183 (2020-10-12)
- Add support for Heroku-20 (#968).
## v182 (2020-10-06)
- Python 3.9.0 is now available (CPython) (#1090).
- Migrate from the `lang-python` S3 bucket to `heroku-buildpack-python` (#1089).
- Remove `vendor/shunit2` (#1086).
- Replace `BUILDPACK_VENDOR_URL` and `USE_STAGING_BINARIES` with `BUILDPACK_S3_BASE_URL` (#1085).
## v181 (2020-09-29)
- PyPy 2.7 and 3.6, version 7.3.2 are now available (Note: PyPy support is in beta) (#1081).
## 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). - 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). - Install an explicit version of wheel rather than the latest release at the time (#1007).
@@ -12,87 +61,85 @@
- Install pip using itself rather than `get-pip.py` (#1007). - Install pip using itself rather than `get-pip.py` (#1007).
- Disable pip's version check + cache when installing pip/setuptools/wheel (#1007). - Disable pip's version check + cache when installing pip/setuptools/wheel (#1007).
- Install setuptools from PyPI rather than a vendored copy (#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). - 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). - 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) - 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 - 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` - Bugfix: Correctly detect Python version when using a `python_version` of `3.8` in `Pipfile.lock`.
-------------------------------------------------------------------------------- ## v169 (2020-04-22)
# 169 (2020-04-22)
- Add a Hatchet test for python 3.8.2 - Add a Hatchet test for python 3.8.2
- Set Code Owners to @heroku/langauges - Set Code Owners to @heroku/langauges
- Bugfix: Caching on subsequent redeploys - Bugfix: Caching on subsequent redeploys
- Update tests to support latest version of Python - Update tests to support latest version of Python
# 168 (2020-04-06) ## v168 (2020-04-06)
- Doc: Update Readme with version numbers - Doc: Update Readme with version numbers
- update Code Owners to include the Heroku Buildpack Maintainers team - 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 - Clean up build log output
- Update Python versions in README to match docs - Update Python versions in README to match docs
- Django version detection fixed, link updated - Django version detection fixed, link updated
# 167 (2020-03-26) ## v167 (2020-03-26)
- Add failcase for cache busting - Add failcase for cache busting
- Bugfix: Clearing pip dependencies - Bugfix: Clearing pip dependencies
# 166 (2020-03-05) ## v166 (2020-03-05)
- Correct ftp to https in vendored file - Correct ftp to https in vendored file
- Warn for Django 1.11 approaching EOL, provide link to roadmap - 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. - Python 3.8.2 now available.
# 164 (2020-02-20) ## v164 (2020-02-20)
- Update requirements.txt builds to use Pip 20.0.2 - Update requirements.txt builds to use Pip 20.0.2
- Download get-pip.py to tmpdir instead of root dir - Download get-pip.py to tmpdir instead of root dir
# 163 (2019-12-23) ## v163 (2019-12-23)
- New pythons released: - New pythons released:
Python 3.8.1, 3.7.6, 3.6.10 (CPython) Python 3.8.1, 3.7.6, 3.6.10 (CPython)
Beta Release: Pypy 2.7 and 3.6, version 7.2.0 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 - Bug fix: fragile sqlite3 install
# 161 (2019-12-2) ## v161 (2019-12-2)
- Bug fix: Sqlite3 version bump - Bug fix: Sqlite3 version bump
# 160 (2019-10-23) ## v160 (2019-10-23)
- Bugfix: Pipenv no longer installs twice in CI - 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. - 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. - Python 3.7.5 and 3.8.0 now available on Heroku 18 and 16.
- Add support for Python 3.8 branch - Add support for Python 3.8 branch
@@ -100,11 +147,11 @@
- Test Improvements - Test Improvements
- Add support for staging binary testing - Add support for staging binary testing
# 157 (2019-09-18) ## v157 (2019-09-18)
- Typo fixes - Typo fixes
# 156 (2019-09-12) ## v156 (2019-09-12)
- Python 3.6.9 and 3.7.4 now available. - Python 3.6.9 and 3.7.4 now available.
@@ -112,125 +159,125 @@
- Build utility and documentation updates - Build utility and documentation updates
- Bump Hatchet tests to point at new default python version. - 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 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 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 Hotfix for broken heroku-16 deploys
# 152 (2019-04-04) ## v152 (2019-04-04)
Python 3.7.3 now available. 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. 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. Python 2.7.16 now available on all Heroku stacks.
# 149 (2019-03-04) ## v149 (2019-03-04)
Hotfix for broken Cedar 14 deploys Hotfix for broken Cedar 14 deploys
# 148 (2019-02-21) ## v148 (2019-02-21)
No user facing changes, improving internal metrics 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. 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. 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 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 Switch to cautious upgrade for Pipenv install to ensure the pinned pip version
is used with Pipenv 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. install Apache Airflow version 1.10 or higher.
# 142 (2018-10-08) ## v142 (2018-10-08)
Improvements to Python install messaging Improvements to Python install messaging
# 139, 140, 141 ## v139, 140, 141
No user-facing changes, documenting for version clarity No user-facing changes, documenting for version clarity
# 138 (2018-08-01) ## v138 (2018-08-01)
Use stack image SQLite3 instead of vendoring 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. 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. 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. Upgrade Pipenv to v2018.5.18.
# 134 (2018-05-02) ## v134 (2018-05-02)
Default to 3.6.5, bugfixes. Default to 3.6.5, bugfixes.
# 133 ## v133
Fixes for Pip 10 release. Fixes for Pip 10 release.
# 132 ## v132
Improve pip installation, with the release of v9.0.2. Improve pip installation, with the release of v9.0.2.
# 131 ## v131
Fix bug with pip. Fix bug with pip.
# 130 ## v130
Better upgrade strategy for pip. Better upgrade strategy for pip.
# 129 ## v129
Don't upgrade pip (from v128). Don't upgrade pip (from v128).
# 128 ## v128
Upgrade pip, pin to Pipenv v11.8.2. Upgrade pip, pin to Pipenv v11.8.2.
# 127 ## v127
Pin to Pipenv v11.7.1. Pin to Pipenv v11.7.1.
# 126 ## v126
Bugfixes. Bugfixes.
# 125 ## v125
Bugfixes. Bugfixes.
# 124 ## v124
Update buildpack to automatically install `[dev-packages]` during Heroku CI Pipenv builds. Update buildpack to automatically install `[dev-packages]` during Heroku CI Pipenv builds.
@@ -239,101 +286,101 @@ Update buildpack to automatically install `[dev-packages]` during Heroku CI Pipe
- No longer warn if there is no `Procfile`. - No longer warn if there is no `Procfile`.
- Update Pipenv's "3.6" runtime specifier to point to "3.6.4". - Update Pipenv's "3.6" runtime specifier to point to "3.6.4".
# 123 ## v123
Update gunicorn `init.d` script to allow overrides. Update gunicorn `init.d` script to allow overrides.
# 122 ## v122
Update default Python to v3.6.4. Update default Python to v3.6.4.
# 121 ## v121
Update default Python to v3.6.3. Update default Python to v3.6.3.
# 120 ## v120
Use `$ pipenv --deploy`. Use `$ pipenv --deploy`.
# 119 ## v119
Improvements to Pipenv support, warning on unsupported Python versions. 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. - 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`. - Heroku now supports `[requires]` `python_full_version` in addition to `python_version`.
# 118 ## v118
Improvements to Pipenv support. Improvements to Pipenv support.
# 117 ## v117
Bug fix. Bug fix.
# 116 ## v116
Vendoring improvements. Vendoring improvements.
- Geos libraries should work on Heroku-16 now. - 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). - 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. Revert a pull request.
- No longer using `sub_env` for `pip install` step. - No longer using `sub_env` for `pip install` step.
# 114 ## v114
- Bugfixes. - Bugfixes.
Blacklisting `PYTHONHOME` and `PYTHONPATH` for older apps. Upgrades to nltk support. Blacklisting `PYTHONHOME` and `PYTHONPATH` for older apps. Upgrades to nltk support.
# 113 ## v113
Updates to Pipenv support. Updates to Pipenv support.
# 112 ## v112
Bugfix. Bugfix.
- Fixed grep output bug. - Fixed grep output bug.
# 111 ## v111
Linting, bugfixes. Linting, bugfixes.
# 110 ## v110
Update default Python to 3.6.2. Update default Python to 3.6.2.
# 109 ## v109
Update Default Python to 3.6.1, bugfixes. Update Default Python to 3.6.1, bugfixes.
- Fixed automatic pip uninstall of dependencies removed from requirements.txt. - Fixed automatic pip uninstall of dependencies removed from requirements.txt.
# 108 ## v108
Fix output for collectstatic step. Fix output for collectstatic step.
# 107 ## v107
Bugfix for C dependency installation. 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`, - The Python buildpack will automatically remove `six`, `pyparsing`, `appdirs`,
`setuptools`, and `distribute` from a `requirements.txt` file now, as these `setuptools`, and `distribute` from a `requirements.txt` file now, as these
packages are provided by the Python buildpack. packages are provided by the Python buildpack.
# 105 ## v105
Improvements to output messaging. Improvements to output messaging.
# 104 ## v104
General improvements. General improvements.
@@ -343,52 +390,52 @@ General improvements.
[395]: https://github.com/heroku/heroku-buildpack-python/pull/395 [395]: https://github.com/heroku/heroku-buildpack-python/pull/395
## 103 ## v103
Bug fixes and improvements. Bug fixes and improvements.
- Fix for Pipenv. - Fix for Pipenv.
- Fix for Heroku CI. - Fix for Heroku CI.
- Improve handling of WEB_CONCURRENCY when using multiple buildpacks. - 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). - 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. - Restore the build cache prior to running bin/pre_compile.
## 102 ## v102
Buildpack code cleanup. Buildpack code cleanup.
- Improved messaging around NLTK. - Improved messaging around NLTK.
## 101 ## v101
Updated setuptools installation method. Updated setuptools installation method.
- Improved pipenv support. - Improved pipenv support.
## 100 ## v100
Preliminary pipenv support. Preliminary pipenv support.
## 99 ## v99
Cleanup. Cleanup.
## 98 ## v98
Official NLTK support and other improvements. Official NLTK support and other improvements.
- Support for `nltk.txt` file for declaring corpora to be downloaded. - 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. Improved egg-link functionality.
## 96 ## v96
Bugfix. Bugfix.
## 95 ## v95
Improved output support. Improved output support.
@@ -424,7 +471,7 @@ Fixed bug with editable pip installations.
Updated default Python 2.7.13. 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. - Updated setuptools to v32.1.0.
## v86 ## v86
@@ -450,7 +497,7 @@ Support for Heroku CI.
## v82 (2016-08-22) ## v82 (2016-08-22)
Update to library detection mechnisms (pip-pop). Update to library detection mechanisms (pip-pop).
- Updated setuptools to v25.5.0 - Updated setuptools to v25.5.0
@@ -524,7 +571,7 @@ Revert to v66.
## v68 (2015-10-12) ## v68 (2015-10-12)
Fixed .heroku/venv error with modern apps. Fixed `.heroku/venv` error with modern apps.
## v67 (2015-10-12) ## v67 (2015-10-12)
@@ -549,7 +596,6 @@ Updated Pip and Setuptools.
- Setuptools updated to v18.3.2 - Setuptools updated to v18.3.2
- Pip updated to v7.1.2 - Pip updated to v7.1.2
## v62 (2015-08-07) ## v62 (2015-08-07)
Updated Pip and Setuptools. Updated Pip and Setuptools.
Gemfile.lock
+27 -45
View File
@@ -1,68 +1,50 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (6.0.3.1) diff-lcs (1.4.4)
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)
erubis (2.7.0) erubis (2.7.0)
excon (0.73.0) excon (0.76.0)
heroics (0.0.25) heroics (0.1.1)
erubis (~> 2.0) erubis (~> 2.0)
excon excon
moneta moneta
multi_json (>= 1.9.2) multi_json (>= 1.9.2)
heroku_hatchet (5.0.3) heroku_hatchet (7.3.1)
excon (~> 0) excon (~> 0)
minitest-retry (~> 0.1.9) platform-api (~> 3)
platform-api (~> 2)
repl_runner (~> 0.0.3)
rrrretry (~> 1) rrrretry (~> 1)
thor (~> 0) thor (~> 1)
threaded (~> 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) moneta (1.0.0)
multi_json (1.14.1) multi_json (1.15.0)
parallel (1.19.1) parallel (1.19.2)
parallel_split_test (0.7.0) parallel_split_test (0.8.0)
parallel (>= 0.5.13) parallel (>= 0.5.13)
rspec (>= 3.1.0) rspec (>= 3.1.0)
platform-api (2.2.0) platform-api (3.0.0)
heroics (~> 0.0.25) heroics (~> 0.1.1)
moneta (~> 1.0.0) moneta (~> 1.0.0)
rake (12.3.3) rate_throttle_client (~> 0.1.0)
repl_runner (0.0.3) rake (13.0.1)
activesupport rate_throttle_client (0.1.2)
rrrretry (1.0.0) rrrretry (1.0.0)
rspec (3.8.0) rspec (3.9.0)
rspec-core (~> 3.8.0) rspec-core (~> 3.9.0)
rspec-expectations (~> 3.8.0) rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.8.0) rspec-mocks (~> 3.9.0)
rspec-core (3.8.0) rspec-core (3.9.2)
rspec-support (~> 3.8.0) rspec-support (~> 3.9.3)
rspec-expectations (3.8.1) rspec-expectations (3.9.2)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0) rspec-support (~> 3.9.0)
rspec-mocks (3.8.0) rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0) rspec-support (~> 3.9.0)
rspec-retry (0.6.1) rspec-retry (0.6.2)
rspec-core (> 3.3) rspec-core (> 3.3)
rspec-support (3.8.0) rspec-support (3.9.3)
thor (0.20.3) thor (1.0.1)
thread_safe (0.3.6)
threaded (0.0.4) threaded (0.0.4)
tzinfo (1.2.7)
thread_safe (~> 0.1)
zeitwerk (2.3.0)
PLATFORMS PLATFORMS
ruby ruby
Makefile
+34 -26
View File
@@ -1,15 +1,18 @@
# These targets are not files # These targets are not files
.PHONY: check test buildenv-heroku-16 buildenv-heroku-18 tools .PHONY: check test builder-image buildenv deploy-runtimes tools
STACK ?= heroku-18 STACK ?= heroku-18
STACKS ?= cedar-14 heroku-16 heroku-18
TEST_CMD ?= test/run-versions && test/run-features && test/run-deps TEST_CMD ?= test/run-versions && test/run-features && test/run-deps
ENV_FILE ?= builds/dockerenv.default
BUILDER_IMAGE_PREFIX := heroku-python-build
ifeq ($(STACK),cedar-14) ifeq ($(STACK),cedar-14)
# Cedar-14 doesn't have a build image varient. # Cedar-14 doesn't have a build image varient.
IMAGE_TAG := heroku/cedar:14 STACK_IMAGE_TAG := heroku/cedar:14
else else
# Converts a stack name of `heroku-NN` to its build Docker image tag of `heroku/heroku:NN-build`. # Converts a stack name of `heroku-NN` to its build Docker image tag of `heroku/heroku:NN-build`.
IMAGE_TAG := heroku/$(subst -,:,$(STACK))-build STACK_IMAGE_TAG := heroku/$(subst -,:,$(STACK))-build
endif endif
check: check:
@@ -19,37 +22,42 @@ check:
test: test:
@echo "Running tests using: STACK=$(STACK) TEST_CMD='$(TEST_CMD)'" @echo "Running tests using: STACK=$(STACK) TEST_CMD='$(TEST_CMD)'"
@echo ""
@docker run --rm -it -v $(PWD):/buildpack:ro -e "STACK=$(STACK)" "$(IMAGE_TAG)" bash -c 'cp -r /buildpack /buildpack_test && cd /buildpack_test && $(TEST_CMD)'
@echo ""
buildenv-heroku-16:
@echo "Creating build environment (heroku-16)..."
@echo @echo
@docker build --pull -f $(shell pwd)/builds/heroku-16.Dockerfile -t python-buildenv-heroku-16 . @docker run --rm -it -v $(PWD):/buildpack:ro -e "STACK=$(STACK)" "$(STACK_IMAGE_TAG)" bash -c 'cp -r /buildpack /buildpack_test && cd /buildpack_test && $(TEST_CMD)'
@echo
builder-image:
@echo "Generating binary builder image for $(STACK)..."
@echo
@docker build --pull -f builds/$(STACK).Dockerfile -t "$(BUILDER_IMAGE_PREFIX)-$(STACK)" .
@echo
buildenv: builder-image
@echo "Starting build environment for $(STACK)..."
@echo @echo
@echo "Usage..." @echo "Usage..."
@echo @echo
@echo " $$ export AWS_ACCESS_KEY_ID=foo AWS_SECRET_ACCESS_KEY=bar # Optional unless deploying" @echo " $$ bob build runtimes/python-X.Y.Z"
@echo " $$ bob build runtimes/python-2.7.13"
@echo " $$ bob deploy runtimes/python-2.7.13"
@echo @echo
@docker run -it --rm python-buildenv-heroku-16 @docker run --rm -it --env-file="$(ENV_FILE)" -v $(PWD)/builds:/app/builds "$(BUILDER_IMAGE_PREFIX)-$(STACK)" bash
buildenv-heroku-18: deploy-runtimes:
@echo "Creating build environment (heroku-18)..." ifndef RUNTIMES
$(error No runtimes specified! Use: "make deploy-runtimes RUNTIMES='python-X.Y.Z ...' [STACKS='heroku-18 ...'] [ENV_FILE=...]")
endif
@echo "Using: RUNTIMES='$(RUNTIMES)' STACKS='$(STACKS)' ENV_FILE='$(ENV_FILE)'"
@echo @echo
@docker build --pull -f $(shell pwd)/builds/heroku-18.Dockerfile -t python-buildenv-heroku-18 . @set -eu; for stack in $(STACKS); do \
@echo $(MAKE) builder-image STACK=$${stack}; \
@echo "Usage..." for runtime in $(RUNTIMES); do \
@echo echo "Generating/deploying $${runtime} for $${stack}..."; \
@echo " $$ export AWS_ACCESS_KEY_ID=foo AWS_SECRET_ACCESS_KEY=bar # Optional unless deploying" echo; \
@echo " $$ bob build runtimes/python-2.7.13" docker run --rm -it --env-file="$(ENV_FILE)" "$(BUILDER_IMAGE_PREFIX)-$${stack}" bob deploy "runtimes/$${runtime}"; \
@echo " $$ bob deploy runtimes/python-2.7.13" echo; \
@echo done; \
@docker run -it --rm python-buildenv-heroku-18 done
tools: tools:
git clone https://github.com/kennethreitz/pip-pop.git git clone https://github.com/kennethreitz/pip-pop.git
mv pip-pop/bin/* vendor/pip-pop/ mv pip-pop/bin/* vendor/pip-pop/
rm -fr pip-pop rm -rf pip-pop
README.md
+8 -7
View File
@@ -2,7 +2,7 @@
# Heroku Buildpack: Python # 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. This is the official [Heroku buildpack](https://devcenter.heroku.com/articles/buildpacks) for Python apps.
@@ -16,7 +16,7 @@ See it in Action
$ ls $ ls
my-application requirements.txt runtime.txt my-application requirements.txt runtime.txt
$ git push heroku master $ git push heroku main
Counting objects: 4, done. Counting objects: 4, done.
Delta compression using up to 8 threads. Delta compression using up to 8 threads.
Compressing objects: 100% (2/2), done. Compressing objects: 100% (2/2), done.
@@ -26,7 +26,7 @@ remote: Compressing source files... done.
remote: Building source: remote: Building source:
remote: remote:
remote: -----> Python app detected remote: -----> Python app detected
remote: -----> Installing python-3.7.4 remote: -----> Installing python
remote: -----> Installing pip remote: -----> Installing pip
remote: -----> Installing SQLite3 remote: -----> Installing SQLite3
remote: -----> Installing requirements with pip 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. 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`. 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`. 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,10 @@ Specify a Python Runtime
Supported runtime options include: Supported runtime options include:
- `python-3.8.5` - `python-3.9.0`
- `python-3.7.8` - `python-3.8.6`
- `python-3.6.11` - `python-3.7.9`
- `python-3.6.12`
- `python-2.7.18` - `python-2.7.18`
## Tests ## Tests
bin/compile
+26 -13
View File
@@ -37,23 +37,27 @@ ENV_DIR=$3
# Export Path variables, for use in sub-scripts. # Export Path variables, for use in sub-scripts.
export BUILD_DIR CACHE_DIR ENV_DIR export BUILD_DIR CACHE_DIR ENV_DIR
# Set the Buildpack's internet target for downloading Python distributions. # Set the base URL for downloading buildpack assets like Python runtimes.
# The user can provide BUILDPACK_VENDOR_URL to specify a custom target. # The user can provide BUILDPACK_S3_BASE_URL to specify a custom target.
# Note: this is designed for non-Heroku use, as it does not use the user-provided # Note: this is designed for non-Heroku use, as it does not use the user-provided
# environment variable mechanism (the ENV_DIR). # environment variable mechanism (the ENV_DIR).
VENDOR_URL="https://lang-python.s3.amazonaws.com/$STACK" if [[ "${STACK}" == "cedar-14" ]]; then
if [[ -n ${BUILDPACK_VENDOR_URL:-} ]]; then # Since Cedar-14 is EOL on 2020-11-02 it's not worth migrating it to the new bucket.
VENDOR_URL="$BUILDPACK_VENDOR_URL" DEFAULT_S3_BASE_URL='https://lang-python.s3.amazonaws.com'
elif [[ -n ${USE_STAGING_BINARIES} ]]; then else
VENDOR_URL="$USE_STAGING_BINARIES/$STACK" DEFAULT_S3_BASE_URL='https://heroku-buildpack-python.s3.amazonaws.com'
fi fi
export VENDOR_URL S3_BASE_URL="${BUILDPACK_S3_BASE_URL:-${DEFAULT_S3_BASE_URL}}"
# This has to be exported since it's used by the geo-libs step which is run in a subshell.
# TODO: Stop exporting once the geo-libs step is removed or no longer uses `sub_env`.
export S3_BASE_URL
# Default Python Versions # Default Python Versions
# shellcheck source=bin/default_pythons # shellcheck source=bin/default_pythons
source "$BIN_DIR/default_pythons" source "$BIN_DIR/default_pythons"
# Supported Python Branches # Supported Python Branches
PY39="python-3.9"
PY38="python-3.8" PY38="python-3.8"
PY37="python-3.7" PY37="python-3.7"
PY36="python-3.6" PY36="python-3.6"
@@ -137,6 +141,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 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 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 # The Application Code
# -------------------- # --------------------
@@ -185,7 +193,7 @@ source "$BIN_DIR/steps/hooks/pre_compile"
# continue to use that version of Python in perpituity (warnings will be raised if # continue to use that version of Python in perpituity (warnings will be raised if
# they are out–of–date). # they are out–of–date).
if [ -f "$CACHE_DIR/.heroku/python-version" ]; then 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 fi
# We didn't always record the stack version. This code is in place because of that. # We didn't always record the stack version. This code is in place because of that.
@@ -202,9 +210,14 @@ fi
# shellcheck source=bin/steps/pipenv-python-version # shellcheck source=bin/steps/pipenv-python-version
source "$BIN_DIR/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
if [ ! -f runtime.txt ]; then mcount "version.reason.python.specified"
echo "$DEFAULT_PYTHON_VERSION" > runtime.txt 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 fi
# Create the directory for .profile.d, if it doesn't exist. # Create the directory for .profile.d, if it doesn't exist.
@@ -300,7 +313,7 @@ mtime "nltk.download.time" "${start}"
# and copying it into the proper place (the logical place to do this was early, but it must be done here). # and copying it into the proper place (the logical place to do this was early, but it must be done here).
# In CI, $BUILD_DIR is /app. # In CI, $BUILD_DIR is /app.
if [[ ! "$BUILD_DIR" == "/app" ]]; then if [[ ! "$BUILD_DIR" == "/app" ]]; then
rm -fr "$BUILD_DIR/.heroku/src" rm -rf "$BUILD_DIR/.heroku/src"
deep-cp /app/.heroku/src "$BUILD_DIR/.heroku/src" deep-cp /app/.heroku/src "$BUILD_DIR/.heroku/src"
fi fi
bin/default_pythons
+8 -7
View File
@@ -5,12 +5,13 @@
# the env vars to subprocesses. # the env vars to subprocesses.
# shellcheck disable=2034 # shellcheck disable=2034
DEFAULT_PYTHON_VERSION="python-3.6.11" DEFAULT_PYTHON_VERSION="python-3.6.12"
LATEST_38="python-3.8.5" LATEST_39="python-3.9.0"
LATEST_37="python-3.7.8" LATEST_38="python-3.8.6"
LATEST_36="python-3.6.11" LATEST_37="python-3.7.9"
LATEST_35="python-3.5.9" LATEST_36="python-3.6.12"
LATEST_35="python-3.5.10"
LATEST_34="python-3.4.10" LATEST_34="python-3.4.10"
LATEST_27="python-2.7.18" LATEST_27="python-2.7.18"
PYPY_36="pypy3.6-7.3.1" LATEST_PYPY_36="pypy3.6-7.3.2"
PYPY_27="pypy2.7-7.3.1" LATEST_PYPY_27="pypy2.7-7.3.2"
bin/steps/gdal
+5 -2
View File
@@ -10,7 +10,7 @@
# This script is invoked by [`bin/compile`](/). # This script is invoked by [`bin/compile`](/).
# The location of the pre-compiled cryptography binary. # The location of the pre-compiled cryptography binary.
VENDORED_GDAL="${VENDOR_URL}/libraries/vendor/gdal.tar.gz" VENDORED_GDAL="${S3_BASE_URL}/${STACK}/libraries/vendor/gdal.tar.gz"
PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
@@ -21,8 +21,11 @@ source "$BIN_DIR/utils"
# If GDAL exists within requirements, use vendored gdal. # If GDAL exists within requirements, use vendored gdal.
if (pip-grep -s requirements.txt GDAL gdal pygdal &> /dev/null) then if (pip-grep -s requirements.txt GDAL gdal pygdal &> /dev/null) then
if [ ! -f ".heroku/vendor/bin/gdalserver" ]; then if [[ ! -f ".heroku/vendor/bin/gdalserver" && "${STACK}" == 'heroku-20' ]]; then
puts-warn "The buildpack's built-in GDAL functonality is not supported on Heroku-20."
puts-warn "Please use this buildpack instead: https://github.com/heroku/heroku-geo-buildpack"
elif [[ ! -f ".heroku/vendor/bin/gdalserver" ]]; then
puts-warn "The vendored GDAL package in the Heroku Python Buildpack now deprecated." puts-warn "The vendored GDAL package in the Heroku Python Buildpack now deprecated."
puts-warn "To enable GDAL use an alternative buildpack is available here - https://github.com/heroku/heroku-geo-buildpack" puts-warn "To enable GDAL use an alternative buildpack is available here - https://github.com/heroku/heroku-geo-buildpack"
bin/steps/geo-libs
+8 -5
View File
@@ -10,9 +10,9 @@
# This script is invoked by [`bin/compile`](/). # This script is invoked by [`bin/compile`](/).
# The location of the pre-compiled cryptography binary. # The location of the pre-compiled cryptography binary.
VENDORED_GDAL="${VENDOR_URL}/libraries/vendor/gdal.tar.gz" VENDORED_GDAL="${S3_BASE_URL}/${STACK}/libraries/vendor/gdal.tar.gz"
VENDORED_GEOS="${VENDOR_URL}/libraries/vendor/geos.tar.gz" VENDORED_GEOS="${S3_BASE_URL}/${STACK}/libraries/vendor/geos.tar.gz"
VENDORED_PROJ="${VENDOR_URL}/libraries/vendor/proj.tar.gz" VENDORED_PROJ="${S3_BASE_URL}/${STACK}/libraries/vendor/proj.tar.gz"
PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
@@ -20,8 +20,11 @@ PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
# shellcheck source=bin/utils # shellcheck source=bin/utils
source "$BIN_DIR/utils" source "$BIN_DIR/utils"
# If GDAL exists within requirements, use vendored gdal. if [[ "$BUILD_WITH_GEO_LIBRARIES" && "${STACK}" == 'heroku-20' ]]; then
if [[ "$BUILD_WITH_GEO_LIBRARIES" ]]; then puts-warn "The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functonality is not supported on Heroku-20."
puts-warn "Please use this buildpack for GDAL, GEOS and PROJ: https://github.com/heroku/heroku-geo-buildpack"
puts-warn "To hide this message, unset the BUILD_WITH_GEO_LIBRARIES variable using: heroku config:unset BUILD_WITH_GEO_LIBRARIES"
elif [[ "$BUILD_WITH_GEO_LIBRARIES" ]]; then
mcount "buildvar.BUILD_WITH_GEO_LIBRARIES" mcount "buildvar.BUILD_WITH_GEO_LIBRARIES"
puts-warn "The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functonality are now deprecated." puts-warn "The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functonality are now deprecated."
bin/steps/pip-uninstall
+1 -1
View File
@@ -16,7 +16,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
mcount "failure.bad-requirements" mcount "failure.bad-requirements"
fi fi
rm -fr requirements-declared.txt rm -rf requirements-declared.txt
if [[ -s .heroku/python/requirements-stale.txt ]]; then if [[ -s .heroku/python/requirements-stale.txt ]]; then
puts-step "Uninstalling stale dependencies" puts-step "Uninstalling stale dependencies"
bin/steps/pipenv
+1 -4
View File
@@ -9,10 +9,7 @@ set -e
if [[ -f Pipfile.lock ]]; then if [[ -f Pipfile.lock ]]; then
if [[ -f .heroku/python/Pipfile.lock.sha256 ]]; then if [[ -f .heroku/python/Pipfile.lock.sha256 ]]; then
if [[ $(openssl dgst -sha256 Pipfile.lock) == $(cat .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. # Don't skip installation if there are git deps.
mcount "tool.pipenv"
# Don't skip installation of there are git deps.
if ! grep -q 'git' Pipfile.lock; then if ! grep -q 'git' Pipfile.lock; then
echo "Skipping installation, as Pipfile.lock hasn't changed since last deploy." | indent echo "Skipping installation, as Pipfile.lock hasn't changed since last deploy." | indent
bin/steps/pipenv-python-version
+3
View File
@@ -30,6 +30,9 @@ if [[ -f $BUILD_DIR/Pipfile ]]; then
if [ "$PYTHON" = 3.8 ]; then if [ "$PYTHON" = 3.8 ]; then
echo "$LATEST_38" > "$BUILD_DIR/runtime.txt" echo "$LATEST_38" > "$BUILD_DIR/runtime.txt"
fi fi
if [ "$PYTHON" = 3.9 ]; then
echo "$LATEST_39" > "$BUILD_DIR/runtime.txt"
fi
fi fi
bin/steps/pylibmc
+1 -1
View File
@@ -15,7 +15,7 @@ if [[ "$STACK" != "cedar-14" ]]; then
fi fi
# The location of the pre-compiled libmemcached binary. # The location of the pre-compiled libmemcached binary.
VENDORED_MEMCACHED="${VENDOR_URL}/libraries/vendor/libmemcache.tar.gz" VENDORED_MEMCACHED="${S3_BASE_URL}/${STACK}/libraries/vendor/libmemcache.tar.gz"
# Syntax sugar. # Syntax sugar.
# shellcheck source=bin/utils # shellcheck source=bin/utils
bin/steps/python
+28 -17
View File
@@ -5,9 +5,10 @@ runtime-fixer runtime.txt
PYTHON_VERSION=$(cat runtime.txt) PYTHON_VERSION=$(cat runtime.txt)
# The location of the pre-compiled python binary. # The location of the pre-compiled python binary.
VENDORED_PYTHON="${VENDOR_URL}/runtimes/$PYTHON_VERSION.tar.gz" VENDORED_PYTHON="${S3_BASE_URL}/${STACK}/runtimes/${PYTHON_VERSION}.tar.gz"
SECURITY_UPDATE="Python has released a security update! Please consider upgrading to" 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" ONLY_SUPPORTED_2_VERSION="Only the latest version of Python 2 is supported on the platform. Please consider upgrading to"
@@ -15,6 +16,12 @@ PYTHON_2_EOL_UPDATE="Python 2 has reached it's community EOL. Upgrade your Pytho
# check if runtime exists # check if runtime exists
if curl --output /dev/null --silent --head --fail "$VENDORED_PYTHON"; then if curl --output /dev/null --silent --head --fail "$VENDORED_PYTHON"; then
if [[ "$PYTHON_VERSION" == $PY39* ]]; then
if [ "$PYTHON_VERSION" != "$LATEST_39" ]; then
puts-warn "$SECURITY_UPDATE" "$LATEST_39"
echo " Learn More: https://devcenter.heroku.com/articles/python-runtimes"
fi
fi
if [[ "$PYTHON_VERSION" == $PY38* ]]; then if [[ "$PYTHON_VERSION" == $PY38* ]]; then
# do things to alert the user of security release available # do things to alert the user of security release available
if [ "$PYTHON_VERSION" != "$LATEST_38" ]; then if [ "$PYTHON_VERSION" != "$LATEST_38" ]; then
@@ -51,11 +58,9 @@ if curl --output /dev/null --silent --head --fail "$VENDORED_PYTHON"; then
fi fi
fi fi
if [[ "$PYTHON_VERSION" == $PY27* ]]; then 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 # 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 if [ "$PYTHON_VERSION" != "$LATEST_27" ]; then
puts-warn "$ONLY_SUPPORTED_2_VERSION" "$LATEST_27" puts-warn "$ONLY_SUPPORTED_2_VERSION" "$LATEST_27"
echo " Learn More: https://devcenter.heroku.com/articles/python-runtimes" echo " Learn More: https://devcenter.heroku.com/articles/python-runtimes"
@@ -63,15 +68,15 @@ if curl --output /dev/null --silent --head --fail "$VENDORED_PYTHON"; then
fi fi
if [[ "$PYTHON_VERSION" == $PYPY27* ]]; then if [[ "$PYTHON_VERSION" == $PYPY27* ]]; then
# security update note # security update note
if [ "$PYTHON_VERSION" != "$PYPY_27" ]; then if [ "$PYTHON_VERSION" != "$LATEST_PYPY_27" ]; then
puts-warn "Could not find that Pypy version. Did you mean" "${PYPY_27}?" puts-warn "$SECURITY_UPDATE_PYPY" "$LATEST_PYPY_27"
echo " Learn More: https://devcenter.heroku.com/articles/python-runtimes" echo " Learn More: https://devcenter.heroku.com/articles/python-runtimes"
fi fi
fi fi
if [[ "$PYTHON_VERSION" == $PYPY36* ]]; then if [[ "$PYTHON_VERSION" == $PYPY36* ]]; then
# security update note # security update note
if [ "$PYTHON_VERSION" != "$PYPY_36" ]; then if [ "$PYTHON_VERSION" != "$LATEST_PYPY_36" ]; then
puts-warn "Could not find that Pypy version. Did you mean" "${PYPY_36}?" puts-warn "$SECURITY_UPDATE_PYPY" "$LATEST_PYPY_36"
echo " Learn More: https://devcenter.heroku.com/articles/python-runtimes" echo " Learn More: https://devcenter.heroku.com/articles/python-runtimes"
fi fi
fi fi
@@ -81,15 +86,17 @@ else
exit 1 exit 1
fi fi
mcount "version.python.${PYTHON_VERSION}"
if [[ "$STACK" != "$CACHED_PYTHON_STACK" ]]; then if [[ "$STACK" != "$CACHED_PYTHON_STACK" ]]; then
puts-step "Stack has changed from $CACHED_PYTHON_STACK to $STACK, clearing cache" 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 rm -rf .heroku/python-stack .heroku/python-version .heroku/python .heroku/vendor .heroku/python .heroku/python-sqlite3-version
fi fi
if [ -f .heroku/python-version ]; then if [ -f .heroku/python-version ]; then
if [ ! "$(cat .heroku/python-version)" = "$PYTHON_VERSION" ]; then if [ ! "$(cat .heroku/python-version)" = "$PYTHON_VERSION" ]; then
puts-step "Found $(cat .heroku/python-version), removing" puts-step "Found $(cat .heroku/python-version), removing"
rm -fr .heroku/python rm -rf .heroku/python
else else
SKIP_INSTALL=1 SKIP_INSTALL=1
fi fi
@@ -120,8 +127,6 @@ if [ ! "$SKIP_INSTALL" ]; then
# Prepare destination directory. # Prepare destination directory.
mkdir -p .heroku/python mkdir -p .heroku/python
mcount "version.python.$PYTHON_VERSION"
if ! curl "${VENDORED_PYTHON}" -s | tar zxv -C .heroku/python &> /dev/null; then 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 "Requested runtime ($PYTHON_VERSION) is not available for this stack ($STACK)."
puts-warn "Aborting. More info: https://devcenter.heroku.com/articles/python-support" puts-warn "Aborting. More info: https://devcenter.heroku.com/articles/python-support"
@@ -137,14 +142,20 @@ fi
set -e set -e
PIP_VERSION='20.0.2' PIP_VERSION='20.1.1'
SETUPTOOLS_VERSION='39.0.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' WHEEL_VERSION='0.34.2'
if [[ "${PYTHON_VERSION}" == ${PY34}* ]]; then 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' PIP_VERSION='19.1.1'
SETUPTOOLS_VERSION='43.0.0'
WHEEL_VERSION='0.33.6' 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 fi
# We don't use get-pip.py, since: # We don't use get-pip.py, since:
@@ -155,7 +166,7 @@ fi
# Instead, we use the pip wheel to install itself, using the method described here: # Instead, we use the pip wheel to install itself, using the method described here:
# https://github.com/pypa/pip/issues/2351#issuecomment-69994524 # https://github.com/pypa/pip/issues/2351#issuecomment-69994524
PIP_WHEEL_FILENAME="pip-${PIP_VERSION}-py2.py3-none-any.whl" PIP_WHEEL_FILENAME="pip-${PIP_VERSION}-py2.py3-none-any.whl"
PIP_WHEEL_URL="https://lang-python.s3.amazonaws.com/common/${PIP_WHEEL_FILENAME}" PIP_WHEEL_URL="${S3_BASE_URL}/common/${PIP_WHEEL_FILENAME}"
PIP_WHEEL="${TMPDIR:-/tmp}/${PIP_WHEEL_FILENAME}" PIP_WHEEL="${TMPDIR:-/tmp}/${PIP_WHEEL_FILENAME}"
if ! curl -sSf "${PIP_WHEEL_URL}" -o "$PIP_WHEEL"; then if ! curl -sSf "${PIP_WHEEL_URL}" -o "$PIP_WHEEL"; then
builds/README.md
+61 -38
View File
@@ -1,57 +1,80 @@
# Python Buildpack Binaries # Python Buildpack Binaries
## Building the Docker Images The binaries for this buildpack are built in Docker containers based on the Heroku stack image.
**After every change to your formulae, perform the following** from the root of the Git repository (not from `builds/`) to rebuild the images for each stack:
$ docker build --pull --tag heroku-python-build-cedar-14 --file $(pwd)/builds/cedar-14.Dockerfile .
$ docker build --pull --tag heroku-python-build-heroku-16 --file $(pwd)/builds/heroku-16.Dockerfile .
$ docker build --pull --tag heroku-python-build-heroku-18 --file $(pwd)/builds/heroku-18.Dockerfile .
## Using the Image
You can e.g. `bash` into each of the images you built using their tag:
docker run --rm -ti heroku-python-build-cedar-14 bash
docker run --rm -ti heroku-python-build-heroku-16 bash
docker run --rm -ti heroku-python-build-heroku-18 bash
You then have a shell where you can run `bob build`, `bob deploy`, and so forth. You can of course also invoke these programs directly with `docker run`:
docker run --rm -ti heroku-python-build-heroku-18 bob build runtimes/python-2.7.15
In order to `bob deploy`, AWS credentials must be set up, as well as name and prefix of your custom S3 bucket (unless you're deploying to the Heroku production buckets that are pre-defined in each `Dockerfile`); see next section for details.
## Configuration ## Configuration
File `dockerenv.default` contains a list of required env vars; most of these have default values defined in `Dockerfile`. You can copy this file to a location outside the buildpack and modify it with the values you desire and pass its location with `--env-file`, or pass the env vars to `docker run` using `--env`. In order to publish binaries AWS credentials must be passed to the build container.
If you are testing only the build (ie: `bob build`), these are optional.
Out of the box, each `Dockerfile` has the correct values predefined for `S3_BUCKET`, `S3_PREFIX`, and `S3_REGION`. If you're building your own packages, you'll likely want to change `S3_BUCKET` and `S3_PREFIX` to match your info. Instead of setting `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` into that file, you may also pass them to `docker run` through the environment, or explicitly using `--env`, in order to prevent accidental commits of credentials. In addition, unless you are building the official binaries for Heroku (which use the defaults
specified in each `Dockerfile`), you will need to override `S3_BUCKET` and `S3_PREFIX` to
match your own S3 bucket/use case.
### Passing AWS credentials to the container If you only need to set AWS credentials, you can do so by setting the environment variables
`AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` before calling the make commands.
If you want to deploy packages and thus need to pass `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`, you can either pass them explicitly, through your environment, or through an env file. For example:
#### Passing credentials explicitly ```bash
set +o history # Disable bash history
export AWS_ACCESS_KEY_ID=...
export AWS_SECRET_ACCESS_KEY=...
set -o history # Re-enable bash history
make ...
```
docker run --rm -ti -e AWS_ACCESS_KEY_ID=... -e AWS_SECRET_ACCESS_KEY=... heroku-python-build-heroku-18 bash If you need to override the default S3 bucket, or would prefer not to use credentials via
environment variables, then you need to instead use a Docker env file like so:
#### Passing credentials through the environment 1. Copy the `builds/dockerenv.default` env file to a location outside the buildpack repository.
2. Edit the new file, adding at a minimum the values for the variables
`AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` (see Docker
[env-file documentation](https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file)).
3. Pass the path of the file to the make commands using `ENV_FILE`. For example:
The two environment variables `AWS_ACCESS_KEY_ID`and `AWS_SECRET_ACCESS_KEY` are defined in `builds/dockerenv.default`, without values. This will cause Docker to "forward" values for these variables from the current environment, so you can pass them in: ```bash
make ... ENV_FILE=~/.dockerenv.python-buildpack
```
AWS_ACCESS_KEY_ID=... AWS_SECRET_ACCESS_KEY=... docker run --rm -ti --env-file=builds/dockerenv.default heroku-python-build-heroku-18 bash ## Launching an interactive build environment
or To start an interactive version of the build environment (ideal for development) use the
`buildenv` make target, passing in the desired `STACK` name. For example:
export AWS_ACCESS_KEY_ID=... ```bash
export AWS_SECRET_ACCESS_KEY=... make buildenv STACK=heroku-18
docker run --rm -ti --env-file=builds/dockerenv.default heroku-python-build-heroku-18 bash ```
#### Passing credentials through a separate env file This will create the builder docker image based on the latest image for that stack, and
then start a bash shell where you can run `bob build`, `bob deploy`, and so forth.
This method is the easiest for users who want to build packages in their own S3 bucket, as they will have to adjust the `S3_BUCKET` and `S3_PREFIX` environment variable values anyway from their default values. The `builds/` directory is bind-mounted into the running container, so local build formula
changes will appear there immediately without the need to rebuild the image.
For this method, it is important to keep the credentials file in a location outside the buildpack, so that your credentials aren't accidentally committed. Copy `builds/dockerenv.default` **to a safe location outside the buildpack directory**, and insert your values for `AWS_ACCESS_KEY_ID`and `AWS_SECRET_ACCESS_KEY`. ## Bulk deploying runtimes
docker run --rm -ti --env-file=../SOMEPATHOUTSIDE/s3.env heroku-python-build-heroku-18 bash When a new Python version is released, binaries have to be generated for multiple stacks.
To automate this, use the `deploy-runtimes` make target, which will ensure the builder
image is up to date, and then run `bob deploy` for each runtime-stack combination.
The build formula name(s) are passed using `RUNTIMES`, like so:
```bash
make deploy-runtimes RUNTIMES='python-X.Y.Z'
```
By default this will deploy to all supported stacks (see `STACKS` in `Makefile`),
but this can be overridden using `STACKS`:
```bash
make deploy-runtimes RUNTIMES='python-X.Y.Z' STACKS='heroku-16 heroku-18'
```
Multiple runtimes can also be specified (useful for when adding a new stack), like so:
```bash
make deploy-runtimes RUNTIMES='python-A.B.C python-X.Y.Z' STACKS='heroku-20'
```
Note: Both `RUNTIMES` and `STACKS` are space delimited.
builds/cedar-14.Dockerfile
+10 -4
View File
@@ -1,15 +1,21 @@
FROM heroku/cedar:14 FROM heroku/cedar:14
WORKDIR /app
ENV WORKSPACE_DIR="/app/builds" \ ENV WORKSPACE_DIR="/app/builds" \
S3_BUCKET="lang-python" \ S3_BUCKET="lang-python" \
S3_PREFIX="cedar-14/" \ S3_PREFIX="cedar-14/" \
DEBIAN_FRONTEND=noninteractive \
STACK="cedar-14" STACK="cedar-14"
RUN apt-get update && apt-get install -y python-pip libsqlite3-dev realpath && rm -rf /var/lib/apt/lists/* RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
libsqlite3-dev \
python3-pip \
realpath \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /app
COPY requirements.txt /app/ COPY requirements.txt /app/
RUN pip install -r /app/requirements.txt # Can't use `--disable-pip-version-check --no-cache-dir` since not supported by Ubuntu 14.04's pip.
RUN pip3 install -r /app/requirements.txt
COPY . /app COPY . /app
builds/dockerenv.default
+6 -3
View File
@@ -1,5 +1,8 @@
# Since no values are specified here, these variables will be read from the environment at run time:
# https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file
AWS_ACCESS_KEY_ID AWS_ACCESS_KEY_ID
AWS_SECRET_ACCESS_KEY AWS_SECRET_ACCESS_KEY
S3_BUCKET
S3_PREFIX # Uncomment these if you need to override the default S3 bucket and/or path prefixes.
S3_REGION # S3_BUCKET
# S3_PREFIX
builds/heroku-16.Dockerfile
+10 -5
View File
@@ -1,15 +1,20 @@
FROM heroku/heroku:16-build FROM heroku/heroku:16-build
WORKDIR /app
ENV WORKSPACE_DIR="/app/builds" \ ENV WORKSPACE_DIR="/app/builds" \
S3_BUCKET="lang-python" \ S3_BUCKET="heroku-buildpack-python" \
S3_PREFIX="heroku-16/" \ S3_PREFIX="heroku-16/" \
DEBIAN_FRONTEND=noninteractive \
STACK="heroku-16" STACK="heroku-16"
RUN apt-get update && apt-get install -y python-pip libsqlite3-dev && rm -rf /var/lib/apt/lists/* RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
libsqlite3-dev \
python3-pip \
python3-setuptools \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /app
COPY requirements.txt /app/ COPY requirements.txt /app/
RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt RUN pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt
COPY . /app COPY . /app
builds/heroku-18.Dockerfile
+10 -5
View File
@@ -1,15 +1,20 @@
FROM heroku/heroku:18-build FROM heroku/heroku:18-build
WORKDIR /app
ENV WORKSPACE_DIR="/app/builds" \ ENV WORKSPACE_DIR="/app/builds" \
S3_BUCKET="lang-python" \ S3_BUCKET="heroku-buildpack-python" \
S3_PREFIX="heroku-18/" \ S3_PREFIX="heroku-18/" \
DEBIAN_FRONTEND=noninteractive \
STACK="heroku-18" STACK="heroku-18"
RUN apt-get update && apt-get install --no-install-recommends -y python-pip-whl=9.0.1-2 python-pip=9.0.1-2 python-setuptools python-wheel libsqlite3-dev && rm -rf /var/lib/apt/lists/* RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
libsqlite3-dev \
python3-pip \
python3-setuptools \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /app
COPY requirements.txt /app/ COPY requirements.txt /app/
RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt RUN pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt
COPY . /app COPY . /app
builds/heroku-20.Dockerfile
+20
View File
@@ -0,0 +1,20 @@
FROM heroku/heroku:20-build
ENV WORKSPACE_DIR="/app/builds" \
S3_BUCKET="heroku-buildpack-python" \
S3_PREFIX="heroku-20/" \
STACK="heroku-20"
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
libsqlite3-dev \
python3-pip \
python3-setuptools \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /app
COPY requirements.txt /app/
RUN pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt
COPY . /app
builds/libraries/sqlite
+1 -1
View File
@@ -19,4 +19,4 @@ make install
# Cleanup # Cleanup
cd .. cd ..
rm -fr sqlite rm -rf sqlite
builds/runtimes/pypy2.7
+2 -2
View File
@@ -13,11 +13,11 @@ dep_version=${dep_formula##*"/${dep_name}-"} # "subtract" our name from full ver
dep_package=${dep_name}-v${dep_version} # it's always "pypy2-…" dep_package=${dep_name}-v${dep_version} # it's always "pypy2-…"
dep_dirname=${dep_package}-linux64 dep_dirname=${dep_package}-linux64
dep_archive_name=${dep_dirname}.tar.bz2 dep_archive_name=${dep_dirname}.tar.bz2
dep_url=https://bitbucket.org/pypy/pypy/downloads/${dep_archive_name} dep_url="https://downloads.python.org/pypy/${dep_archive_name}"
echo "Building PyPy…" echo "Building PyPy…"
echo "${dep_url}" echo "${dep_url}"
curl -L "${dep_url}" | tar jx -C "${OUT_PREFIX}" --strip-components 1 # extract to $OUT_PREFIX, drop the first directory level, which is the archive name curl -fL "${dep_url}" | tar jx -C "${OUT_PREFIX}" --strip-components 1 # extract to $OUT_PREFIX, drop the first directory level, which is the archive name
ln "$OUT_PREFIX/bin/pypy" "$OUT_PREFIX/bin/python" ln "$OUT_PREFIX/bin/pypy" "$OUT_PREFIX/bin/python"
builds/runtimes/pypy2.7-7.3.2
Executable
+4
View File
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/
source $(dirname $0)/pypy2.7
builds/runtimes/pypy3.6
+2 -2
View File
@@ -13,11 +13,11 @@ dep_version=${dep_formula##*"/${dep_name}-"} # "subtract" our name from full ver
dep_package=${dep_name}${dep_version_prefix:-}-v${dep_version}${dep_version_suffix:-} dep_package=${dep_name}${dep_version_prefix:-}-v${dep_version}${dep_version_suffix:-}
dep_dirname=${dep_package}-linux64 dep_dirname=${dep_package}-linux64
dep_archive_name=${dep_dirname}.tar.bz2 dep_archive_name=${dep_dirname}.tar.bz2
dep_url=https://bitbucket.org/pypy/pypy/downloads/${dep_archive_name} dep_url="https://downloads.python.org/pypy/${dep_archive_name}"
echo "Building PyPy3…" echo "Building PyPy3…"
echo "${dep_url}" echo "${dep_url}"
curl -L "${dep_url}" | tar jx -C "${OUT_PREFIX}" --strip-components 1 # extract to $OUT_PREFIX, drop the first directory level, which is the archive name curl -fL "${dep_url}" | tar jx -C "${OUT_PREFIX}" --strip-components 1 # extract to $OUT_PREFIX, drop the first directory level, which is the archive name
ln "$OUT_PREFIX/bin/pypy3" "$OUT_PREFIX/bin/python" ln "$OUT_PREFIX/bin/pypy3" "$OUT_PREFIX/bin/python"
builds/runtimes/pypy3.6-7.3.2
Executable
+4
View File
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/
source $(dirname $0)/pypy3.6
builds/runtimes/python-2.7.17
+1 -24
View File
@@ -1,27 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Build Path: /app/.heroku/python/ # Build Path: /app/.heroku/python/
OUT_PREFIX=$1 source $(dirname $0)/python2
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 '{}' +
builds/runtimes/python-2.7.18
+1 -24
View File
@@ -1,27 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Build Path: /app/.heroku/python/ # Build Path: /app/.heroku/python/
OUT_PREFIX=$1 source $(dirname $0)/python2
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 '{}' +
builds/runtimes/python-3.4.10
+1 -29
View File
@@ -1,32 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Build Path: /app/.heroku/python/ # Build Path: /app/.heroku/python/
OUT_PREFIX=$1 source $(dirname $0)/python3
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
builds/runtimes/python-3.4.9
+1 -29
View File
@@ -1,32 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Build Path: /app/.heroku/python/ # Build Path: /app/.heroku/python/
OUT_PREFIX=$1 source $(dirname $0)/python3
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
builds/runtimes/python-3.5.10
Executable
+4
View File
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/
source $(dirname $0)/python3
builds/runtimes/python-3.6.12
Executable
+4
View File
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/
source $(dirname $0)/python3
builds/runtimes/python-3.7.9
Executable
+4
View File
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/
source $(dirname $0)/python3
builds/runtimes/python-3.8.6
Executable
+4
View File
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/
source $(dirname $0)/python3
builds/runtimes/python-3.9.0
Executable
+4
View File
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/
source $(dirname $0)/python3
etc/ci-setup.sh
-5
View File
@@ -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
etc/publish.sh
Regular → Executable
+4 -4
View File
@@ -14,9 +14,9 @@ case "$choice" in
* ) exit 1;; * ) exit 1;;
esac esac
originMaster=$(git rev-parse origin/master) originMain=$(git rev-parse origin/main)
echo "Tagging commit $originMaster with $newVersion... " echo "Tagging commit $originMain with $newVersion... "
git tag "$newVersion" "${originMaster:?}" git tag "$newVersion" "${originMain:?}"
git push origin refs/tags/$newVersion git push origin refs/tags/$newVersion
heroku buildpacks:publish "$BP_NAME" "$newVersion" heroku buildpacks:publish "$BP_NAME" "$newVersion"
@@ -31,7 +31,7 @@ if [ $(git tag | grep -q latest-version) ]; then
echo "Updating latest-version tag" echo "Updating latest-version tag"
git tag -d latest-version git tag -d latest-version
git push origin :latest-version git push origin :latest-version
git tag latest-version "${originMaster:?}" git tag latest-version "${originMain:?}"
git push --tags git push --tags
fi fi
hatchet.lock
+1 -1
View File
@@ -1,5 +1,5 @@
--- ---
- - "./repos/python/python-getting-started" - - "./repos/python/python-getting-started"
- master - main
- - "./repos/python/python_default" - - "./repos/python/python_default"
- ca947f69027b2a30be5d26f9a42f25e54f4d7a1a - ca947f69027b2a30be5d26f9a42f25e54f4d7a1a
requirements.txt
+5 -2
View File
@@ -1,3 +1,6 @@
# Dependencies for generating/publishing Python binaries.
bob-builder==0.0.19
# Sub-dependencies of bob-builder.
boto==2.49.0
docopt==0.6.2 docopt==0.6.2
bob-builder==0.0.17
boto==2.48.0
test/fixtures/nltk/runtime.txt
Vendored
-1
View File
@@ -1 +0,0 @@
python-3.6.6
test/fixtures/pipenv-full-version/Pipfile
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ verify_ssl = true
requests = "*" requests = "*"
[requires] [requires]
python_full_version = "3.6.3" python_full_version = "3.7.8"
test/fixtures/pipenv-full-version/Pipfile.lock
Generated Vendored
+2 -15
View File
@@ -1,24 +1,11 @@
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "22a052f4d1cfe6518b2f236fe45c3208c587a9ab1323bdd390632e27278b541e" "sha256": "8a36860f0f9cb55716222098062cea5c5e0f8127cafb9d0c694de327bac9fbc0"
},
"host-environment-markers": {
"implementation_name": "cpython",
"implementation_version": "3.6.3",
"os_name": "posix",
"platform_machine": "x86_64",
"platform_python_implementation": "CPython",
"platform_release": "16.7.0",
"platform_system": "Darwin",
"platform_version": "Darwin Kernel Version 16.7.0: Thu Jun 15 17:36:27 PDT 2017; root:xnu-3789.70.16~2/RELEASE_X86_64",
"python_full_version": "3.6.3",
"python_version": "3.6",
"sys_platform": "darwin"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": { "requires": {
"python_full_version": "3.6.3" "python_full_version": "3.7.8"
}, },
"sources": [ "sources": [
{ {
test/fixtures/pypy2_7/runtime.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
pypy2.7-7.2.0 pypy2.7-7.3.2
test/fixtures/pypy2_7_warn/requirements.txt
Vendored
View File
test/fixtures/pypy2_7_warn/runtime.txt
Vendored
+1
View File
@@ -0,0 +1 @@
pypy2.7-7.3.1
test/fixtures/pypy3_6/runtime.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
pypy3.6-7.2.0 pypy3.6-7.3.2
test/fixtures/pypy3_6_warn/requirements.txt
Vendored
View File
test/fixtures/pypy3_6_warn/runtime.txt
Vendored
+1
View File
@@ -0,0 +1 @@
pypy3.6-7.3.1
test/fixtures/python2_fail/requirements.txt
Vendored
-1
View File
@@ -1 +0,0 @@
requests
test/fixtures/python2_fail/runtime.txt
Vendored
-1
View File
@@ -1 +0,0 @@
python-2.7.99
test/fixtures/python2_warn/requirements.txt
Vendored
-1
View File
@@ -1 +0,0 @@
requests
test/fixtures/python3_4_fail/requirements.txt
Vendored
-1
View File
@@ -1 +0,0 @@
flask
test/fixtures/python3_4_fail/runtime.txt
Vendored
-1
View File
@@ -1 +0,0 @@
python-3.4.99
test/fixtures/python3_4_warn/requirements.txt
Vendored
-1
View File
@@ -1 +0,0 @@
flask
test/fixtures/python3_5/runtime.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
python-3.5.9 python-3.5.10
test/fixtures/python3_5_fail/requirements.txt
Vendored
-1
View File
@@ -1 +0,0 @@
flask
test/fixtures/python3_5_fail/runtime.txt
Vendored
-1
View File
@@ -1 +0,0 @@
python-3.5.99
test/fixtures/python3_5_warn/requirements.txt
Vendored
-1
View File
@@ -1 +0,0 @@
flask
test/fixtures/python3_6/runtime.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
python-3.6.8 python-3.6.12
test/fixtures/python3_6_fail/requirements.txt
Vendored
-1
View File
@@ -1 +0,0 @@
flask
test/fixtures/python3_6_fail/runtime.txt
Vendored
-1
View File
@@ -1 +0,0 @@
python-3.6.99
test/fixtures/python3_6_warn/requirements.txt
Vendored
-1
View File
@@ -1 +0,0 @@
requests
test/fixtures/python3_6_warn/runtime.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
python-3.6.7 python-3.6.11
test/fixtures/python3_7/runtime.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
python-3.7.2 python-3.7.9
test/fixtures/python3_7_fail/requirements.txt
Vendored
-1
View File
@@ -1 +0,0 @@
flask
test/fixtures/python3_7_fail/runtime.txt
Vendored
-1
View File
@@ -1 +0,0 @@
python-3.7.99
test/fixtures/python3_7_warn/requirements.txt
Vendored
-1
View File
@@ -1 +0,0 @@
requests
test/fixtures/python3_7_warn/runtime.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
python-3.7.1 python-3.7.8
test/fixtures/python3_8/runtime.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
python-3.8.2 python-3.8.6
test/fixtures/python3_8_fail/requirements.txt
Vendored
-1
View File
@@ -1 +0,0 @@
flask
test/fixtures/python3_8_warn/requirements.txt
Vendored
-1
View File
@@ -1 +0,0 @@
requests
test/fixtures/python3_8_warn/runtime.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
python-3.8.0 python-3.8.5
test/fixtures/python3_9/requirements.txt
Vendored
View File
test/fixtures/python3_9/runtime.txt
Vendored
+1
View File
@@ -0,0 +1 @@
python-3.9.0
test/fixtures/python3_9_warn/requirements.txt
Vendored
View File
test/fixtures/python3_9_warn/runtime.txt
Vendored
+1
View File
@@ -0,0 +1 @@
python-3.9.0
test/fixtures/pythonDefault/requirements.txt
Vendored
-1
View File
@@ -1 +0,0 @@
flask
test/fixtures/python_version_invalid/requirements.txt
Vendored
View File
test/fixtures/python3_8_fail/runtime.txt → test/fixtures/python_version_invalid/runtime.txt
Vendored
View File
test/fixtures/python_version_unspecified/requirements.txt
Vendored
View File
test/run-deps
+15 -17
View File
@@ -21,16 +21,13 @@ testGEOS() {
local env_dir="$(mktmpdir)" local env_dir="$(mktmpdir)"
echo '1' > "${env_dir}/BUILD_WITH_GEO_LIBRARIES" echo '1' > "${env_dir}/BUILD_WITH_GEO_LIBRARIES"
compile 'geos' '' "${env_dir}" compile 'geos' '' "${env_dir}"
assertCaptured "geos" if [[ $STACK == "heroku-20" ]]; then
assertCapturedSuccess assertCaptured " ! The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functonality is not supported on Heroku-20."
} else
assertCaptured " ! The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functonality are now deprecated."
testGEOSDeprecation() { fi
local env_dir="$(mktmpdir)" # This should assertCapturedError on Heroku-20, but the test doesn't actually
echo '1' > "${env_dir}/BUILD_WITH_GEO_LIBRARIES" # install anything that uses GEOS so succeeds (see W-8145375)
compile 'geos' '' "${env_dir}"
assertCaptured " ! The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functonality are now deprecated.
! An alternative buildpack to enable GDAL, GEOS and PROJ use is available here - https://github.com/heroku/heroku-geo-buildpack"
assertCapturedSuccess assertCapturedSuccess
} }
@@ -43,7 +40,9 @@ testNLTK() {
echo 'ignore::RuntimeWarning' > "${env_dir}/PYTHONWARNINGS" echo 'ignore::RuntimeWarning' > "${env_dir}/PYTHONWARNINGS"
compile 'nltk' '' "${env_dir}" compile 'nltk' '' "${env_dir}"
assertCaptured "[nltk_data] Downloading package city_database" "STD_ERR" assertCaptured "[nltk_data] Downloading package city_database" "STD_ERR"
assertCapturedSuccess # Can't use `assertCapturedSuccess` since the NLTK downloader outputs all
# progress/status messages to stderr (W-8146040).
assertCapturedSuccessWithStdErr
} }
testPsycopg2() { testPsycopg2() {
@@ -53,17 +52,16 @@ testPsycopg2() {
} }
testPysqlite() { testPysqlite() {
# pysqlite does not support Python 3 (since the sqlite3 stdlib can be used there),
# so we have to test with Python 2, which we've not made available for Heroku-20.
if [[ $STACK == "heroku-20" ]]; then
return
fi
compile "pysqlite" compile "pysqlite"
assertCaptured "pysqlite" assertCaptured "pysqlite"
assertCapturedSuccess assertCapturedSuccess
} }
testSqliteInstall() {
compile "pythonDefault"
assertNotCaptured "Sqlite3 failed to install."
assertCapturedSuccess
}
testCffi() { testCffi() {
compile "cffi" compile "cffi"
assertCaptured "cffi" assertCaptured "cffi"
test/run-features
+36 -14
View File
@@ -33,7 +33,9 @@ testStackChange() {
testSetupPy() { testSetupPy() {
compile "setup-py" compile "setup-py"
assertCaptured "maya" assertCaptured "maya"
assertCapturedSuccess # Can't use `assertCapturedSuccess` since stderr contains:
# "cp: cannot stat '/tmp/build_*/requirements.txt': No such file or directory" (W-7924941)
assertCapturedSuccessWithStdErr
} }
testStandardRequirements() { testStandardRequirements() {
@@ -44,30 +46,49 @@ testStandardRequirements() {
testPipenv() { testPipenv() {
compile "pipenv" 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 # Can't use `assertCapturedSuccess` since stderr contains:
# "cp: cannot stat '/tmp/build_*/requirements.txt': No such file or directory" (W-7924941)
assertCapturedSuccessWithStdErr
} }
testPipenvLock() { testPipenvLock() {
compile "pipenv-lock" compile "pipenv-lock"
assertCapturedSuccess # Can't use `assertCapturedSuccess` since stderr contains:
# "cp: cannot stat '/tmp/build_*/requirements.txt': No such file or directory" (W-7924941)
assertCapturedSuccessWithStdErr
} }
testPipenvVersion() { testPipenvPythonVersion3_6() {
compile "pipenv-version" compile "pipenv-version"
assertCaptured $DEFAULT_PYTHON_VERSION assertCaptured "Installing ${LATEST_36}"
assertCapturedSuccess # Can't use `assertCapturedSuccess` since stderr contains:
# "cp: cannot stat '/tmp/build_*/requirements.txt': No such file or directory" (W-7924941)
assertCapturedSuccessWithStdErr
} }
testPipenvVersion2() { testPipenvPythonVersion2_7() {
# Python 2.7 is EOL, so it has not been built for Heroku-20.
if [[ $STACK == "heroku-20" ]]; then
return
fi
compile "pipenv-version2" compile "pipenv-version2"
assertCaptured $LATEST_27 assertCaptured "Installing ${LATEST_27}"
assertCapturedSuccess # Can't use `assertCapturedSuccess` since stderr contains:
# "cp: cannot stat '/tmp/build_*/requirements.txt': No such file or directory" (W-7924941)
assertCapturedSuccessWithStdErr
} }
testPipenvFullVersion() {
testPipenvPythonFullVersion() {
# Python 3.7+ requires newer libssl than is present on Cedar-14.
if [[ "${STACK}" = "cedar-14" ]]; then
return
fi
compile "pipenv-full-version" compile "pipenv-full-version"
assertCaptured "3.6.3" assertCaptured "3.7.8"
assertCapturedSuccess # Can't use `assertCapturedSuccess` since stderr contains:
# "cp: cannot stat '/tmp/build_*/requirements.txt': No such file or directory" (W-7924941)
assertCapturedSuccessWithStdErr
} }
testNoRequirements() { testNoRequirements() {
@@ -108,14 +129,15 @@ testHooks() {
LIBRARY_PATH LIBRARY_PATH
OLDPWD OLDPWD
PATH PATH
PIP_NO_PYTHON_VERSION_WARNING
PKG_CONFIG_PATH PKG_CONFIG_PATH
PROFILE_PATH PROFILE_PATH
PWD PWD
PYTHONUNBUFFERED PYTHONUNBUFFERED
S3_BASE_URL
SHLVL SHLVL
SOME_APP_CONFIG_VAR SOME_APP_CONFIG_VAR
STACK STACK
VENDOR_URL
) )
if [[ "${STACK}" == "cedar-14" || "${STACK}" == "heroku-16" ]]; then if [[ "${STACK}" == "cedar-14" || "${STACK}" == "heroku-16" ]]; then
# Remove "OLDPWD" from expected_env_vars since for bash <4.4 it's not exported to subshells: # Remove "OLDPWD" from expected_env_vars since for bash <4.4 it's not exported to subshells:
test/run-versions
+186 -151
View File
@@ -4,219 +4,254 @@
# shellcheck source=bin/default_pythons # shellcheck source=bin/default_pythons
source "bin/default_pythons" source "bin/default_pythons"
testPythonDefault() { testPythonVersionUnspecified() {
updateVersion "pythonDefault" $DEFAULT_PYTHON_VERSION compile "python_version_unspecified"
compile "pythonDefault" assertCaptured "Installing ${DEFAULT_PYTHON_VERSION}"
assertCaptured $DEFAULT_PYTHON_VERSION
assertNotCaptured "security update" 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" assertCaptured "Installing SQLite3"
assertCapturedSuccess assertCapturedSuccess
} }
testPython2() { testPython2_7() {
updateVersion "python2" $LATEST_27 # Python 2.7 is EOL, so it has not been built for Heroku-20.
echo $LATEST_27 > "runtime.txt" if [[ $STACK == "heroku-20" ]]; then
compile "python2" return
assertCaptured $LATEST_27 fi
if [[ $(date "+%Y") > "2019" ]]; then compile "python2"
assertCaptured "python-2-7-eol-faq"; assertCaptured "Installing ${LATEST_27}"
else assertCaptured "python-2-7-eol-faq";
assertNotCaptured "python-2-7-eol-faq"; assertNotCaptured "security update"
fi assertCaptured "Installing pip 20.1.1, setuptools 44.1.1 and wheel 0.34.2"
assertNotCaptured "security update" assertCaptured "Installing SQLite3"
assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2" assertCapturedSuccess
assertCaptured "Installing SQLite3"
assertCapturedSuccess
} }
testPython2_warn() { testPython2_7_warn() {
compile "python2_warn" # Python 2.7 is EOL, so it has not been built for Heroku-20.
assertCaptured "python-2.7.15" if [[ $STACK == "heroku-20" ]]; then
if [[ $(date "+%Y") > "2019" ]]; then return
assertCaptured "python-2-7-eol-faq"; fi
else compile "python2_warn"
assertNotCaptured "python-2-7-eol-faq"; assertCaptured "Installing python-2.7.15"
fi assertCaptured "python-2-7-eol-faq";
assertCaptured "Only the latest version" assertCaptured "Only the latest version"
assertCaptured "Installing SQLite3" assertCaptured "${LATEST_27}"
assertCapturedSuccess assertCapturedSuccess
}
testPython2_fail() {
compile "python2_fail"
assertCaptured "Aborting"
assertCapturedError
} }
testPython3_4() { testPython3_4() {
compile "python3_4" # Python 3.4 is EOL, so it has not been built for Heroku-20.
assertCaptured $LATEST_34 if [[ $STACK == "heroku-20" ]]; then
assertNotCaptured "security update" return
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 fi
compile "python3_4"
assertCaptured "Installing ${LATEST_34}"
assertNotCaptured "security update"
assertCaptured "Installing pip 19.1.1, setuptools 43.0.0 and wheel 0.33.6"
assertCaptured "Installing SQLite3"
# Can't use `assertCapturedSuccess` since Pip outputs a Python 3.4 EOL warning to stderr,
# and the newest Pip that works on Python 3.4 doesn't support `PIP_NO_PYTHON_VERSION_WARNING`.
assertCapturedSuccessWithStdErr
} }
testPython3_4_warn() { testPython3_4_warn() {
compile "python3_4_warn" # Python 3.4 is EOL, so it has not been built for Heroku-20.
assertCaptured "python-3.4.9" if [[ $STACK == "heroku-20" ]]; then
assertCaptured "security update!" return
# 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 fi
} compile "python3_4_warn"
assertCaptured "Installing python-3.4.9"
testPython3_4_fail() { assertCaptured "security update!"
compile "python3_4_fail" assertCaptured "${LATEST_34}"
assertCaptured "Aborting" # Can't use `assertCapturedSuccess` since Pip outputs a Python 3.4 EOL warning to stderr,
assertCapturedError # and the newest Pip that works on Python 3.4 doesn't support `PIP_NO_PYTHON_VERSION_WARNING`.
assertCapturedSuccessWithStdErr
} }
testPython3_5() { testPython3_5() {
# Python 3.5 is EOL, so it has not been built for Heroku-20.
if [[ $STACK == "heroku-20" ]]; then
return
fi
compile "python3_5" compile "python3_5"
assertCaptured $LATEST_35 assertCaptured "Installing ${LATEST_35}"
assertNotCaptured "security update" 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" assertCaptured "Installing SQLite3"
assertCapturedSuccess assertCapturedSuccess
} }
testPython3_5_warn() { testPython3_5_warn() {
# Python 3.5 is EOL, so it has not been built for Heroku-20.
if [[ $STACK == "heroku-20" ]]; then
return
fi
compile "python3_5_warn" compile "python3_5_warn"
assertCaptured "python-3.5.6" assertCaptured "Installing python-3.5.6"
assertCaptured "security update!" assertCaptured "security update!"
assertCaptured "${LATEST_35}"
assertCapturedSuccess assertCapturedSuccess
} }
testPython3_5_fail() {
compile "python3_5_fail"
assertCaptured "Aborting"
assertCapturedError
}
testPython3_6() { testPython3_6() {
updateVersion "python3_6" $LATEST_36
compile "python3_6" compile "python3_6"
assertCaptured $LATEST_36 assertCaptured "Installing ${LATEST_36}"
assertNotCaptured "security update" 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" assertCaptured "Installing SQLite3"
assertCapturedSuccess assertCapturedSuccess
} }
testPython3_6_warn() { testPython3_6_warn() {
compile "python3_6_warn" compile "python3_6_warn"
assertCaptured "python-3.6.7" assertCaptured "Installing python-3.6.11"
assertCaptured "security update!" assertCaptured "security update!"
assertCaptured "${LATEST_36}"
assertCapturedSuccess
}
testPython3_7() {
# Python 3.7+ requires newer libssl than is present on Cedar-14.
if [[ "${STACK}" = "cedar-14" ]]; then
return
fi
compile "python3_7"
assertCaptured "Installing ${LATEST_37}"
assertNotCaptured "security update"
assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2"
assertCaptured "Installing SQLite3" assertCaptured "Installing SQLite3"
assertCapturedSuccess assertCapturedSuccess
} }
testPython3_6_fail() {
compile "python3_6_fail"
assertCaptured "Aborting"
assertCapturedError
}
testPython3_7() {
updateVersion "python3_7" $LATEST_37
compile "python3_7"
if [[ $STACK = "cedar-14" ]]; then
assertCapturedError
else
assertNotCaptured "security update"
assertCaptured $LATEST_37
assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
assertCaptured "Installing SQLite3"
assertCapturedSuccess
fi
}
testPython3_7_warn() { testPython3_7_warn() {
# Python 3.7+ requires newer libssl than is present on Cedar-14.
if [[ "${STACK}" = "cedar-14" ]]; then
return
fi
compile "python3_7_warn" compile "python3_7_warn"
if [[ $STACK = "cedar-14" ]]; then assertCaptured "Installing python-3.7.8"
assertCapturedError assertCaptured "security update!"
else assertCaptured "${LATEST_37}"
assertCaptured "python-3.7.1" assertCapturedSuccess
assertCaptured "security update!"
assertCaptured "Installing SQLite3"
assertCapturedSuccess
fi
}
testPython3_7_fail() {
compile "python3_7_fail"
assertCaptured "Aborting"
assertCapturedError
}
testPython3_7_warn() {
compile "python3_8_warn"
if [[ $STACK = "cedar-14" ]]; then
assertCapturedError
else
assertCaptured "python-3.8.0"
assertCaptured "security update!"
assertCaptured "Installing SQLite3"
assertCapturedSuccess
fi
} }
testPython3_8() { testPython3_8() {
updateVersion "python3_8" $LATEST_38 # Python 3.7+ requires newer libssl than is present on Cedar-14.
compile "python3_8" if [[ "${STACK}" = "cedar-14" ]]; then
if [[ $STACK = "cedar-14" ]]; then return
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 fi
compile "python3_8"
assertCaptured "Installing ${LATEST_38}"
assertNotCaptured "security update"
assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2"
assertCaptured "Installing SQLite3"
assertCapturedSuccess
} }
testPython3_8_fail() { testPython3_8_warn() {
compile "python3_8_fail" # Python 3.7+ requires newer libssl than is present on Cedar-14.
if [[ "${STACK}" = "cedar-14" ]]; then
return
fi
compile "python3_8_warn"
assertCaptured "Installing python-3.8.5"
assertCaptured "security update!"
assertCaptured "${LATEST_38}"
assertCapturedSuccess
}
testPython3_9() {
# Cedar-14 is EOL, so we're not building new major Python versions for it.
if [[ "${STACK}" = "cedar-14" ]]; then
return
fi
compile "python3_9"
assertCaptured "Installing ${LATEST_39}"
assertNotCaptured "security update"
assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2"
assertCaptured "Installing SQLite3"
assertCapturedSuccess
}
testPython3_9_warn() {
# Cedar-14 is EOL, so we're not building new major Python versions for it.
if [[ "${STACK}" = "cedar-14" ]]; then
return
fi
# Can't test the version warning until there is at least one old version of Python 3.9.
if [[ "${LATEST_39}" = "python-3.9.0" ]]; then
return
fi
compile "python3_9_warn"
assertCaptured "Installing python-3.9.0"
assertCaptured "security update!"
assertCaptured "${LATEST_39}"
assertCapturedSuccess
}
testPythonVersionInvalid() {
compile "python_version_invalid"
assertCaptured "Requested runtime (python-3.8.99) is not available for this stack"
assertCaptured "Aborting" assertCaptured "Aborting"
assertCapturedError assertCapturedError
} }
testPypy3_6() { testPypy3_6() {
compile "pypy3_6" compile "pypy3_6"
if [[ $STACK = "cedar-14" ]]; then assertCaptured "Installing ${LATEST_PYPY_36}"
assertCapturedError assertNotCaptured "security update"
else assertCaptured "Installing pip 20.1.1, setuptools 47.1.1 and wheel 0.34.2"
assertCaptured "Installing pypy" assertCapturedSuccess
assertCaptured "$PYPY_36" }
assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
assertCapturedSuccess testPypy3_6_warn() {
fi compile "pypy3_6_warn"
assertCaptured "Installing pypy3.6-7.3.1"
assertCaptured "security update!"
assertCaptured "${LATEST_PYPY_36}"
assertCapturedSuccess
} }
testPypy2_7() { testPypy2_7() {
compile "pypy2_7" compile "pypy2_7"
if [[ $STACK = "cedar-14" ]]; then assertCaptured "Installing ${LATEST_PYPY_27}"
assertCapturedError assertNotCaptured "security update"
else assertCaptured "Installing pip 20.1.1, setuptools 44.1.1 and wheel 0.34.2"
assertCaptured "Installing pypy" assertCapturedSuccess
assertCaptured "$PYPY_27" }
assertCaptured "Installing pip 20.0.2, setuptools 39.0.1 and wheel 0.34.2"
assertCapturedSuccess testPypy2_7_warn() {
fi compile "pypy2_7_warn"
assertCaptured "Installing pypy2.7-7.3.1"
assertCaptured "security update!"
assertCaptured "${LATEST_PYPY_27}"
assertCapturedSuccess
}
testStickyPythonVersion() {
local cache_dir="$(mktmpdir)"
compile "python3_6_warn" "$cache_dir"
assertCaptured "Installing python-3.6.11"
assertCapturedSuccess
compile "python_version_unspecified" "$cache_dir"
assertNotCaptured "Installing python"
assertCaptured "security update!"
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.11" ".heroku/python-version"
}
testPythonVersionChange() {
local cache_dir="$(mktmpdir)"
compile "python3_6_warn" "$cache_dir"
assertCaptured "Installing python-3.6.11"
assertCapturedSuccess
compile "python3_6" "$cache_dir"
assertCaptured "Found python-3.6.11, removing"
assertCapturedSuccess
} }
pushd $(dirname 0) >/dev/null pushd $(dirname 0) >/dev/null
test/utils
+21 -13
View File
@@ -56,11 +56,6 @@ resetCapture()
unset rtrn # deprecated unset rtrn # deprecated
} }
updateVersion()
{
echo "$2" > "test/fixtures/${1}/runtime.txt"
}
assertCapturedEquals() assertCapturedEquals()
{ {
assertEquals "$@" "$(cat ${STD_OUT})" assertEquals "$@" "$(cat ${STD_OUT})"
@@ -85,12 +80,20 @@ assertNotCaptured()
assertCapturedSuccess() assertCapturedSuccess()
{ {
assertEquals "Captured exit code -" "0" "${RETURN}" assertEquals "Captured exit code -" "0" "${RETURN}"
# assertEquals "STD_ERR -" "" "$(cat ${STD_ERR})" assertEquals "STD_ERR -" "" "$(cat ${STD_ERR})"
if [ $RETURN -ne 0 -a -z "$(cat ${STD_ERR})" ]; then if [ $RETURN -ne 0 -o -n "$(cat ${STD_ERR})" ]; then
# Failing exit code but stderr was empty. Display stdout to help debugging. debug
cat $STD_OUT fi
echo }
assertCapturedSuccessWithStdErr()
{
assertEquals "Captured exit code -" "0" "${RETURN}"
assertNotEquals "STD_ERR -" "" "$(cat ${STD_ERR})"
if [ ${RETURN} -ne 0 ]; then
debug
fi fi
} }
@@ -151,9 +154,14 @@ _assertContains()
debug() debug()
{ {
cat $STD_OUT echo
echo '^^^^^^' echo '### STD_OUT ###'
cat $STD_ERR cat "${STD_OUT}"
echo
echo '### STD_ERR ###'
cat "${STD_ERR}"
echo
echo
} }
assertContains() assertContains()
vendor/shunit2
Vendored
-1048
View File
File diff suppressed because it is too large Load Diff
vendor/test-utils
Vendored
-204
View File
@@ -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}`"
}