Merge 23be196 into f0c1898

pimutils · Sep 19, 2015 · 02d8f72 · 02d8f72
2 parents f0c1898 + 23be196
commit 02d8f72
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,8 @@ python:
     - "pypy"
     - "3.3"
     - "3.4"
+    - "3.5"
+    - "nightly"
 env:
     - BUILD=test DAV_SERVER=radicale RADICALE_BACKEND=filesystem REQUIREMENTS=release
       # Radicale with filesystem storage (default)

diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ install-davserver:
 	cd $(TESTSERVER_BASE)$(DAV_SERVER) && sh install.sh
 
 install-test: install-davserver
-	$(PIP_INSTALL) pytest pytest-xprocess pytest-localserver
+	$(PIP_INSTALL) pytest>=2.7.3 pytest-xprocess pytest-localserver
 	[ $(TRAVIS) != "true" ] || $(PIP_INSTALL) coverage coveralls
 
 test: