aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
AgeCommit message (Collapse)Author
2015-04-04Test against Django's master branchJosé Padilla
2015-04-02Django 1.8 releasedTymur Maryokhin
2015-02-26Upgrade testing env name to django18betaTom Christie
2015-02-09Drop django master from the build matrix.Tom Christie
Currently always going to be a know failure case. We can add it back when we start to consdier Django 1.9 support.
2015-01-23Move 1.8-alpha out of 'expected failures'Tom Christie
2015-01-18Add Django 1.8 alpha to test matrixDavid Muller
2014-11-25Add a docs build to the Tox runDougal Matthews
2014-11-25Removed dots in Django versions in tox. Refs #2124.Tymur Maryokhin
2014-11-25Added python 3.2 to test against django master . Related to #2075.Tymur Maryokhin
2014-11-25Updated travis configTymur Maryokhin
2014-11-18Use the new build env on TravisJosh Kalderimis
faster vms, more ram, more cpu, better vm boot times official docs coming soon
2014-11-17Add django master to build matrix. Closes #2075.Tom Christie
2014-09-05Install tox correctlyJosé Padilla
2014-09-05Install toxJosé Padilla
2014-09-05Try running Tox from TravisJosé Padilla
2014-09-03Test with released Django 1.7José Padilla
2014-08-19Add flake8 to requirementsTom Christie
2014-08-19Code linting and added runtests.pyTom Christie
2014-08-19Merge masterTom Christie
2014-07-28Django-guardian version cleanup.Xavier Ordoquy
2014-06-23Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml docs/api-guide/viewsets.md rest_framework/serializers.py rest_framework/throttling.py tests/test_generics.py tests/test_serializers.py tox.ini
2014-05-18Fixed a small change in the 1.7 beta url.Xavier Ordoquy
2014-05-18Updated Django versions.Xavier Ordoquy
2014-05-11Enable testing on Python 3.4Corey Farwell
2014-05-01Merge remote-tracking branch 'reference/2.4.0' into feature/pytestXavier Ordoquy
Conflicts: rest_framework/runtests/urls.py tests/test_response.py tox.ini
2014-04-30Merge remote-tracking branch 'reference/master' into feature/pytestXavier Ordoquy
Conflicts: tests/test_serializer.py
2014-04-30Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml rest_framework/serializers.py rest_framework/tests/test_authentication.py
2014-04-27Updated Django's versions.Xavier Ordoquy
2014-04-17Upgraded to pytest-django 2.6.1Xavier Ordoquy
2014-04-17Merge remote-tracking branch 'pelme/pytest' into feature/pytestXavier Ordoquy
Conflicts: .travis.yml rest_framework/runtests/runtests.py tests/test_filters.py tests/test_pagination.py tox.ini
2014-04-13Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml docs/api-guide/fields.md docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/authentication.py rest_framework/serializers.py rest_framework/templatetags/rest_framework.py rest_framework/tests/test_authentication.py rest_framework/tests/test_filters.py rest_framework/tests/test_hyperlinkedserializers.py rest_framework/tests/test_serializer.py rest_framework/tests/test_testing.py rest_framework/utils/encoders.py tox.ini
2014-03-21Bumped tests against Django from 1.7a2 to 1.7b1Xavier Ordoquy
2014-03-07Pin pillow to 2.3.0Tom Christie
2014-03-03Merge remote-tracking branch 'reference/master' into feature/django_1_7Xavier Ordoquy
2014-03-02Support for running the test suite with py.testAndreas Pelme
* Get rid of runtests.py * Moved test code from rest_framework/tests and rest_framework/runtests to tests * Invoke py.test from setup.py * Invoke py.test from Travis * Invoke py.test from tox * Changed setUpClass to be just plain setUp in test_permissions.py * Updated contribution guideline to show how to invoke py.test
2014-02-27Update Travis to test Django 1.6.2Adam McKerlie
We should be testing the latest version of Django 1.6 as we're doing in the other 1.x releases.
2014-02-13Skip Python 2.6 build for Django 1.7Xavier Ordoquy
2014-02-13Fixed a typo.Xavier Ordoquy
2014-02-13Use 1.7a2 for django 1.7 line and added django-guardian PR for python 3.x or ↵Xavier Ordoquy
django 1.7 tests.
2014-01-30Upgraded django-oauth-plusXavier Ordoquy
2014-01-28Install Pillow for ImageField to work.Xavier Ordoquy
2014-01-28Updated the django-filter version and added tests against Django 1.7a1Xavier Ordoquy
2013-12-23Merge branch 'bennbollay-patch-1' into 2.4.0Tom Christie
Conflicts: .travis.yml docs/api-guide/routers.md rest_framework/compat.py tox.ini
2013-12-13Merge branch 'master' into 2.4.0Tom Christie
Conflicts: .travis.yml docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/compat.py
2013-11-15update requirements for django-oauth-plus to 2.2.1Philip Forget
2013-11-08Exclude 1.4 on python 3Bruno Renié
2013-11-08Updated versions in tox and travis configBruno Renié
2013-09-25Drop 1.3 supportTom Christie
2013-09-25Merge masterTom Christie
2013-09-10Add Django Guardian to travis testingTom Christie