Skip to content

Commit 327fdaa

Browse files
author
Luke Lovett
committed
PYTHON-680 Remove all references to nose
1 parent 1412000 commit 327fdaa

File tree

5 files changed

+13
-18
lines changed

5 files changed

+13
-18
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@ dist/
1111
tools/settings.py
1212
pymongo.egg-info/
1313
*.so
14-
nosetests.xml
1514
*.egg
1615
.tox

README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ support Python 2.4, 2.5, and 3.1.
6464
Additional dependencies are:
6565

6666
- (to generate documentation) sphinx_
67-
- (to auto-discover tests) `nose <http://somethingaboutorange.com/mrl/projects/nose/>`_
67+
- (to run the tests under Python 2.6) unittest2_
6868

6969
Examples
7070
========
@@ -115,9 +115,9 @@ setup.py doc**. Generated documentation can be found in the
115115
Testing
116116
=======
117117

118-
The easiest way to run the tests is to install `nose
119-
<http://somethingaboutorange.com/mrl/projects/nose/>`_ (**easy_install
120-
nose**) and run **nosetests** or **python setup.py test** in the root
121-
of the distribution. Tests are located in the *test/* directory.
118+
The easiest way to run the tests is to run **python setup.py test** in
119+
the root of the distribution. Note that you will need unittest2_ to
120+
run the tests under Python 2.6.
122121

123122
.. _sphinx: http://sphinx.pocoo.org/
123+
.. _unittest2: https://pypi.python.org/pypi/unittest2

RELEASE.rst

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ Doing a Release
3232
with and without the C extension. Generally enough to just run the tests on
3333
2.6, 2.7, 3.2 and the latest 3.x version with and without the extension on
3434
a single platform, and then just test any version on the other platforms
35-
as a sanity check. `python setup.py test` will build the extension and test.
36-
`python tools/clean.py` will remove the extension, and then `nosetests` will
37-
run the tests without it. Run the replica set and mongos high-availability
38-
tests with `PYTHONPATH=. python test/high_availability/test_ha.py` and the slow
39-
tests with `nosetests -d test/slow`. Can also run the doctests: `python
40-
setup.py doc -t`. For building extensions on Windows check section below.
35+
as a sanity check. `python setup.py test` will build the extension
36+
and test. `python tools/clean.py` will remove the extension, and
37+
then `python setup.py --no_ext test` will run the tests without
38+
it. Run the replica set and mongos high-availability tests with
39+
`PYTHONPATH=. python test/high_availability/test_ha.py`. Can also
40+
run the doctests: `python setup.py doc -t`. For building extensions
41+
on Windows check section below.
4142

4243
2. Add release notes to doc/changelog.rst. Generally just summarize/clarify
4344
the git log, but might add some more long form notes for big changes.

setup.cfg

Lines changed: 0 additions & 2 deletions
This file was deleted.

tox.ini

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,13 @@ envlist = py26, py27, py32, py33, py34, pypy
99
[testenv]
1010
commands =
1111
{envpython} setup.py --no_ext test
12-
deps =
13-
nose
1412

1513
[testenv:py26]
1614
deps =
1715
gevent
18-
{[testenv]deps}
16+
unittest2
1917

2018
[testenv:py27]
2119
deps =
2220
gevent
23-
{[testenv]deps}
2421

0 commit comments

Comments
 (0)