diff options
author | Jie Luo <jieluo@google.com> | 2017-08-22 16:23:21 -0700 |
---|---|---|
committer | Jie Luo <jieluo@google.com> | 2017-08-22 16:39:26 -0700 |
commit | 610e4338885fdfc462b189304b7992f6816874a2 (patch) | |
tree | dcccabac359a5d52fd7e0ab580de52426220113d | |
parent | 028d6f13ee15e7a8ade2339634682fed11675e22 (diff) | |
download | protobuf-610e4338885fdfc462b189304b7992f6816874a2.tar.gz protobuf-610e4338885fdfc462b189304b7992f6816874a2.tar.bz2 protobuf-610e4338885fdfc462b189304b7992f6816874a2.zip |
Drop python2.6
Jenkins complains for python 2.6
DEPRECATION: Python 2.6 is no longer supported by the Python core team
ERROR: InvocationError: '/tmp/protobuf/protobuf/python/.tox/py26-cpp/bin/python setup.py -q build_py'
https://grpc-testing.appspot.com/job/protobuf_pull_request/1502/testReport/junit/(root)/python_cpp/python_cpp/
-rw-r--r-- | python/tox.ini | 2 | ||||
-rwxr-xr-x | tests.sh | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/python/tox.ini b/python/tox.ini index 67b36dc0..38a81b4f 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{26,27,33,34,35,36}-{cpp,python} + py{27,33,34,35,36}-{cpp,python} [testenv] usedevelop=true @@ -234,7 +234,6 @@ internal_install_python_deps() { sudo apt-get install -y python-software-properties # for apt-add-repository sudo apt-add-repository -y ppa:fkrull/deadsnakes sudo apt-get update -qq - sudo apt-get install -y python2.6 python2.6-dev sudo apt-get install -y python3.3 python3.3-dev sudo apt-get install -y python3.4 python3.4-dev sudo apt-get install -y python3.5 python3.5-dev @@ -280,7 +279,7 @@ build_python() { cd python # Only test Python 2.6/3.x on Linux if [ $(uname -s) == "Linux" ]; then - envlist=py\{26,27,33,34,35,36\}-python + envlist=py\{27,33,34,35,36\}-python else envlist=py27-python fi @@ -294,9 +293,9 @@ build_python_cpp() { export LD_LIBRARY_PATH=../src/.libs # for Linux export DYLD_LIBRARY_PATH=../src/.libs # for OS X cd python - # Only test Python 2.6/3.x on Linux + # Only test Python 3.x on Linux if [ $(uname -s) == "Linux" ]; then - envlist=py\{26,27,33,34,35,36\}-cpp + envlist=py\{27,33,34,35,36\}-cpp else envlist=py27-cpp fi |