run the test suite using py.test

5 files changed, 10 insertions, 4 deletions

diff --git a/.travis.yml b/.travis.yml
index 641c1d6..4f61b34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
   - "pypy"
 
 install:
-  - pip install pytz
+  - pip install pytz pytest
   - pip install --editable .
 
 script: make test
diff --git a/Makefile b/Makefile
index 4c2088f..474a98b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 test: import-cldr
-	@python setup.py test
+	@py.test babel
 
 import-cldr:
 	@./scripts/download_import_cldr.py
diff --git a/conftest.py b/conftest.py
new file mode 100644
index 0000000..328728a
--- /dev/null
+++ b/conftest.py
@@ -0,0 +1 @@
+collect_ignore = ['babel/messages/tests/data']
diff --git a/setup.cfg b/setup.cfg
index 01bb954..2acfc4d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,6 @@
 [egg_info]
 tag_build = dev
 tag_svn_revision = true
+
+[pytest]
+addopts = --doctest-modules
diff --git a/tox.ini b/tox.ini
index af06b73..0f1a9db 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,5 +2,7 @@
 envlist = py26, py27, pypy, py33
 
 [testenv]
-deps = pytz
-commands = python setup.py test []
+deps =
+    pytz
+    pytest
+commands = py.test babel []