diff options
author | cclauss <cclauss@bluewin.ch> | 2017-08-18 19:14:00 +0200 |
---|---|---|
committer | Jie Luo <anandolee@gmail.com> | 2017-08-18 10:14:00 -0700 |
commit | 703f414ca6102e669ece2dcd5f7d9c2b05ca222e (patch) | |
tree | ea386c4447d9477daa41791b10f0ac7dcde94906 | |
parent | a04eb8c191e60171a9634cdd64715bd92e6769af (diff) | |
download | protobuf-703f414ca6102e669ece2dcd5f7d9c2b05ca222e.tar.gz protobuf-703f414ca6102e669ece2dcd5f7d9c2b05ca222e.tar.bz2 protobuf-703f414ca6102e669ece2dcd5f7d9c2b05ca222e.zip |
Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)
* Drop Python 3.3 from testing & add Python 3.5, 3.6
Python 3.3 goes [EOL](https://docs.python.org/devguide/index.html#branchstatus) next month.
* Sync test.sh with the Python versions in tox.ini
-rw-r--r-- | python/tox.ini | 2 | ||||
-rwxr-xr-x | tests.sh | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/python/tox.ini b/python/tox.ini index baa96dba..9405e21d 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{26,27,33,34}-{cpp,python} + py{26,27,34,35,36}-{cpp,python} [testenv] usedevelop=true @@ -235,8 +235,9 @@ 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 } @@ -278,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\}-python + envlist=py\{26,27,34,35,36\}-python else envlist=py27-python fi @@ -294,7 +295,7 @@ build_python_cpp() { cd python # Only test Python 2.6/3.x on Linux if [ $(uname -s) == "Linux" ]; then - envlist=py\{26,27,33,34\}-cpp + envlist=py\{26,27,34,35,36\}-cpp else envlist=py27-cpp fi |