more fiddling trying to get test runs to work with various invocation methods, esp travis

2025-01-18 13:22:09 +01:00 · 2013-12-06 16:50:02 -08:00 · 2013-12-06 16:50:02 -08:00 · b6774da603
commit b6774da603
parent 9c6c18d274
3 changed files with 6 additions and 3 deletions
--- 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

--- 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)

--- 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