aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
AgeCommit message (Collapse)Author
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-23Aligned the django-filter version with travis builds.Xavier Ordoquy
2014-03-21Bumped tests against Django from 1.7a2 to 1.7b1Xavier Ordoquy
2014-03-07Add Django 1.7 to toxTom Christie
2014-03-07Pin pillow to 2.3.0Tom Christie
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
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-08Updated versions in tox and travis configBruno Renié
2013-09-25Drop 1.3 supportTom Christie
2013-09-06some properly failing tests, set up for standard permissionsbwreilly
2013-06-05Fix up tests and toxTom Christie
2013-06-02Add Django 1.6 to docs and to toxTom Christie
2013-03-13Use django-filter 0.6a1 and add database query count tests for paginated, ↵Tom Christie
filtered lists.
2013-03-07Merge OAuth2 work.Tom Christie
2013-03-07Merge & clean OAuth supportTom Christie
2013-03-06Update the package dependency url style in tox.iniPierre Dulac
2013-03-06Use the PyPI django-oauth2-provider versionPierre Dulac
2013-03-06Clean ups to datetime formattingTom Christie
2013-02-27Update for Django 1.5Tom Christie
2013-02-22defusedxml for security fix.Tom Christie
As per: http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html
2013-02-01Py3k cleanupTom Christie
2013-02-013.2, 3.3 compatTom Christie
2012-12-19Update minor Django versions in toxTom Christie
2012-11-16Docs, tox and travis use django-filter 0.5.4Tom Christie
2012-11-01Add django-filter to tox.ini.Ben Konrath
2012-09-28Fix serialization issue with Django 1.3Tom Christie
2012-09-27Add py27 to toxTom Christie
2012-09-25Added tox.iniTom Christie
2012-08-29Remove toxTom Christie
2012-01-31django-staticfiles for Django 1.2 compatabilityTom Christie
2012-01-30Django 1.2 needs django-staticfilesTom Christie
2012-01-05Added URLObjectTom Christie
2012-01-02Rename examples in tox.Tom Christie
2012-01-02Rename examples in tox.Tom Christie
2011-12-30Added django 1.4 aplha 1. Marko Tibold
2011-12-21Fix style consistency.Marko Tibold
2011-12-21Make sure the optional markdown functionality is also tested.Marko Tibold
2011-12-15see previous commit message.Marko Tibold
2011-06-26syncing dependencies.markotibold
2011-04-27Danielfm packaged the 1.2 release so we can now install it from his repo.markotibold
2011-04-26tox can now use django 1.3 rather than 1.3-rc1. Huzzah.tom christie tom@tomchristie.com
2011-04-26simplejson no longer a requirement for python 2.5 (uses django's built in ↵tom christie tom@tomchristie.com
simplejson lib)
2011-03-20fixed bad naming of testenvmarkotibold
2011-03-20All should work fine now on jenkins. For some reason Tox with jenkins and ↵markotibold
env names of the form platform-djangoversion-examples results in an OSError Permission denied. No clue why.
2011-03-20testing jenkinsmarkotibold