From b6774da6035045d9b07ba46e7ed29b7159e319b0 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Fri, 6 Dec 2013 16:50:02 -0800 Subject: [PATCH] more fiddling trying to get test runs to work with various invocation methods, esp travis --- .travis.yml | 1 + setup.py | 2 +- tox.ini | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1b3240..027464c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,5 +6,6 @@ python: - "2.7" - "3.2" - "3.3" +install: python setup.py install script: python setup.py test diff --git a/setup.py b/setup.py index f5d41b1..b637a99 100755 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ setuptools.setup(name='warcprox', install_requires=['pyopenssl', 'warctools>=4.8.3'], # gdbm/dbhash? dependency_links=['git+https://github.com/nlevitt/warctools.git@python3#egg=warctools-4.8.3'], tests_require=['requests>=2.0.1'], # >=2.0.1 for https://github.com/kennethreitz/requests/pull/1636 - test_suite='warcprox.tests.test_warcprox', + test_suite='warcprox.tests', scripts=['bin/dump-anydbm', 'bin/warcprox'], zip_safe=False) diff --git a/tox.ini b/tox.ini index fda5b09..1c70ded 100644 --- a/tox.ini +++ b/tox.ini @@ -7,5 +7,7 @@ envlist = py27, py32, py33 [testenv] -commands = {envpython} -m unittest discover -deps = requests>=2.0.1 +commands = {envpython} setup.py test + +# commands = {envpython} -m unittest discover +# deps = requests>=2.0.1