aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2020-08-31 17:12:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-31 17:12:27 +0000
commit24a38ce5e7368039d36fc39f5c39468396974e2c (patch)
tree7353b4f2e2170f3a9543ae5063bd6385d3b551ce
parent0569f18a26d4831ee75827b379fe90c3df9de097 (diff)
parent7698778fb0f02c517ca0ffe6f85f80991e49e4a3 (diff)
downloadrepohooks-24a38ce5e7368039d36fc39f5c39468396974e2c.tar.gz
pre-upload: drop support for Python 2 am: 7698778fb0
Original change: https://android-review.googlesource.com/c/platform/tools/repohooks/+/1373921 Change-Id: I2f0e1d3939e10be0763b24ecc0b14118c1be048e
-rwxr-xr-xpre-upload.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/pre-upload.py b/pre-upload.py
index ffefd09..94bb961 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
# -*- coding:utf-8 -*-
# Copyright 2016 The Android Open Source Project
#
@@ -29,18 +29,9 @@ import sys
# Assert some minimum Python versions as we don't test or support any others.
-# We only support Python 2.7, and require 2.7.5+/3.4+ to include signal fix:
-# https://bugs.python.org/issue14173
-if sys.version_info < (2, 7, 5):
- print('repohooks: error: Python-2.7.5+ is required', file=sys.stderr)
- sys.exit(1)
-elif sys.version_info.major == 3 and sys.version_info < (3, 5):
+if sys.version_info < (3, 5):
print('repohooks: error: Python-3.5+ is required', file=sys.stderr)
sys.exit(1)
-elif sys.version_info < (3, 6):
- # We want to get people off of old versions of Python.
- print('repohooks: warning: Python-3.6+ is going to be required; '
- 'please upgrade soon to maintain support.', file=sys.stderr)
_path = os.path.dirname(os.path.realpath(__file__))