ariatosca-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mxm...@apache.org
Subject incubator-ariatosca git commit: wip [Forced Update!]
Date Sun, 24 Sep 2017 08:22:06 GMT
Repository: incubator-ariatosca
Updated Branches:
  refs/heads/simpify_py26_testing bec26d0c4 -> 2ec5b7162 (forced update)


wip


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

Branch: refs/heads/simpify_py26_testing
Commit: 2ec5b7162cbb1a24b52103ec4ba43d54aa0adb7a
Parents: 737fff5
Author: max-orlov <maxim@gigaspaces.com>
Authored: Tue Sep 19 17:59:03 2017 +0300
Committer: max-orlov <maxim@gigaspaces.com>
Committed: Sun Sep 24 11:21:59 2017 +0300

----------------------------------------------------------------------
 .travis.yml | 35 +++++++++++++++++++++++------------
 tox.ini     |  7 +++----
 2 files changed, 26 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2ec5b716/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 958be80..588af33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,25 +14,15 @@
 # SSH tests fail in the container. See:
 # https://docs.travis-ci.com/user/reference/overview/#Virtualization-environments
 
-dist: trusty
-sudo: true
+sudo: false
 
 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
-
 python:
   # We handle Python 2.6 testing from within tox (see tox.ini); note that this means that
we run
   # tox itself always from Python 2.7
   - '2.7'
+  - '2.6'
 
 env:
   # The PYTEST_PROCESSES environment var is used in tox.ini to override the --numprocesses
argument
@@ -49,6 +39,27 @@ env:
   - PYTEST_PROCESSES=1 TOX_ENV=py26ssh
   - PYTEST_PROCESSES=1 TOX_ENV=docs
 
+matrix:
+  exclude:
+  - python: '2.6'
+    env: PYTEST_PROCESSES=1 TOX_ENV=py27
+  - python: '2.6'
+    env: PYTEST_PROCESSES=1 TOX_ENV=py27e2e
+  - python: '2.6'
+    env: PYTEST_PROCESSES=1 TOX_ENV=py27ssh
+  - python: '2.6'
+    env: PYTEST_PROCESSES=1 TOX_ENV=pylint_code
+  - python: '2.6'
+    env: PYTEST_PROCESSES=1 TOX_ENV=pylint_tests
+
+  - python: '2.7'
+    env: PYTEST_PROCESSES=1 TOX_ENV=py26
+  - python: '2.7'
+    env: PYTEST_PROCESSES=1 TOX_ENV=py26e2e
+  - python: '2.7'
+    env: PYTEST_PROCESSES=1 TOX_ENV=py26ssh
+
+
 before_install:
   # Create SSH keys for SSH tests
   - ssh-keygen -f $HOME/.ssh/id_rsa -t rsa -N ''

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2ec5b716/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index 765435a..ff71e05 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,6 @@
 [tox]
 envlist=py27,py26,py27e2e,py26e2e,pywin,py27ssh,pylint_code,pylint_tests,docs
 processes={env:PYTEST_PROCESSES:auto}
-py26={env:PY26:python2.6}
 
 [testenv]
 whitelist_externals=
@@ -29,11 +28,11 @@ deps=
   --requirement
     tests/requirements.txt
 basepython=
-  py26: {[tox]py26}
+  py26: python2.6
   py27: python2.7
-  py26e2e: {[tox]py26}
+  py26e2e: python2.6
   py27e2e: python2.7
-  py26ssh: {[tox]py26}
+  py26ssh: python2.6
   py27ssh: python2.7
   pywin: {env:PYTHON:}\python.exe
   pylint_code: python2.7


Mime
View raw message