holger krekel avatar holger krekel committed 7fe4418

fix py31 compat, amend setup.py long description

Comments (0)

Files changed (2)

 def call_optional(obj, name):
     method = getattr(obj, name, None)
-    if method is not None and not hasattr(method, "_pytestfixturefunction") and callable(method):
+    if method is not None and not hasattr(method, "_pytestfixturefunction") and py.builtin.callable(method):
         # If there's any problems allow the exception to raise rather than
         # silently ignoring them
     from setuptools import setup, Command
 long_description = """
-cross-project testing tool for Python.
+The `py.test`` testing tool makes it easy to write small tests, yet
+scales to support complex functional testing.  It provides
-Platforms: Linux, Win32, OSX
+- `auto-discovery
+  <http://pytest.org/latest/goodpractises.html#python-test-discovery>`_
+  of test modules and functions,
+- detailed info on failing `assert statements <http://pytest.org/latest/assert.html>`_ (no need to remember ``self.assert*`` names)
+- `modular fixtures <http://pytest.org/latest/fixture.html>`_  for
+  managing small or parametrized long-lived test resources.
+- multi-paradigm support: you can use ``py.test`` to run test suites based
+  on `unittest <http://pytest.org/latest/unittest.html>`_ (or trial),
+  `nose <http://pytest.org/latest/nose.html>`_
+- single-source compatibility to Python2.4 all the way up to Python3.3,
+  PyPy and Jython.
-Interpreters: Python versions 2.4 through to 3.3, Jython 2.5.1 and PyPy-1.9
+- many `external plugins <http://pytest.org/latest/plugins.html#installing-external-plugins-searching>`_.
-Bugs and issues: http://bitbucket.org/hpk42/pytest/issues/
+A simple example for a test::
-Web page: http://pytest.org
+    # content of test_module.py
+    def test_function():
+        i = 4
+        assert i == 3
+which can be run with ``py.test test_module.py``.  See `getting-started <http://pytest.org/latest/getting-started.html#our-first-test-run>`_ for more examples.
+For much more info, including PDF docs, see
+    http://pytest.org
+and report bugs at:
+    http://bitbucket.org/hpk42/pytest/issues/
 (c) Holger Krekel and others, 2004-2012
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.