Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Python 3.6.14, 3.7.11, 3.8.11 and 3.9.6 #1219

Merged
merged 1 commit into from
Jun 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

- Python 3.6.14, 3.7.11, 3.8.11 and 3.9.6 are now available (CPython) ([#1219](https://github.com/heroku/heroku-buildpack-python/pull/1219)).
- The default Python version for new apps is now 3.9.6 (previously 3.9.5) ([#1219](https://github.com/heroku/heroku-buildpack-python/pull/1219)).
- Remove testing & binary generation support for Heroku-16 ([#1214](https://github.com/heroku/heroku-buildpack-python/pull/1214)).

## v196 (2021-05-25)
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ A `requirements.txt` must be present at the root of your application's repositor

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

Current default Python Runtime: Python 3.9.5
Current default Python Runtime: Python 3.9.6

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`.
Expand All @@ -60,8 +60,7 @@ Specify a Python Runtime

Supported runtime options include:

- `python-3.9.5`
- `python-3.8.10`
- `python-3.7.10`
- `python-3.6.13`
- `python-2.7.18`
- `python-3.9.6`
- `python-3.8.11`
- `python-3.7.11`
- `python-3.6.14`
8 changes: 4 additions & 4 deletions bin/default_pythons
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
# the env vars to subprocesses.
# shellcheck disable=2034

LATEST_39="python-3.9.5"
LATEST_38="python-3.8.10"
LATEST_37="python-3.7.10"
LATEST_36="python-3.6.13"
LATEST_39="python-3.9.6"
LATEST_38="python-3.8.11"
LATEST_37="python-3.7.11"
LATEST_36="python-3.6.14"
LATEST_35="python-3.5.10"
LATEST_34="python-3.4.10"
LATEST_27="python-2.7.18"
Expand Down
4 changes: 4 additions & 0 deletions builds/runtimes/python-3.6.14
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/

source $(dirname $0)/python3
4 changes: 4 additions & 0 deletions builds/runtimes/python-3.7.11
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/

source $(dirname $0)/python3
4 changes: 4 additions & 0 deletions builds/runtimes/python-3.8.11
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/

source $(dirname $0)/python3
4 changes: 4 additions & 0 deletions builds/runtimes/python-3.9.6
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/python/

source $(dirname $0)/python3
2 changes: 1 addition & 1 deletion spec/fixtures/pipenv_and_runtime_txt/runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.9.5
python-3.9.6
2 changes: 1 addition & 1 deletion spec/fixtures/python_3.6/runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.6.13
python-3.6.14
2 changes: 1 addition & 1 deletion spec/fixtures/python_3.7/runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.7.10
python-3.7.11
2 changes: 1 addition & 1 deletion spec/fixtures/python_3.8/runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.8.10
python-3.8.11
2 changes: 1 addition & 1 deletion spec/fixtures/python_3.9/runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.9.5
python-3.9.6
2 changes: 1 addition & 1 deletion spec/fixtures/runtime_txt_only/runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.9.5
python-3.9.6
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

python-3.9.5
python-3.9.6

8 changes: 4 additions & 4 deletions spec/hatchet/python_version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -156,25 +156,25 @@
end
end

context 'when runtime.txt contains python-3.6.13' do
context 'when runtime.txt contains python-3.6.14' do
let(:app) { Hatchet::Runner.new('spec/fixtures/python_3.6') }

include_examples 'builds with the requested Python version', LATEST_PYTHON_3_6
end

context 'when runtime.txt contains python-3.7.10' do
context 'when runtime.txt contains python-3.7.11' do
let(:app) { Hatchet::Runner.new('spec/fixtures/python_3.7') }

include_examples 'builds with the requested Python version', LATEST_PYTHON_3_7
end

context 'when runtime.txt contains python-3.8.10' do
context 'when runtime.txt contains python-3.8.11' do
let(:app) { Hatchet::Runner.new('spec/fixtures/python_3.8') }

include_examples 'builds with the requested Python version', LATEST_PYTHON_3_8
end

context 'when runtime.txt contains python-3.9.5' do
context 'when runtime.txt contains python-3.9.6' do
let(:app) { Hatchet::Runner.new('spec/fixtures/python_3.9') }

include_examples 'builds with the requested Python version', LATEST_PYTHON_3_9
Expand Down
8 changes: 4 additions & 4 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
LATEST_PYTHON_2_7 = '2.7.18'
LATEST_PYTHON_3_4 = '3.4.10'
LATEST_PYTHON_3_5 = '3.5.10'
LATEST_PYTHON_3_6 = '3.6.13'
LATEST_PYTHON_3_7 = '3.7.10'
LATEST_PYTHON_3_8 = '3.8.10'
LATEST_PYTHON_3_9 = '3.9.5'
LATEST_PYTHON_3_6 = '3.6.14'
LATEST_PYTHON_3_7 = '3.7.11'
LATEST_PYTHON_3_8 = '3.8.11'
LATEST_PYTHON_3_9 = '3.9.6'
LATEST_PYPY_2_7 = '7.3.2'
LATEST_PYPY_3_6 = '7.3.2'
DEFAULT_PYTHON_VERSION = LATEST_PYTHON_3_9
Expand Down