Merge bab0cce into cfe77a3

xapi-project · Feb 20, 2015 · 35580c1 · 35580c1
2 parents cfe77a3 + bab0cce
commit 35580c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,12 @@
 language: python
 python:
-    - "2.6"
+    - "2.7"
 # command to install dependencies
 install:
-      - "pip install -r requirements.txt --use-mirrors"
+      - "pip install -r requirements.txt"
 # command to run tests
 script:
+        - "python --version"
         - "pylint --version"
         - "PYTHONPATH=./snapwatchd:./drivers pylint --rcfile=tests/pylintrc ./drivers/*.py"
         - "cd drivers; nosetests --with-coverage -c ../.noserc ../tests/test_*.py"

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 mock
 xenapi
 coveralls
-pylint==1.2.0
+pylint==1.2