Commit 0f16db76 by Marko Tibold

see previous commit message.

parent e2b9359a
...@@ -55,9 +55,13 @@ copyright = u'2011, Tom Christie' ...@@ -55,9 +55,13 @@ copyright = u'2011, Tom Christie'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '0.1'
import djangorestframework
version = djangorestframework.__version__
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '0.1' release = version
autodoc_member_order='bysource' autodoc_member_order='bysource'
...@@ -100,7 +104,7 @@ pygments_style = 'sphinx' ...@@ -100,7 +104,7 @@ pygments_style = 'sphinx'
# The theme to use for HTML and HTML Help pages. See the documentation for # The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes. # a list of builtin themes.
html_theme = 'default' html_theme = 'sphinxdoc'
# Theme options are theme-specific and customize the look and feel of a theme # Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the # further. For a list of options available for each theme, see the
......
...@@ -45,7 +45,6 @@ Requirements ...@@ -45,7 +45,6 @@ Requirements
Installation Installation
------------ ------------
You can install Django REST framework using ``pip`` or ``easy_install``:: You can install Django REST framework using ``pip`` or ``easy_install``::
pip install djangorestframework pip install djangorestframework
......
...@@ -23,4 +23,5 @@ ...@@ -23,4 +23,5 @@
})(); })();
</script> </script>
{% endblock %} {% endblock %}{% block footer %}
<div class="footer"> <p> Documentation version {{ version }} {% endblock %}</p></div>
...@@ -37,7 +37,7 @@ deps= ...@@ -37,7 +37,7 @@ deps=
django==1.2.4 django==1.2.4
coverage==3.4 coverage==3.4
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py27-django12] [testenv:py27-django12]
basepython=python2.7 basepython=python2.7
...@@ -45,7 +45,7 @@ deps= ...@@ -45,7 +45,7 @@ deps=
django==1.2.4 django==1.2.4
coverage==3.4 coverage==3.4
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py25-django13] [testenv:py25-django13]
basepython=python2.5 basepython=python2.5
...@@ -53,23 +53,23 @@ deps= ...@@ -53,23 +53,23 @@ deps=
django==1.3 django==1.3
coverage==3.4 coverage==3.4
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py26-django13] [testenv:py26-django13]
basepython=python2.6 basepython=python2.6
deps= deps=
django==1.3 django==1.3
coverage==3.4 coverage==3.4
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py27-django13] [testenv:py27-django13]
basepython=python2.7 basepython=python2.7
deps= deps=
django==1.3 django==1.3
coverage==3.4 coverage==3.4
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
####################################### EXAMPLES ################################################ ####################################### EXAMPLES ################################################
...@@ -80,12 +80,12 @@ commands= ...@@ -80,12 +80,12 @@ commands=
deps= deps=
django==1.2.4 django==1.2.4
coverage==3.4 coverage==3.4
wsgiref==0.1.2 wsgiref==0.1.2
Pygments==1.4 Pygments==1.4
httplib2==0.6.0 httplib2==0.6.0
Markdown==2.0.3 Markdown==2.0.3
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py26-django12e] [testenv:py26-django12e]
basepython=python2.6 basepython=python2.6
...@@ -94,12 +94,12 @@ commands= ...@@ -94,12 +94,12 @@ commands=
deps= deps=
django==1.2.4 django==1.2.4
coverage==3.4 coverage==3.4
wsgiref==0.1.2 wsgiref==0.1.2
Pygments==1.4 Pygments==1.4
httplib2==0.6.0 httplib2==0.6.0
Markdown==2.0.3 Markdown==2.0.3
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py27-django12e] [testenv:py27-django12e]
basepython=python2.7 basepython=python2.7
...@@ -108,12 +108,12 @@ commands= ...@@ -108,12 +108,12 @@ commands=
deps= deps=
django==1.2.4 django==1.2.4
coverage==3.4 coverage==3.4
wsgiref==0.1.2 wsgiref==0.1.2
Pygments==1.4 Pygments==1.4
httplib2==0.6.0 httplib2==0.6.0
Markdown==2.0.3 Markdown==2.0.3
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py25-django13e] [testenv:py25-django13e]
basepython=python2.5 basepython=python2.5
...@@ -122,12 +122,12 @@ commands= ...@@ -122,12 +122,12 @@ commands=
deps= deps=
django==1.3 django==1.3
coverage==3.4 coverage==3.4
wsgiref==0.1.2 wsgiref==0.1.2
Pygments==1.4 Pygments==1.4
httplib2==0.6.0 httplib2==0.6.0
Markdown==2.0.3 Markdown==2.0.3
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py26-django13e] [testenv:py26-django13e]
basepython=python2.6 basepython=python2.6
...@@ -136,12 +136,12 @@ commands= ...@@ -136,12 +136,12 @@ commands=
deps= deps=
django==1.3 django==1.3
coverage==3.4 coverage==3.4
wsgiref==0.1.2 wsgiref==0.1.2
Pygments==1.4 Pygments==1.4
httplib2==0.6.0 httplib2==0.6.0
Markdown==2.0.3 Markdown==2.0.3
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
[testenv:py27-django13e] [testenv:py27-django13e]
basepython=python2.7 basepython=python2.7
...@@ -150,9 +150,21 @@ commands= ...@@ -150,9 +150,21 @@ commands=
deps= deps=
django==1.3 django==1.3
coverage==3.4 coverage==3.4
wsgiref==0.1.2 wsgiref==0.1.2
Pygments==1.4 Pygments==1.4
httplib2==0.6.0 httplib2==0.6.0
Markdown==2.0.3 Markdown==2.0.3
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
\ No newline at end of file
##########################################DOCS#################################################
[testenv:docs]
basepython=python
changedir=docs
deps=
sphinx
pytest
django==1.3
commands=
py.test --tb=line -v --junitxml=junit-{envname}.xml check_sphinx.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