standard test tools setup

5 files changed, 22 insertions, 6 deletions

diff --git a/.travis.yml b/.travis.yml
index c0128ba..90aa3d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,20 @@ language: python
 python:
   - "2.6"
   - "2.7"
+  - pypy
   - "3.3"
   - "3.4"
   - "3.5"
 install:
-  - "python setup.py install"
-script: make test
+  - pip install tox
+script:
+  - tox -e py
+notifications:
+  email: false
+  irc:
+    channels:
+      - chat.freenode.net#pocoo
+    on_success: change
+    on_failure: always
+    use_notice: true
+    skip_join: true
diff --git a/MANIFEST.in b/MANIFEST.in
index d50e4e0..c76ba68 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,2 @@
-include LICENSE README.rst AUTHORS
+include AUTHORS CHANGES LICENSE tests.py tox.ini
 recursive-include markupsafe *.c
diff --git a/setup.py b/setup.py
index ccf68c6..e30df8e 100644..100755
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 import os
 import re
 import ast
@@ -98,7 +99,7 @@ def run_setup(with_binary):
             'Topic :: Text Processing :: Markup :: HTML'
         ],
         packages=['markupsafe'],
-        test_suite='markupsafe.tests.suite',
+        test_suite='tests.suite',
         include_package_data=True,
         cmdclass={'build_ext': ve_build_ext},
         features=features,
diff --git a/markupsafe/tests.py b/tests.py
index f3e2379..7ec2acb 100644..100755
--- a/markupsafe/tests.py
+++ b/tests.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import gc
 import sys
diff --git a/tox.ini b/tox.ini
index 9b854eb..5dce2fc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,8 @@
 [tox]
-envlist = py26, py27, pypy, py33, py34, py35
+envlist = py26,py27,pypy,py33,py34,py35
 
 [testenv]
-commands = python setup.py test
+commands = py.test tests.py {posargs}
+
+deps =
+    pytest