encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-01-24 08:14:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Marko Tibold 2012-01-02 21:17:12 +01:00
commit ccbb536896
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -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

4
docs/index.rst
View File

@ -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

36
tox.ini
View File

@ -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