From 1b7d2b07aba9edbc2bf67fef5d461a486b098119 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 15 Oct 2010 00:54:25 +0200
Subject: [PATCH] some fixes to packaging and urls

--HG--
branch : trunk
---
 MANIFEST.in |  9 ++++-----
 setup.py    | 14 +++++---------
 tox.ini     |  7 -------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 2e024159a..61270574a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,16 +2,15 @@ include CHANGELOG
 include README.txt
 include setup.py
 include distribute_setup.py
-include LICENSE 
-include conftest.py 
+include LICENSE
+#include conftest.py
 graft doc
-graft contrib
-graft bin 
 graft testing
+include testing
 #exclude *.orig 
 #exclude *.orig 
 exclude *.rej 
-exclude .hginore
+exclude .hgignore
 exclude *.pyc
 #recursive-exclude testing *.pyc *.orig *.rej *$py.class
 #prune .pyc
diff --git a/setup.py b/setup.py
index f2d0fe8df..17330e229 100644
--- a/setup.py
+++ b/setup.py
@@ -5,29 +5,25 @@ if sys.version_info >= (3,0):
 from setuptools import setup
 
 long_description = """
-cross-project testing tool with many advanced features
+cross-project testing tool for Python.
 
 Platforms: Linux, Win32, OSX
 
 Interpreters: Python versions 2.4 through to 3.2, Jython 2.5.1 and PyPy
 
-Bugs and issues: http://bitbucket.org/hpk42/py-trunk/issues/
+Bugs and issues: http://bitbucket.org/hpk42/pytest/issues/
 
-Mailing lists and more contact points: http://pylib.org/contact.html
-
-.. _`py.test`: http://pytest.org
-.. _`py.path`: http://pylib.org/path.html
-.. _`py.code`: http://pylib.org/code.html
+Web page: http://pytest.org
 
 (c) Holger Krekel and others, 2004-2010
 """
 def main():
     setup(
         name='pytest',
-        description='py.test: simple testing with Python',
+        description='py.test: simple powerful testing with Python',
         long_description = long_description,
         version= '2.0.0.dev0',
-        url='http://pylib.org',
+        url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others',
diff --git a/tox.ini b/tox.ini
index 450458b02..482235b64 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,13 +24,6 @@ commands=
   py.test -n3 -rfsxX \
         --junitxml={envlogdir}/junit-{envname}.xml []
 
-[testenv:allplugins]
-deps=
-    pytest-xdist-*
-    pytest-xdist-*
-
-[testenv:py26]
-basepython=python2.6
 [testenv:doc]
 basepython=python
 changedir=doc