Fix handling of commands with arguments in paramiko SSH client.

[jelmer/dulwich.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index e793f84f806881c422003e99d794e6d06191293e..72b8d431726c71167025186c052d1ca58c1251e5 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,28 @@
 language: python
-# Workaround to make 2.7 use system site packages, and 2.6 not use system
-# site packages.
-# https://github.com/travis-ci/travis-ci/issues/2219#issuecomment-41804942
-python:
-- "2.6"
-- "2.7_with_system_site_packages"
-script: PYTHONHASHSEED=random python setup.py test
-install:
-  - sudo apt-get update
-  - sudo apt-get install -qq git python-setuptools python-gevent python-fastimport python-mock
+sudo: false
+env:
+  global: TEST_RUNNER=unittest PYTHONHASHSEED=random
+matrix:
+  include:
+    - python: "2.6"
+      env: TEST_RUNNER=unittest2.__main__ TEST_REQUIRE="gevent geventhttpclient fastimport unittest2"
+    - python: "2.7"
+      env: TEST_REQUIRE="gevent geventhttpclient fastimport"
+    - python: "pypy"
+      env: TEST_REQUIRE="fastimport"
+    - python: "3.4"
+      env: TEST_REQUIRE=
+cache:
+  directories:
+    - $HOME/.cache/pip
+script:
+  - pip install pip --upgrade
+  - pip install $TEST_REQUIRE
+
+  # Test without c extensions
+  - python -m $TEST_RUNNER dulwich.tests.test_suite
+
+  # Test with c extensions
+  - python setup.py build_ext -i
+  - python -m $TEST_RUNNER dulwich.tests.test_suite
+