mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-09-16 09:12:29 +03:00
Merge 58c15068c4
into 00d3aa21ba
This commit is contained in:
commit
ffb0035ab8
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -18,3 +18,4 @@ djangorestframework.egg-info/*
|
|||
MANIFEST
|
||||
|
||||
!.gitignore
|
||||
!.travis.yml
|
24
.travis.yml
Normal file
24
.travis.yml
Normal file
|
@ -0,0 +1,24 @@
|
|||
language: python
|
||||
|
||||
python:
|
||||
- "2.5"
|
||||
- "2.6"
|
||||
- "2.7"
|
||||
env:
|
||||
- DJANGO=https://github.com/django/django/zipball/master TESTS='python setup.py test'
|
||||
- DJANGO=https://github.com/django/django/zipball/master TESTS='python examples/runtests.py'
|
||||
- DJANGO=django==1.4.1 --use-mirrors TESTS='python setup.py test'
|
||||
- DJANGO=django==1.4.1 --use-mirrors TESTS='python examples/runtests.py'
|
||||
- DJANGO=django==1.3.3 --use-mirrors TESTS='python setup.py test'
|
||||
- DJANGO=django==1.3.3 --use-mirrors TESTS='python examples/runtests.py'
|
||||
# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
|
||||
install:
|
||||
- pip install $DJANGO
|
||||
- pip install -e . --use-mirrors
|
||||
- pip install -r requirements.txt
|
||||
- pip install -r examples/requirements.txt
|
||||
|
||||
# command to run tests, e.g. python setup.py test
|
||||
script:
|
||||
- $TESTS
|
||||
|
|
@ -21,7 +21,14 @@ Full documentation for the project is available at http://django-rest-framework.
|
|||
Issue tracking is on `GitHub <https://github.com/tomchristie/django-rest-framework/issues>`_.
|
||||
General questions should be taken to the `discussion group <http://groups.google.com/group/django-rest-framework>`_.
|
||||
|
||||
We also have a `Jenkins service <http://jenkins.tibold.nl/job/djangorestframework1/>`_ which runs our test suite.
|
||||
Project
|
||||
=======
|
||||
|
||||
:build status: |build-image|
|
||||
|
||||
.. |build-image| image:: https://secure.travis-ci.org/markotibold/django-rest-framework.png?branch=master
|
||||
:target: https://secure.travis-ci.org/markotibold/django-rest-framework
|
||||
|
||||
|
||||
Requirements:
|
||||
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
Pygments==1.4
|
||||
Markdown==2.0.3
|
||||
git+git://github.com/tomchristie/django-rest-framework.git
|
283
tox.ini
283
tox.ini
|
@ -1,283 +0,0 @@
|
|||
#This file is very NON-DRY because tox currently doesn't support interpolation like configparser does.
|
||||
#There's a ticket covering this at http://code.google.com/p/pytox/issues/detail?id=17#c0
|
||||
|
||||
[tox]
|
||||
envlist=
|
||||
py25-django12,
|
||||
py26-django12,
|
||||
py27-django12,
|
||||
py25-django13,
|
||||
py26-django13,
|
||||
py27-django13,
|
||||
py25-django14a1,
|
||||
py26-django14a1,
|
||||
py27-django14a1,
|
||||
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 ############################################
|
||||
|
||||
[testenv]
|
||||
commands=
|
||||
python setup.py test
|
||||
|
||||
[testenv:py25-django12]
|
||||
basepython=python2.5
|
||||
deps=
|
||||
django==1.2.4
|
||||
django-staticfiles>=1.1.2
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
# Optional packages:
|
||||
markdown
|
||||
|
||||
[testenv:py26-django12]
|
||||
basepython=python2.6
|
||||
deps=
|
||||
django==1.2.4
|
||||
django-staticfiles>=1.1.2
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
# Optional packages:
|
||||
markdown
|
||||
|
||||
[testenv:py27-django12]
|
||||
basepython=python2.7
|
||||
deps=
|
||||
django==1.2.4
|
||||
django-staticfiles>=1.1.2
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
# Optional packages:
|
||||
markdown
|
||||
|
||||
[testenv:py25-django13]
|
||||
basepython=python2.5
|
||||
deps=
|
||||
django==1.3
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
# Optional packages:
|
||||
markdown
|
||||
|
||||
[testenv:py26-django13]
|
||||
basepython=python2.6
|
||||
deps=
|
||||
django==1.3
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
# Optional packages:
|
||||
markdown
|
||||
|
||||
[testenv:py27-django13]
|
||||
basepython=python2.7
|
||||
deps=
|
||||
django==1.3
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
# Optional packages:
|
||||
markdown
|
||||
|
||||
[testenv:py25-django14a1]
|
||||
basepython=python2.5
|
||||
deps=
|
||||
http://www.djangoproject.com/download/1.4-alpha-1/tarball/
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
# Optional packages:
|
||||
markdown
|
||||
|
||||
[testenv:py26-django14a1]
|
||||
basepython=python2.6
|
||||
deps=
|
||||
http://www.djangoproject.com/download/1.4-alpha-1/tarball/
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
# Optional packages:
|
||||
markdown
|
||||
|
||||
[testenv:py27-django14a1]
|
||||
basepython=python2.7
|
||||
deps=
|
||||
http://www.djangoproject.com/download/1.4-alpha-1/tarball/
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
# Optional packages:
|
||||
markdown
|
||||
|
||||
####################################### EXAMPLES ################################################
|
||||
|
||||
[testenv:py25-django12-examples]
|
||||
basepython=python2.5
|
||||
commands=
|
||||
python examples/runtests.py
|
||||
deps=
|
||||
django==1.2.4
|
||||
django-staticfiles>=1.1.2
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
wsgiref==0.1.2
|
||||
Pygments==1.4
|
||||
httplib2==0.6.0
|
||||
Markdown==2.0.3
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
|
||||
[testenv:py26-django12-examples]
|
||||
basepython=python2.6
|
||||
commands=
|
||||
python examples/runtests.py
|
||||
deps=
|
||||
django==1.2.4
|
||||
django-staticfiles>=1.1.2
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
wsgiref==0.1.2
|
||||
Pygments==1.4
|
||||
httplib2==0.6.0
|
||||
Markdown==2.0.3
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
|
||||
[testenv:py27-django12-examples]
|
||||
basepython=python2.7
|
||||
commands=
|
||||
python examples/runtests.py
|
||||
deps=
|
||||
django==1.2.4
|
||||
django-staticfiles>=1.1.2
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
wsgiref==0.1.2
|
||||
Pygments==1.4
|
||||
httplib2==0.6.0
|
||||
Markdown==2.0.3
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
|
||||
[testenv:py25-django13-examples]
|
||||
basepython=python2.5
|
||||
commands=
|
||||
python examples/runtests.py
|
||||
deps=
|
||||
django==1.3
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
wsgiref==0.1.2
|
||||
Pygments==1.4
|
||||
httplib2==0.6.0
|
||||
Markdown==2.0.3
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
|
||||
[testenv:py26-django13-examples]
|
||||
basepython=python2.6
|
||||
commands=
|
||||
python examples/runtests.py
|
||||
deps=
|
||||
django==1.3
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
wsgiref==0.1.2
|
||||
Pygments==1.4
|
||||
httplib2==0.6.0
|
||||
Markdown==2.0.3
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
|
||||
[testenv:py27-django13-examples]
|
||||
basepython=python2.7
|
||||
commands=
|
||||
python examples/runtests.py
|
||||
deps=
|
||||
django==1.3
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
wsgiref==0.1.2
|
||||
Pygments==1.4
|
||||
httplib2==0.6.0
|
||||
Markdown==2.0.3
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
|
||||
[testenv:py25-django14a1-examples]
|
||||
basepython=python2.5
|
||||
commands=
|
||||
python examples/runtests.py
|
||||
deps=
|
||||
http://www.djangoproject.com/download/1.4-alpha-1/tarball/
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
wsgiref==0.1.2
|
||||
Pygments==1.4
|
||||
httplib2==0.6.0
|
||||
Markdown==2.0.3
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
|
||||
[testenv:py26-django14a1-examples]
|
||||
basepython=python2.6
|
||||
commands=
|
||||
python examples/runtests.py
|
||||
deps=
|
||||
http://www.djangoproject.com/download/1.4-alpha-1/tarball/
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
wsgiref==0.1.2
|
||||
Pygments==1.4
|
||||
httplib2==0.6.0
|
||||
Markdown==2.0.3
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
|
||||
[testenv:py27-django14a1-examples]
|
||||
basepython=python2.7
|
||||
commands=
|
||||
python examples/runtests.py
|
||||
deps=
|
||||
http://www.djangoproject.com/download/1.4-alpha-1/tarball/
|
||||
coverage==3.4
|
||||
URLObject>=0.6.0
|
||||
wsgiref==0.1.2
|
||||
Pygments==1.4
|
||||
httplib2==0.6.0
|
||||
Markdown==2.0.3
|
||||
unittest-xml-reporting==1.2
|
||||
Pyyaml==3.10
|
||||
|
||||
##########################################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
|
Loading…
Reference in New Issue
Block a user