Skip to content

D
django-rest-framework
Commit ccbb5368 by Marko Tibold
Options

Merge remote-tracking branch 'upstream/master'

parents e0b82ce7 17290b0b
Showing with 21 additions and 21 deletions
README.rst
...@@ -21,7 +21,7 @@ We also have a `Jenkins service <http://jenkins.tibold.nl/job/djangorestframewor ...@@ -21,7 +21,7 @@ We also have a `Jenkins service <http://jenkins.tibold.nl/job/djangorestframewor
Requirements: Requirements:
* Python (2.5, 2.6, 2.7 supported) * 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 Installation Notes
......
docs/index.rst
...@@ -40,7 +40,7 @@ Requirements ...@@ -40,7 +40,7 @@ Requirements
------------ ------------
* Python (2.5, 2.6, 2.7 supported) * Python (2.5, 2.6, 2.7 supported)
* Django (1.2, 1.3 supported) * Django (1.2, 1.3, 1.4-alpha supported)
Installation Installation
...@@ -50,7 +50,7 @@ You can install Django REST framework using ``pip`` or ``easy_install``:: ...@@ -50,7 +50,7 @@ You can install Django REST framework using ``pip`` or ``easy_install``::
pip install djangorestframework 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 git clone git@github.com:tomchristie/django-rest-framework.git
......
tox.ini
...@@ -12,15 +12,15 @@ envlist= ...@@ -12,15 +12,15 @@ envlist=
py25-django14a1, py25-django14a1,
py26-django14a1, py26-django14a1,
py27-django14a1, py27-django14a1,
py25-django12e, py25-django12-examples,
py26-django12e, py26-django12-examples,
py27-django12e, py27-django12-examples,
py25-django13e, py25-django13-examples,
py26-django13e, py26-django13-examples,
py27-django13e py27-django13-examples,
py25-django14a1e, py25-django14a1-examples,
py26-django14a1e, py26-django14a1-examples,
py27-django14a1e py27-django14a1-examples
########################################### CORE TESTS ############################################ ########################################### CORE TESTS ############################################
...@@ -120,7 +120,7 @@ deps= ...@@ -120,7 +120,7 @@ deps=
####################################### EXAMPLES ################################################ ####################################### EXAMPLES ################################################
[testenv:py25-django12e] [testenv:py25-django12-examples]
basepython=python2.5 basepython=python2.5
commands= commands=
python examples/runtests.py python examples/runtests.py
...@@ -134,7 +134,7 @@ deps= ...@@ -134,7 +134,7 @@ deps=
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py26-django12e] [testenv:py26-django12-examples]
basepython=python2.6 basepython=python2.6
commands= commands=
python examples/runtests.py python examples/runtests.py
...@@ -148,7 +148,7 @@ deps= ...@@ -148,7 +148,7 @@ deps=
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py27-django12e] [testenv:py27-django12-examples]
basepython=python2.7 basepython=python2.7
commands= commands=
python examples/runtests.py python examples/runtests.py
...@@ -162,7 +162,7 @@ deps= ...@@ -162,7 +162,7 @@ deps=
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py25-django13e] [testenv:py25-django13-examples]
basepython=python2.5 basepython=python2.5
commands= commands=
python examples/runtests.py python examples/runtests.py
...@@ -176,7 +176,7 @@ deps= ...@@ -176,7 +176,7 @@ deps=
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py26-django13e] [testenv:py26-django13-examples]
basepython=python2.6 basepython=python2.6
commands= commands=
python examples/runtests.py python examples/runtests.py
...@@ -190,7 +190,7 @@ deps= ...@@ -190,7 +190,7 @@ deps=
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py27-django13e] [testenv:py27-django13-examples]
basepython=python2.7 basepython=python2.7
commands= commands=
python examples/runtests.py python examples/runtests.py
...@@ -204,7 +204,7 @@ deps= ...@@ -204,7 +204,7 @@ deps=
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py25-django14a1e] [testenv:py25-django14a1-examples]
basepython=python2.5 basepython=python2.5
commands= commands=
python examples/runtests.py python examples/runtests.py
...@@ -218,7 +218,7 @@ deps= ...@@ -218,7 +218,7 @@ deps=
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py26-django14a1e] [testenv:py26-django14a1-examples]
basepython=python2.6 basepython=python2.6
commands= commands=
python examples/runtests.py python examples/runtests.py
...@@ -232,7 +232,7 @@ deps= ...@@ -232,7 +232,7 @@ deps=
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py27-django14a1e] [testenv:py27-django14a1-examples]
basepython=python2.7 basepython=python2.7
commands= commands=
python examples/runtests.py python examples/runtests.py
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment