Enable the plugin by default, according to #9

Author: vtitor

MANIFEST.in

@@ -1,7 +1,6 @@
 include MANIFEST.in
 include README.rst
-include pytest_twisted/__init__.py
-include pytest_twisted/plugin.py
+include pytest_twisted.py
 include setup.cfg
 include setup.py
 include testing/conftest.py

make-manifest

@@ -5,11 +5,12 @@ import os
 
 def main():
     files = sorted(set([x.strip() for x in os.popen("git ls-files")]) -
-                   set(("make-manifest", ".gitignore")))
+                   {"make-manifest", ".gitignore"})
 
     with open("MANIFEST.in", "w") as f:
         for x in files:
             f.write("include %s\n" % x)
 
+
 if __name__ == '__main__':
     main()

pytest_twisted/plugin.py pytest_twisted.py

@@ -2,20 +2,23 @@
 
 from setuptools import setup
 
-
-setup(name='pytest-twisted',
-      version='1.5',
-      description='A twisted plugin for py.test.',
-      long_description=open("README.rst").read(),
-      author='Ralf Schmitt',
-      author_email='[email protected]',
-      url='https://github.com/schmir/pytest-twisted',
-      packages=['pytest_twisted'],
-      install_requires=["greenlet", "pytest>=2.3", "decorator"],
-      classifiers=['Development Status :: 5 - Production/Stable',
-                   'Intended Audience :: Developers',
-                   'License :: OSI Approved :: BSD License',
-                   'Operating System :: OS Independent',
-                   'Programming Language :: Python',
-                   'Topic :: Software Development :: Testing'],
-      entry_points=dict(pytest11=['twisted = pytest_twisted:_loader']))
+setup(
+    name='pytest-twisted',
+    version='1.5',
+    description='A twisted plugin for py.test.',
+    long_description=open("README.rst").read(),
+    author='Ralf Schmitt',
+    author_email='[email protected]',
+    url='https://github.com/schmir/pytest-twisted',
+    py_modules=['pytest_twisted'],
+    install_requires=["greenlet", "pytest>=2.3", "decorator"],
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Software Development :: Testing'
+    ],
+    entry_points={'pytest11': ['twisted = pytest_twisted']}
+)

pytest_twisted/__init__.py

@@ -5,8 +5,6 @@
 
 def test_fail_later(testdir):
     testdir.makepyfile("""
-pytest_plugins = "pytest_twisted"
-
 from twisted.internet import reactor, defer
 
 def test_fail():
@@ -34,15 +32,13 @@ def test_succeed():
     reactor.callLater(0.01, d.callback, 1)
     return d
 """)
-    rr = testdir.run(sys.executable, "-m", "pytest", "--twisted")
+    rr = testdir.run(sys.executable, "-m", "pytest")
     outcomes = rr.parseoutcomes()
     assert outcomes.get("passed") == 1
 
 
 def test_non_deferred(testdir):
     testdir.makepyfile("""
-pytest_plugins = "pytest_twisted"
-
 from twisted.internet import reactor, defer
 
 def test_succeed():
@@ -55,8 +51,6 @@ def test_succeed():
 
 def test_exception(testdir):
     testdir.makepyfile("""
-pytest_plugins = "pytest_twisted"
-
 def test_more_fail():
     raise RuntimeError("foo")
 """)
@@ -82,7 +76,7 @@ def test_succeed(foo):
     if foo == "web":
         raise RuntimeError("baz")
 """)
-    rr = testdir.run(sys.executable, "-m", "pytest", "--twisted", "-v")
+    rr = testdir.run(sys.executable, "-m", "pytest", "-v")
     outcomes = rr.parseoutcomes()
     assert outcomes.get("passed") == 2
     assert outcomes.get("failed") == 1
@@ -106,6 +100,6 @@ def test_MAIN():
     assert MAIN is greenlet.getcurrent()
 
 """)
-    rr = testdir.run(sys.executable, "-m", "pytest", "--twisted", "-v")
+    rr = testdir.run(sys.executable, "-m", "pytest", "-v")
     outcomes = rr.parseoutcomes()
     assert outcomes.get("passed") == 1