aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--jenkins/docker/Dockerfile7
-rw-r--r--python/tox.ini2
-rwxr-xr-xtests.sh6
3 files changed, 12 insertions, 3 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..67b36dc0 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,33,34,35,36}-{cpp,python}
[testenv]
usedevelop=true
diff --git a/tests.sh b/tests.sh
index f68de059..df0c1bcb 100755
--- a/tests.sh
+++ b/tests.sh
@@ -237,6 +237,8 @@ internal_install_python_deps() {
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 +280,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,33,34,35,36\}-python
else
envlist=py27-python
fi
@@ -294,7 +296,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,33,34,35,36\}-cpp
else
envlist=py27-cpp
fi