libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From quent...@apache.org
Subject [1/4] libcloud git commit: contrib: Update tox Dockerfile
Date Sat, 16 Dec 2017 14:29:12 GMT
Repository: libcloud
Updated Branches:
  refs/heads/trunk ab84b0304 -> 25c4d99b5


contrib: Update tox Dockerfile

Stop testing Python 2.6 and 3.3


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/74c1db85
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/74c1db85
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/74c1db85

Branch: refs/heads/trunk
Commit: 74c1db8568fed97acb34f726d4e66c571b8535c9
Parents: 987a22d
Author: Quentin Pradet <quentinp@apache.org>
Authored: Sat Dec 16 10:47:41 2017 +0400
Committer: Quentin Pradet <quentinp@apache.org>
Committed: Sat Dec 16 18:28:00 2017 +0400

----------------------------------------------------------------------
 contrib/Dockerfile   | 20 ++++++--------------
 contrib/run_tests.sh |  2 +-
 2 files changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/74c1db85/contrib/Dockerfile
----------------------------------------------------------------------
diff --git a/contrib/Dockerfile b/contrib/Dockerfile
index 2a49c46..eabf990 100644
--- a/contrib/Dockerfile
+++ b/contrib/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
 RUN set -e && \
   apt-get update && \
@@ -6,30 +6,22 @@ RUN set -e && \
     software-properties-common \
     wget \
     ssh && \
-  add-apt-repository ppa:fkrull/deadsnakes && \
+  add-apt-repository ppa:deadsnakes/ppa && \
   apt-get update && \
   apt-get -y install \
-    python2.6 \
     python2.7 \
-    python3.2 \
-    python3.3 \
     python3.4 \
     python3.5 \
+    python3.6 \
     python-dev \
-    python2.6-dev \
     python2.7-dev \
-    python3.2-dev \
-    python3.3-dev \
     python3.4-dev \
     python3.5-dev \
+    python3.6-dev \
+    pypy \
     python-pip
 
 RUN set -e && \
-  wget https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.0-linux64.tar.bz2 && \
-  tar xf ./pypy-2.5.0-linux64.tar.bz2 -C /opt && \
-  ln -s /opt/pypy-2.5.0-linux64/bin/pypy /usr/local/bin/pypy
-
-RUN set -e && \
   pip install tox \
     mock \
     lockfile \
@@ -37,4 +29,4 @@ RUN set -e && \
 
 COPY . /libcloud
 WORKDIR /libcloud
-CMD tox -e py2.6,py2.7,pypypy,py3.2,py3.3,py3.4,py3.5,lint
+CMD tox -e py2.7,pypypy,py3.4,py3.5,py3.6,lint

http://git-wip-us.apache.org/repos/asf/libcloud/blob/74c1db85/contrib/run_tests.sh
----------------------------------------------------------------------
diff --git a/contrib/run_tests.sh b/contrib/run_tests.sh
index 45032d8..06840a3 100755
--- a/contrib/run_tests.sh
+++ b/contrib/run_tests.sh
@@ -21,7 +21,7 @@
 #
 # Script which builds a testing docker image and container,
 # install the necessary packages: pypy, pip, python versions
-# 2.6, 2.7, 3.2, 3.3, 3.4 (corresponding dev packages as well)
+# 2.7, 3.3, 3.4, 3.5 and 3.6 (corresponding dev packages as well)
 # and run the tox tests within the container.
 # The script has to be run from libcloud root.
 


Mime
View raw message