diff options
| author | Marko Tibold | 2012-01-02 21:17:12 +0100 |
|---|---|---|
| committer | Marko Tibold | 2012-01-02 21:17:12 +0100 |
| commit | ccbb53689632cade44a33b67ff5f87f0d37b22c7 (patch) | |
| tree | 16aa545ece44540e86e29621c95ae2fb4df85f43 | |
| parent | e0b82ce76de261c8f530cb488afb390c4aec13a8 (diff) | |
| parent | 17290b0beb6bf85c1558cf95cc71124bae97c947 (diff) | |
| download | django-rest-framework-ccbb53689632cade44a33b67ff5f87f0d37b22c7.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | docs/index.rst | 4 | ||||
| -rw-r--r-- | tox.ini | 36 |
3 files changed, 21 insertions, 21 deletions
@@ -21,7 +21,7 @@ We also have a `Jenkins service <http://jenkins.tibold.nl/job/djangorestframewor Requirements: * Python (2.5, 2.6, 2.7 supported) -* Django (1.2, 1.3 supported) +* Django (1.2, 1.3, 1.4-alpha supported) Installation Notes diff --git a/docs/index.rst b/docs/index.rst index c8a58f1f..0221ea05 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -40,7 +40,7 @@ Requirements ------------ * Python (2.5, 2.6, 2.7 supported) -* Django (1.2, 1.3 supported) +* Django (1.2, 1.3, 1.4-alpha supported) Installation @@ -50,7 +50,7 @@ You can install Django REST framework using ``pip`` or ``easy_install``:: pip install djangorestframework -Or get the latest development version using mercurial or git:: +Or get the latest development version using git:: git clone git@github.com:tomchristie/django-rest-framework.git @@ -12,15 +12,15 @@ envlist= py25-django14a1, py26-django14a1, py27-django14a1, - py25-django12e, - py26-django12e, - py27-django12e, - py25-django13e, - py26-django13e, - py27-django13e - py25-django14a1e, - py26-django14a1e, - py27-django14a1e + py25-django12-examples, + py26-django12-examples, + py27-django12-examples, + py25-django13-examples, + py26-django13-examples, + py27-django13-examples, + py25-django14a1-examples, + py26-django14a1-examples, + py27-django14a1-examples ########################################### CORE TESTS ############################################ @@ -120,7 +120,7 @@ deps= ####################################### EXAMPLES ################################################ -[testenv:py25-django12e] +[testenv:py25-django12-examples] basepython=python2.5 commands= python examples/runtests.py @@ -134,7 +134,7 @@ deps= unittest-xml-reporting==1.2 Pyyaml==3.10 -[testenv:py26-django12e] +[testenv:py26-django12-examples] basepython=python2.6 commands= python examples/runtests.py @@ -148,7 +148,7 @@ deps= unittest-xml-reporting==1.2 Pyyaml==3.10 -[testenv:py27-django12e] +[testenv:py27-django12-examples] basepython=python2.7 commands= python examples/runtests.py @@ -162,7 +162,7 @@ deps= unittest-xml-reporting==1.2 Pyyaml==3.10 -[testenv:py25-django13e] +[testenv:py25-django13-examples] basepython=python2.5 commands= python examples/runtests.py @@ -176,7 +176,7 @@ deps= unittest-xml-reporting==1.2 Pyyaml==3.10 -[testenv:py26-django13e] +[testenv:py26-django13-examples] basepython=python2.6 commands= python examples/runtests.py @@ -190,7 +190,7 @@ deps= unittest-xml-reporting==1.2 Pyyaml==3.10 -[testenv:py27-django13e] +[testenv:py27-django13-examples] basepython=python2.7 commands= python examples/runtests.py @@ -204,7 +204,7 @@ deps= unittest-xml-reporting==1.2 Pyyaml==3.10 -[testenv:py25-django14a1e] +[testenv:py25-django14a1-examples] basepython=python2.5 commands= python examples/runtests.py @@ -218,7 +218,7 @@ deps= unittest-xml-reporting==1.2 Pyyaml==3.10 -[testenv:py26-django14a1e] +[testenv:py26-django14a1-examples] basepython=python2.6 commands= python examples/runtests.py @@ -232,7 +232,7 @@ deps= unittest-xml-reporting==1.2 Pyyaml==3.10 -[testenv:py27-django14a1e] +[testenv:py27-django14a1-examples] basepython=python2.7 commands= python examples/runtests.py |