From 327fdaa560277499867a12fb94a51ddb900fe620 Mon Sep 17 00:00:00 2001
From: Luke Lovett <luke.lovett@mongodb.com>
Date: Mon, 28 Apr 2014 18:06:27 +0000
Subject: [PATCH] PYTHON-680 Remove all references to nose

---
 .gitignore  |  1 -
 README.rst  | 10 +++++-----
 RELEASE.rst | 13 +++++++------
 setup.cfg   |  2 --
 tox.ini     |  5 +----
 5 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 setup.cfg

diff --git a/.gitignore b/.gitignore
index a8aa6b4e6..a3da2b8ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,5 @@ dist/
 tools/settings.py
 pymongo.egg-info/
 *.so
-nosetests.xml
 *.egg
 .tox
diff --git a/README.rst b/README.rst
index 2380103d4..55c8c432e 100644
--- a/README.rst
+++ b/README.rst
@@ -64,7 +64,7 @@ support Python 2.4, 2.5, and 3.1.
 Additional dependencies are:
 
 - (to generate documentation) sphinx_
-- (to auto-discover tests) `nose <http://somethingaboutorange.com/mrl/projects/nose/>`_
+- (to run the tests under Python 2.6) unittest2_
 
 Examples
 ========
@@ -115,9 +115,9 @@ setup.py doc**. Generated documentation can be found in the
 Testing
 =======
 
-The easiest way to run the tests is to install `nose
-<http://somethingaboutorange.com/mrl/projects/nose/>`_ (**easy_install
-nose**) and run **nosetests** or **python setup.py test** in the root
-of the distribution. Tests are located in the *test/* directory.
+The easiest way to run the tests is to run **python setup.py test** in
+the root of the distribution. Note that you will need unittest2_ to
+run the tests under Python 2.6.
 
 .. _sphinx: http://sphinx.pocoo.org/
+.. _unittest2: https://pypi.python.org/pypi/unittest2
diff --git a/RELEASE.rst b/RELEASE.rst
index b831b35c8..10fa2fdce 100644
--- a/RELEASE.rst
+++ b/RELEASE.rst
@@ -32,12 +32,13 @@ Doing a Release
    with and without the C extension. Generally enough to just run the tests on
    2.6, 2.7, 3.2 and the latest 3.x version with and without the extension on
    a single platform, and then just test any version on the other platforms
-   as a sanity check. `python setup.py test` will build the extension and test.
-   `python tools/clean.py` will remove the extension, and then `nosetests` will
-   run the tests without it. Run the replica set and mongos high-availability
-   tests with `PYTHONPATH=. python test/high_availability/test_ha.py` and the slow
-   tests with `nosetests -d test/slow`. Can also run the doctests: `python
-   setup.py doc -t`. For building extensions on Windows check section below.
+   as a sanity check. `python setup.py test` will build the extension
+   and test.  `python tools/clean.py` will remove the extension, and
+   then `python setup.py --no_ext test` will run the tests without
+   it. Run the replica set and mongos high-availability tests with
+   `PYTHONPATH=. python test/high_availability/test_ha.py`. Can also
+   run the doctests: `python setup.py doc -t`. For building extensions
+   on Windows check section below.
 
 2. Add release notes to doc/changelog.rst. Generally just summarize/clarify
    the git log, but might add some more long form notes for big changes.
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 35b91b087..000000000
--- a/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[nosetests]
-with-xunit = 1
diff --git a/tox.ini b/tox.ini
index 5289f2fe2..e98cad01c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,16 +9,13 @@ envlist = py26, py27, py32, py33, py34, pypy
 [testenv]
 commands =
     {envpython} setup.py --no_ext test
-deps =
-    nose
 
 [testenv:py26]
 deps =
     gevent
-    {[testenv]deps}
+    unittest2
 
 [testenv:py27]
 deps =
     gevent
-    {[testenv]deps}