From 9e7ef58cfd1bbb91dd2e051322e583aeeffdf7d6 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 25 Nov 2010 16:36:25 +0100
Subject: [PATCH] some small pre-release updates

---
 MANIFEST.in      | 12 ------------
 doc/projects.txt |  9 ++++++---
 pytest.py        |  2 +-
 setup.py         |  2 +-
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 41a39abc8..73957ed7c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,17 +3,5 @@ include README.txt
 include setup.py
 include distribute_setup.py
 include LICENSE
-#include conftest.py
 graft doc
 graft testing
-exclude doc/_build
-include testing
-#exclude *.orig 
-#exclude *.orig 
-exclude *.rej 
-exclude .hgignore
-exclude *.pyc
-#recursive-exclude testing *.pyc *.orig *.rej *$py.class
-#prune .pyc
-#prune .svn 
-#prune .hg 
diff --git a/doc/projects.txt b/doc/projects.txt
index 57b0c50b5..24b8219ed 100644
--- a/doc/projects.txt
+++ b/doc/projects.txt
@@ -11,11 +11,14 @@ Here are some examples of projects using py.test:
 * `PIDA <http://pida.co.uk>`_ framework for integrated development
 * `Fom <http://packages.python.org/Fom/>`_ a fluid object mapper for FluidDB
 * `six <http://pypi.python.org/pypi/six/>`_ Python 2 and 3 compatibility utilities
-* `pdb++ <http://bitbucket.org/antocuni/pdb>`_ a fancier version of PDB
+* `pediapress <http://code.pediapress.com/wiki/wiki>`_ MediaWiki articles
+* `mwlib <http://pypi.python.org/pypi/mwlib>`_ mediawiki parser and utility library
 * `The Translate Toolkit <http://translate.sourceforge.net/wiki/toolkit/index>`_ for localization and conversion
 * `execnet <http://codespeak.net/execnet>`_ rapid multi-Python deployment
+* `bbfreeze <http://pypi.python.org/pypi/bbfreeze>`_ create standalone executables from Python scripts
+* `pdb++ <http://bitbucket.org/antocuni/pdb>`_ a fancier version of PDB
 * `py-s3fuse <http://code.google.com/p/py-s3fuse/>`_ Amazon S3 FUSE based filesystem
-* `Circuits <http://pypi.python.org/pypi/circuits/1.2.1>`_ lightweight Event Driven Framework
+* `Circuits <http://pypi.python.org/pypi/circuits>`_ lightweight Event Driven Framework
 * `pygtk-helpers <http://bitbucket.org/aafshar/pygtkhelpers-main/>`_ easy interaction with PyGTK
 * `QuantumCore <http://quantumcore.org/>`_ statusmessage and repoze openid plugin
 * `pydataportability <http://pydataportability.net/>`_ libraries for managing the open web
@@ -39,4 +42,4 @@ Some organisations using py.test
 * `Open End <http://openend.se>`_
 * `Laboraratory of Bioinformatics <http://genesilico.pl/>`_
 * `merlinux <http://merlinux.eu>`_
-* many more ... (please send a note via the :ref:`contact`)
+* many more ... (please be so kind to send a note via :ref:`contact`)
diff --git a/pytest.py b/pytest.py
index 49d97db6a..a6ee0a170 100644
--- a/pytest.py
+++ b/pytest.py
@@ -1,7 +1,7 @@
 """
 unit and functional testing with Python.
 """
-__version__ = '2.0.0.dev39'
+__version__ = '2.0.0.dev42'
 __all__ = ['main']
 
 from _pytest.core import main, UsageError, _preloadplugins
diff --git a/setup.py b/setup.py
index 29ace868d..c2298edec 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.0.0.dev39',
+        version='2.0.0.dev42',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],