aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlton Gibson2014-09-02 14:54:15 +0200
committerCarlton Gibson2014-09-02 14:54:15 +0200
commit1967f525aa60d07c3c4c1658c1d5f4c8aaf86947 (patch)
treef5d946b9ee279fe4390b54e2684d01b5e708ab8a
parentfa0ef1773773c58b5708abad0e90a44fc9a308f8 (diff)
parentb40525d8e6b3b4839c61053bc1613843d5b8b63d (diff)
downloaddjango-rest-framework-1967f525aa60d07c3c4c1658c1d5f4c8aaf86947.tar.bz2
Merge branch 'master' of github.com:tomchristie/django-rest-framework into login-dropdown
-rw-r--r--CONTRIBUTING.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ff6018b8..a6dd05a0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -62,10 +62,10 @@ To run the tests, clone the repository, and then:
virtualenv env
env/bin/activate
pip install -r requirements.txt
- pip install -r optionals.txt
+ pip install -r requirements-test.txt
# Run the tests
- py.test
+ ./runtests.py
You can also use the excellent [`tox`][tox] testing tool to run the tests against all supported versions of Python and Django. Install `tox` globally, and then simply run: