encapsulated special handling

.travis.yml

@@ -4,10 +4,10 @@ python:
 - 2.7
 
 install:
-- python setup.py develop
 - pip install --use-mirrors \
     `python -c 'from setup import META; print " ".join(META["extras_require"]["testing"] + META["install_requires"])'`
 - pip install coveralls
+- python setup.py develop
 
 script:
 - make remotes

setup.py

@@ -8,19 +8,6 @@
         __license__ as LICENSE, __doc__ as DESC)
 
 
-class PyTest(TestCommand):
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        import pytest
-        errno = pytest.main(self.test_args)
-        sys.exit(errno)
-
-
 META = {
     'name': 'tiddlywebplugins.bfw',
     'url': 'https://github.com/FND/tiddlywebplugins.bfw',
@@ -43,11 +30,27 @@ def run_tests(self):
     'extras_require': {
         'testing': ['pytest', 'wsgi-intercept', 'httplib2'],
         'coverage': ['figleaf', 'coverage']
-    },
-    'tests_require': ['pytest'],
-    'cmdclass': { 'test': PyTest }
+    }
 }
 
 
+# entry point for tests (required because `coverage` fails to invoke `py.test`
+# in Travis CI's virtualenv)
+
+class PyTest(TestCommand):
+
+    def finalize_options(self):
+        TestCommand.finalize_options(self)
+        self.test_args = []
+        self.test_suite = True
+
+    def run_tests(self):
+        import pytest
+        errno = pytest.main(self.test_args)
+        sys.exit(errno)
+
+META['cmdclass'] = { 'test': PyTest }
+
+
 if __name__ == '__main__':
     setup(**META)