diff options
-rw-r--r-- | .travis.yml | 15 | ||||
-rw-r--r-- | MANIFEST.in | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | setup.py | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | tests.py (renamed from markupsafe/tests.py) | 1 | ||||
-rw-r--r-- | tox.ini | 7 |
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 @@ -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 @@ -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 |