Revert default python3 version to 3.6 (GoogleCloudPlatform#215)

sharifelgamal · web-flow · commit cbc6240d561e · 2019-02-01T16:08:12.000-08:00
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.7
-RUN virtualenv --no-download /env -p python3.7
+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
@@ -50,7 +50,7 @@
 PYTHON_INTERPRETER_VERSION_MAP = {
     '': '',  # == 2.7
     '2': '',  # == 2.7
-    '3': '3.7',
+    '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
@@ -71,7 +71,7 @@ def compare_file(filename, dir1, dir2):
         'dockerfile_python_version': '',
     }),
     ('runtime_config:\n python_version: 3', {
-        'dockerfile_python_version': '3.7',
+        'dockerfile_python_version': '3.6',
     }),
     ('runtime_config:\n python_version: 3.4', {
         'dockerfile_python_version': '3.4',
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.7
-RUN virtualenv --no-download /env -p python3.7
+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/tests/no-virtualenv/no-virtualenv.yaml b/tests/no-virtualenv/no-virtualenv.yaml
@@ -43,7 +43,7 @@ commandTests:
     expectedOutput: ["/usr/local/bin/python3\n"]
   - name: "default python3 version"
     command: ["python3", "--version"]
-    expectedOutput: ["Python 3.7.2\n"]
+    expectedOutput: ["Python 3.6.8\n"]
   - name: "default pip3 installation"
     command: ["which", "pip3"]
     expectedOutput: ["/usr/local/bin/pip3\n"]
