summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2012-11-20 14:37:39 +0100
committerholger krekel <holger@merlinux.eu>2012-11-20 14:37:39 +0100
commit03445913e0d6bce4f148064a3ae444dfad3dc9f9 (patch)
tree5f4330dd828ce8110099ce46636ba0edd42c596f
parent8580058ffba95f49a767cedc6bf8b3888a442177 (diff)
downloadpytest-03445913e0d6bce4f148064a3ae444dfad3dc9f9.tar.gz
reanme README.txt to README.rst
-rw-r--r--CHANGELOG2
-rw-r--r--MANIFEST.in2
-rw-r--r--README.rst (renamed from README.txt)0
-rw-r--r--setup.py2
4 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ab34b2687..c94497ef0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@ Changes between 2.3.4 and 2.3.5dev
- fix option help for "-k"
-- move long description of distribution into README
+- move long description of distribution into README.rst
Changes between 2.3.3 and 2.3.4
-----------------------------------
diff --git a/MANIFEST.in b/MANIFEST.in
index 59ed8dd9a..c6985f4d7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
include CHANGELOG
-include README.txt
+include README.rst
include setup.py
include distribute_setup.py
include tox.ini
diff --git a/README.txt b/README.rst
index ffc2821e9..ffc2821e9 100644
--- a/README.txt
+++ b/README.rst
diff --git a/setup.py b/setup.py
index 33bc20510..cacaa6be4 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ except ImportError:
use_setuptools()
from setuptools import setup, Command
-long_description = open("README.txt").read()
+long_description = open("README.rst").read()
def main():
setup(
name='pytest',