From 0ec5f3fd6c68d43619db3a025d94601fc5d02c20 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 10 Dec 2010 12:28:04 +0100
Subject: [PATCH] small improvements, add assertion improvement to CHANGELOG

---
 CHANGELOG                              | 3 ++-
 doc/example/assertion/test_failures.py | 2 +-
 doc/projects.txt                       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5da150183..b40c84bf9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
-Changes between 2.0.0 and 2.0.1.dev1
+Changes between 2.0.0 and 2.0.1.devX
 ----------------------------------------------
 
+- improve assertions ("not in"), thanks Floris
 - improve behaviour/warnings when running on top of "python -OO"
   (assertions and docstrings are turned off, leading to potential
   false positives)
diff --git a/doc/example/assertion/test_failures.py b/doc/example/assertion/test_failures.py
index b8db738fe..a9075065e 100644
--- a/doc/example/assertion/test_failures.py
+++ b/doc/example/assertion/test_failures.py
@@ -9,6 +9,6 @@ def test_failure_demo_fails_properly(testdir):
     failure_demo.copy(testdir.tmpdir.join(failure_demo.basename))
     result = testdir.runpytest(target)
     result.stdout.fnmatch_lines([
-        "*35 failed*"
+        "*39 failed*"
     ])
     assert result.ret != 0
diff --git a/doc/projects.txt b/doc/projects.txt
index 1502ebbcd..9131f644d 100644
--- a/doc/projects.txt
+++ b/doc/projects.txt
@@ -45,6 +45,7 @@ Some organisations using py.test
 * `Tandberg <http://www.tandberg.com/>`_
 * `Shootq <http://web.shootq.com/>`_
 * `Stups department of Heinrich Heine University Düsseldorf <http://www.stups.uni-duesseldorf.de/projects.php>`_
+* `cellzome`_ <http://www.cellzome.com/>`_
 * `Open End, Gotenborg <http://www.openend.se>`_
 * `Laboraratory of Bioinformatics, Warsaw <http://genesilico.pl/>`_
 * `merlinux, Germany <http://merlinux.eu>`_