ariatosca-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From emblempar...@apache.org
Subject incubator-ariatosca git commit: Install Python 2.6 only if needed
Date Mon, 18 Sep 2017 23:07:45 GMT
Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-1-parser-test-suite 7c1123ff2 -> c5a57b676


Install Python 2.6 only if needed


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/c5a57b67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/c5a57b67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/c5a57b67

Branch: refs/heads/ARIA-1-parser-test-suite
Commit: c5a57b6767ecee163d04e426364d434b5f4c107c
Parents: 7c1123f
Author: Tal Liron <tal.liron@gmail.com>
Authored: Mon Sep 18 18:07:20 2017 -0500
Committer: Tal Liron <tal.liron@gmail.com>
Committed: Mon Sep 18 18:07:20 2017 -0500

----------------------------------------------------------------------
 .travis.yml | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c5a57b67/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index e57ddc9..19534e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,15 +18,16 @@ sudo: true
 
 language: python
 
-addons:
-  apt:
-    sources:
-      - sourceline: 'ppa:fkrull/deadsnakes'
-    packages:
-      # Ubuntu 14.04 (trusty) does not come with Python 2.6, so we will install it from Felix
-      # Krull's PPA
-      - python2.6
-      - python2.6-dev
+# We need this only for "sudo: false"
+#addons:
+#  apt:
+#    sources:
+#      - sourceline: 'ppa:fkrull/deadsnakes'
+#    packages:
+#      # Ubuntu 14.04 (trusty) does not come with Python 2.6, so we will install it from
Felix
+#      # Krull's PPA
+#      - python2.6
+#      - python2.6-dev
 
 python:
   # We handle Python 2.6 testing from within tox (see tox.ini); note that this means that
we run
@@ -53,6 +54,14 @@ env:
   - PYTEST_PROCESSES=1 TOX_ENV=docs
 
 before_install:
+  # Ubuntu 14.04 (trusty) does not come with Python 2.6, so we will install it from Felix
Krull's
+  # PPA
+  - if [[ $TOX_ENV = py26* ]]; then
+      sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+      sudo apt-get --quiet update
+      sudo apt-get --yes install python2.6 python2.6-dev
+    fi
+
   # Create SSH keys for SSH tests
   - ssh-keygen -f $HOME/.ssh/id_rsa -t rsa -N ''
   - cat $HOME/.ssh/id_rsa.pub >> $HOME/.ssh/authorized_keys


Mime
View raw message