move long description into README

CHANGELOG

@@ -3,6 +3,8 @@ Changes between 2.3.4 and 2.3.5dev
 
 - fix option help for "-k"
 
+- move long description of distribution into README
+
 Changes between 2.3.3 and 2.3.4
 -----------------------------------
 

README.txt

@@ -1,4 +1,36 @@
-py.test is a simple and popular testing tool for Python.
 
-See http://pytest.org for more documentation.
+The ``py.test`` testing tool makes it easy to write small tests, yet
+scales to support complex functional testing.  It provides
 
+- `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-1.9 and Jython-2.5.1.
+
+- many `external plugins <http://pytest.org/latest/plugins.html#installing-external-plugins-searching>`_.
+
+A simple example for a test::
+
+    # 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/
+
+Copyright Holger Krekel and others, 2004-2012

setup.py

@@ -6,43 +6,7 @@ except ImportError:
     use_setuptools()
     from setuptools import setup, Command
 
-long_description = """
+long_description = open("README.txt").read()
-The `py.test`` testing tool makes it easy to write small tests, yet
-scales to support complex functional testing.  It provides
-
-- `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-1.9 and Jython-2.5.1.
-
-- many `external plugins <http://pytest.org/latest/plugins.html#installing-external-plugins-searching>`_.
-
-A simple example for a test::
-
-    # 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
-"""
 def main():
     setup(
         name='pytest',