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

https://blog.python.org/2021/06/python-396-3811-3711-and-3614-are-now.html https://www.python.org/downloads/release/python-3614/ https://www.python.org/downloads/release/python-3711/ https://www.python.org/downloads/release/python-3811/ https://www.python.org/downloads/release/python-396/ Closes GUS-W-9093277. Closes GUS-W-9528811. Closes GUS-W-9531329. Closes GUS-W-9531340.
heroku · Jun 28, 2021 · a1296f8 · a1296f8
1 parent 1c2612c
commit a1296f8
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)

diff --git a/README.md b/README.md
@@ -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`.
@@ -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`
diff --git a/bin/default_pythons b/bin/default_pythons
@@ -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"

diff --git a/builds/runtimes/python-3.6.14 b/builds/runtimes/python-3.6.14
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+
+source $(dirname $0)/python3
diff --git a/builds/runtimes/python-3.7.11 b/builds/runtimes/python-3.7.11
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+
+source $(dirname $0)/python3
diff --git a/builds/runtimes/python-3.8.11 b/builds/runtimes/python-3.8.11
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+
+source $(dirname $0)/python3
diff --git a/builds/runtimes/python-3.9.6 b/builds/runtimes/python-3.9.6
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+
+source $(dirname $0)/python3
diff --git a/spec/fixtures/pipenv_and_runtime_txt/runtime.txt b/spec/fixtures/pipenv_and_runtime_txt/runtime.txt
@@ -1 +1 @@
-python-3.9.5
+python-3.9.6
diff --git a/spec/fixtures/python_3.6/runtime.txt b/spec/fixtures/python_3.6/runtime.txt
@@ -1 +1 @@
-python-3.6.13
+python-3.6.14
diff --git a/spec/fixtures/python_3.7/runtime.txt b/spec/fixtures/python_3.7/runtime.txt
@@ -1 +1 @@
-python-3.7.10
+python-3.7.11
diff --git a/spec/fixtures/python_3.8/runtime.txt b/spec/fixtures/python_3.8/runtime.txt
@@ -1 +1 @@
-python-3.8.10
+python-3.8.11
diff --git a/spec/fixtures/python_3.9/runtime.txt b/spec/fixtures/python_3.9/runtime.txt
@@ -1 +1 @@
-python-3.9.5
+python-3.9.6
diff --git a/spec/fixtures/runtime_txt_only/runtime.txt b/spec/fixtures/runtime_txt_only/runtime.txt
@@ -1 +1 @@
-python-3.9.5
+python-3.9.6
diff --git a/spec/fixtures/runtime_txt_with_stray_whitespace/runtime.txt b/spec/fixtures/runtime_txt_with_stray_whitespace/runtime.txt
@@ -1,3 +1,3 @@
 
- python-3.9.5 
+ python-3.9.6 
 
diff --git a/spec/hatchet/python_version_spec.rb b/spec/hatchet/python_version_spec.rb
@@ -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

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -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