summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml18
-rw-r--r--Makefile2
2 files changed, 19 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..2bc017d3
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,18 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.5-dev" # 3.5 development branch
+  - "nightly" # currently points to 3.6-dev
+
+# command to install dependencies
+install:
+  - pip install pytest
+
+# command to run tests
+script:
+  - make test
diff --git a/Makefile b/Makefile
index 5de061ff..870901da 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ test:
 		echo "Testing $$FILE..."; \
 		RANGER_DOCTEST=1 PYTHONPATH=".:"$$PYTHONPATH ${PYTHON} $$FILE; \
 	done
-	@if type -t py.test > /dev/null; then \
+	@if type py.test > /dev/null; then \
 		echo "Running py.test tests..."; \
 		py.test tests; \
 	else \