run the test suite using py.test

diff --git a/.travis.yml b/.travis.yml
index 641c1d6058a8c18326d1182363b34cc6d1d3a6e0..4f61b3478e85f0539d51a72bd031864b38156dd7 100644 (file)
--- 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 4c2088f7901aeb6f973b1ed1c8c04cdd824db505..474a98b91094c4eade3e7ff44890235e4a16e3aa 100644 (file)
--- 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 (file)
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 01bb954499e4eebf51604784cd75a64aa82b7b5a..2acfc4daf86fdb47db2c1d14127bbf7b3be2fb34 100644 (file)
--- 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 af06b733420bbd355a402d40371e8687397e91a1..0f1a9db67790694c8f6b88a1f44954af6be0b28c 100644 (file)
--- 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 []