diff options
author | Jisi Liu <liujisi@google.com> | 2017-08-24 10:17:10 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-24 10:17:10 -0700 |
commit | 859d94a5f02162c08e45410c2b032f6b8b60700e (patch) | |
tree | 7535bccfbe75b98eeec80a1af73c68da1f2f2752 | |
parent | 364060bb51d172811395420026688409bcc7c74e (diff) | |
parent | 610e4338885fdfc462b189304b7992f6816874a2 (diff) | |
download | protobuf-859d94a5f02162c08e45410c2b032f6b8b60700e.tar.gz protobuf-859d94a5f02162c08e45410c2b032f6b8b60700e.tar.bz2 protobuf-859d94a5f02162c08e45410c2b032f6b8b60700e.zip |
Merge pull request #3544 from anandolee/master
Add Python 3.5, 3.6 && drop Python 2.6
-rw-r--r-- | jenkins/docker/Dockerfile | 7 | ||||
-rw-r--r-- | python/tox.ini | 2 | ||||
-rwxr-xr-x | tests.sh | 9 |
3 files changed, 13 insertions, 5 deletions
diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index 8faba4c6..3a279e66 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -217,6 +217,13 @@ RUN apt-get install -y \ # -- For javascript -- \ npm +################## +# Python 3.5 3.6 dependencies. +RUN apt-get clean && apt-get update && apt-get install -y --force-yes \ + python3.5-dev \ + python3.6-dev \ + && apt-get clean + # On Debian/Ubuntu, nodejs binary is named 'nodejs' because the name 'node' # is taken by another legacy binary. We don't have that legacy binary and # npm expects the binary to be named 'node', so we just create a symbol diff --git a/python/tox.ini b/python/tox.ini index baa96dba..38a81b4f 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{26,27,33,34}-{cpp,python} + py{27,33,34,35,36}-{cpp,python} [testenv] usedevelop=true @@ -234,9 +234,10 @@ 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 + 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\{27,33,34,35,36\}-python else envlist=py27-python fi @@ -292,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\}-cpp + envlist=py\{27,33,34,35,36\}-cpp else envlist=py27-cpp fi |