Switch default Python 3 from 3.5 to 3.6

Doug Greiman · Doug Greiman · commit 3c145063fbbc · 2017-08-29T15:25:13.000-07:00
The gen_dockerfile_test.test_generate_dockerfile_golden fails, as
expected, until the corresponding XRT change is released in gcloud.
diff --git a/builder/gen-dockerfile/Dockerfile.in b/builder/gen-dockerfile/Dockerfile.in
@@ -1,6 +1,6 @@
 FROM ${STAGING_IMAGE}
-LABEL python_version=python3.5
-RUN virtualenv --no-download /env -p python3.5
+LABEL python_version=python3.6
+RUN virtualenv --no-download /env -p python3.6
 
 # Set virtualenv environment variables. This is equivalent to running
 # source /env/bin/activate
diff --git a/scripts/gen_dockerfile.py b/scripts/gen_dockerfile.py
@@ -51,7 +51,7 @@
 PYTHON_INTERPRETER_VERSION_MAP = {
     '': '',  # == 2.7
     '2': '',  # == 2.7
-    '3': '3.5',
+    '3': '3.6',
     '3.4': '3.4',
     '3.5': '3.5',
     '3.6': '3.6',
diff --git a/scripts/gen_dockerfile_test.py b/scripts/gen_dockerfile_test.py
@@ -63,14 +63,17 @@ def compare_file(filename, dir1, dir2):
         'dockerfile_python_version': '',
     }),
     ('runtime_config:\n python_version: 3', {
-        'dockerfile_python_version': '3.5',
+        'dockerfile_python_version': '3.6',
     }),
     ('runtime_config:\n python_version: 3.4', {
         'dockerfile_python_version': '3.4',
     }),
     ('runtime_config:\n python_version: 3.5', {
         'dockerfile_python_version': '3.5',
     }),
+    ('runtime_config:\n python_version: 3.6', {
+        'dockerfile_python_version': '3.6',
+    }),
     # entrypoint present
     ('entrypoint: my entrypoint', {
         'entrypoint': 'exec my entrypoint',
diff --git a/scripts/testdata/hello_world_golden/Dockerfile b/scripts/testdata/hello_world_golden/Dockerfile
@@ -1,6 +1,6 @@
 FROM gcr.io/google-appengine/python
-LABEL python_version=python3.5
-RUN virtualenv --no-download /env -p python3.5
+LABEL python_version=python3.6
+RUN virtualenv --no-download /env -p python3.6
 
 # Set virtualenv environment variables. This is equivalent to running
 # source /env/bin/activate
