From 0b21af938825830a85a9cbb6515b985e72f19453 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 2 Jan 2012 18:31:46 +0000 Subject: Drop mercurial reference. --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 3311bfa9..4141ccf5 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -49,7 +49,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 -- cgit v1.2.3 From 1a72836edce52d50f2775af85a1de4280913c7fb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 2 Jan 2012 18:36:53 +0000 Subject: Rename examples in tox. --- tox.ini | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tox.ini b/tox.ini index 015b5d2e..5e07e0f2 100644 --- a/tox.ini +++ b/tox.ini @@ -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 -- cgit v1.2.3 From 9f349ca6fee18c0b1973173f6ce5fd1f163485dc Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 2 Jan 2012 18:37:41 +0000 Subject: Rename examples in tox. --- tox.ini | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tox.ini b/tox.ini index 5e07e0f2..6c51cc07 100644 --- a/tox.ini +++ b/tox.ini @@ -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 ############################################ -- cgit v1.2.3 From 48a79a99e35057d4ddfeddeeaf1288ff1e44377a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 2 Jan 2012 18:39:29 +0000 Subject: Add 1.4. --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 97aae823..45467440 100644 --- a/README.rst +++ b/README.rst @@ -21,7 +21,7 @@ We also have a `Jenkins service