diff options
| author | Tom Christie | 2012-10-30 14:32:31 +0000 |
|---|---|---|
| committer | Tom Christie | 2012-10-30 14:32:31 +0000 |
| commit | 9b30dab4f772f67a626e176dc4fae0a3ef9c2c81 (patch) | |
| tree | ca138abf4792f58ffa28684f784f201ee1eef6d7 /.travis.yml | |
| parent | 7e5b1501b5cede61a9391fb1a751d2ebcdb37031 (diff) | |
| parent | 4e7805cb24d73e7f706318b5e5a27e3f9ba39d14 (diff) | |
| download | django-rest-framework-2.0.0.tar.bz2 | |
Merge branch 'restframework2' into rest-framework-2-merge2.0.0
Conflicts:
.gitignore
.travis.yml
AUTHORS
README.rst
djangorestframework/mixins.py
djangorestframework/renderers.py
djangorestframework/resources.py
djangorestframework/serializer.py
djangorestframework/templates/djangorestframework/base.html
djangorestframework/templates/djangorestframework/login.html
djangorestframework/templatetags/add_query_param.py
djangorestframework/tests/accept.py
djangorestframework/tests/authentication.py
djangorestframework/tests/content.py
djangorestframework/tests/reverse.py
djangorestframework/tests/serializer.py
djangorestframework/views.py
docs/examples.rst
docs/examples/blogpost.rst
docs/examples/modelviews.rst
docs/examples/objectstore.rst
docs/examples/permissions.rst
docs/examples/pygments.rst
docs/examples/views.rst
docs/howto/alternativeframeworks.rst
docs/howto/mixin.rst
docs/howto/reverse.rst
docs/howto/usingurllib2.rst
docs/index.rst
docs/topics/release-notes.md
examples/sandbox/views.py
rest_framework/__init__.py
rest_framework/compat.py
rest_framework/utils/breadcrumbs.py
setup.py
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 3ce1ee7b..0e177a95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,22 +5,13 @@ python: - "2.7" env: - - DJANGO=https://github.com/django/django/zipball/master TESTS='python setup.py test' - - DJANGO=django==1.4.1 --use-mirrors TESTS='python setup.py test' - - DJANGO=django==1.3.3 --use-mirrors TESTS='python setup.py test' + - DJANGO=https://github.com/django/django/zipball/master + - DJANGO=django==1.4.1 --use-mirrors + - DJANGO=django==1.3.3 --use-mirrors -# 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 $DJANGO + - export PYTHONPATH=. -# command to run tests, e.g. python setup.py test script: - - $TESTS - -# Examples tests, currently dropped to keep the number of configurations sane -# - DJANGO=https://github.com/django/django/zipball/master TESTS='python examples/runtests.py' -# - DJANGO=django==1.4.1 --use-mirrors TESTS='python examples/runtests.py' -# - DJANGO=django==1.3.3 --use-mirrors TESTS='python examples/runtests.py' -# - pip install -r examples/requirements.txt
\ No newline at end of file + - python rest_framework/runtests/runtests.py |