From 9b7e9b7bdfecda2aad2faa88b1e66474a624f532 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald.stufft@gmail.com>
Date: Fri, 22 Feb 2013 21:36:52 -0500
Subject: [PATCH] Move ld path to .travis.yml and exclude extra pep8/lint runs
---
.travis.yml | 20 +++++++++++++++++---
tasks.py | 6 +-----
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 15f1e194..36ce2b6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,21 @@ install:
- 'if [ -n "${VAR+x}" ]; then: invoke install-nacl --library=$NACL; fi'
- 'if [ -n "${VAR+x}" ]; then: invoke install --dev; fi'
script:
- - invoke tests --suite=$SUITE --libpath=/usr/local/lib
+ - invoke tests --suite=$SUITE
env:
- - NACL=libsodium SUITE=unit
- - "SUITE=pep8,lint"
+ global:
+ - LD_LIBRARY_PATH=/usr/local/lib
+ - LD_RUN_PATH=/usr/local/lib
+ matrix:
+ - NACL=libsodium SUITE=unit
+ - "SUITE=pep8,lint"
+matrix:
+ exclude:
+ - python: "2.6"
+ env: "SUITE=pep8,lint"
+ - python: "2.7"
+ env: "SUITE=pep8,lint"
+ - python: "3.2"
+ env: "SUITE=pep8,lint"
+ - python: "pypy"
+ env: "SUITE=pep8,lint"
diff --git a/tasks.py b/tasks.py
index 0e23f69a..68ce44a7 100644
--- a/tasks.py
+++ b/tasks.py
@@ -66,11 +66,7 @@ def install(dev=False):
@task
-def tests(libpath=None, suite=None):
- if libpath is not None:
- os.environ["LD_LIBRARY_PATH"] = libpath
- os.environ["LD_RUN_PATH"] = libpath
-
+def tests(suite=None):
if suite is None:
suite = set(["pep8", "lint", "unit"])
else:
--
GitLab