diff options
author | Jie Luo <anandolee@gmail.com> | 2017-08-18 13:15:06 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-18 13:15:06 -0700 |
commit | c2aa26e50772770f110fa384608e1a9a60105390 (patch) | |
tree | 20a16b95494e92cc90ff72b245737d71a061f643 | |
parent | 703f414ca6102e669ece2dcd5f7d9c2b05ca222e (diff) | |
download | protobuf-c2aa26e50772770f110fa384608e1a9a60105390.tar.gz protobuf-c2aa26e50772770f110fa384608e1a9a60105390.tar.bz2 protobuf-c2aa26e50772770f110fa384608e1a9a60105390.zip |
Revert "Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)" (#3524)
This reverts commit 703f414ca6102e669ece2dcd5f7d9c2b05ca222e.
-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 9405e21d..baa96dba 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{26,27,34,35,36}-{cpp,python} + py{26,27,33,34}-{cpp,python} [testenv] usedevelop=true @@ -235,9 +235,8 @@ internal_install_python_deps() { 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 - sudo apt-get install -y python3.6 python3.6-dev fi } @@ -279,7 +278,7 @@ build_python() { cd python # Only test Python 2.6/3.x on Linux if [ $(uname -s) == "Linux" ]; then - envlist=py\{26,27,34,35,36\}-python + envlist=py\{26,27,33,34\}-python else envlist=py27-python fi @@ -295,7 +294,7 @@ build_python_cpp() { cd python # Only test Python 2.6/3.x on Linux if [ $(uname -s) == "Linux" ]; then - envlist=py\{26,27,34,35,36\}-cpp + envlist=py\{26,27,33,34\}-cpp else envlist=py27-cpp fi |