Snap for 7080270 from 5815ef836cf0f90a0f3ee7c4925cbe487d5d4e76 to mainline-release

Change-Id: I7c53b87ce5d4e1eea24b5a47f304136bcd50d806
diff --git a/pre-upload.py b/pre-upload.py
index 0e032f4..7eb11b8 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -26,8 +26,8 @@
 
 
 # Assert some minimum Python versions as we don't test or support any others.
-if sys.version_info < (3, 5):
-    print('repohooks: error: Python-3.5+ is required', file=sys.stderr)
+if sys.version_info < (3, 6):
+    print('repohooks: error: Python-3.6+ is required', file=sys.stderr)
     sys.exit(1)
 
 
diff --git a/tools/pylint.py b/tools/pylint.py
index 60f4b67..570f055 100755
--- a/tools/pylint.py
+++ b/tools/pylint.py
@@ -23,8 +23,8 @@
 import subprocess
 
 
-assert (sys.version_info.major, sys.version_info.minor) >= (3, 5), (
-    'Python 3.5 or newer is required; found %s' % (sys.version,))
+assert (sys.version_info.major, sys.version_info.minor) >= (3, 6), (
+    'Python 3.6 or newer is required; found %s' % (sys.version,))
 
 
 DEFAULT_PYLINTRC_PATH = os.path.join(