112 Commits

Author	SHA1	Message	Date
Xavier Ordoquy	a97cbd1d68	Merge pull request #2999 from linovia/feature/short_pytest_tracebacks ... Let py.test use the short traceback format.	2015-06-02 16:24:47 +01:00
Xavier Ordoquy	87a523465b	Let py.test use the short traceback format.	2015-06-02 10:49:47 +01:00
Nicolas Delaby	27fd48586e	allow to pass arbitrary arguments to py.test	2015-06-02 09:19:18 +02:00
José Padilla	9844f652a9	Workaround for bug in pip	2015-04-04 22:18:52 -04:00
José Padilla	7228a0df75	Test against Django's master branch	2015-04-04 22:07:11 -04:00
Tymur Maryokhin	596093d494	Django 1.8 released	2015-04-02 10:50:53 +02:00
Tom Christie	331f48054c	Try to resolve pep8 versioning clash.	2015-03-23 15:59:18 +00:00
Tom Christie	b3956bc591	Upgrade testing env name to django18beta	2015-02-26 13:23:05 +00:00
Tom Christie	e72428214c	Formally upgrade suport to Django 1.8-beta	2015-02-26 12:53:24 +00:00
Tom Christie	9f4f9c9c9f	Single source of truth for requirements	2015-02-17 12:46:55 +00:00
Tom Christie	fbb21caaaa	Merge master	2015-02-09 20:43:50 +00:00
Tom Christie	7b639c0cd0	Drop django master from the build matrix. ... Currently always going to be a know failure case. We can add it back when we start to consdier Django 1.9 support.	2015-02-09 17:57:08 +00:00
Tom Christie	4ee4b4f2dc	Merge master	2015-01-30 14:00:25 +00:00
Tom Christie	39f26c9eca	Merge master	2015-01-23 14:28:59 +00:00
Carlton Gibson	bf0b331e8f	Restore DF for Django 1.8	2015-01-23 15:21:51 +01:00
Tom Christie	e307fd289c	Fix test matrix	2015-01-23 11:38:58 +00:00
Tom Christie	5eb6949e9f	Drop django-filter from 1.8	2015-01-23 11:32:04 +00:00
Tom Christie	6065cdbd93	Merge master	2015-01-19 15:16:57 +00:00
David Muller	a82a4d0a09	Add Django 1.8 alpha to test matrix	2015-01-18 15:04:50 -08:00
David Muller	1421b057f7	Bump pytest version in tox.ini to 2.6.4	2015-01-18 14:48:23 -08:00
David Muller	eb91076886	Bump pytest-django version in tox.ini to 2.8.0	2015-01-18 14:47:37 -08:00
Tom Christie	0800866988	Fix broken 1.7.3. It's 1.7.2 - 1.7.3 is documented but not yet on PyPI.	2015-01-08 14:54:54 +00:00
Tom Christie	42c913334b	Minimum 1.6.x version is 1.6.3	2015-01-08 14:51:08 +00:00
Tom Christie	f529f83d3c	Minimum Django 1.5 version issue 1.5.6	2015-01-08 14:38:23 +00:00
Tom Christie	26131a7aea	Fix dependancies	2014-12-12 15:59:11 +00:00
Tom Christie	baaa356489	Merge master	2014-12-12 15:37:43 +00:00
Tom Christie	3d6620c72a	Merge	2014-12-03 23:24:06 +00:00
Tymur Maryokhin	f8fdfe5a93	Updated Django versions to match requirements	2014-12-04 00:03:08 +01:00
José Padilla	731c8421af	Remove YAML support from core	2014-11-29 14:43:05 -04:00
José Padilla	0cc990792c	Merge branch 'version-3.1' into oauth_as_package ... Conflicts: requirements-test.txt rest_framework/compat.py tests/settings.py tox.ini	2014-11-28 12:14:40 -04:00
José Padilla	fceeecf1e2	Update to latest minor Django versions	2014-11-27 09:06:37 -04:00
Tom Christie	0ba94d7595	Merge branch 'master' of https://github.com/tomchristie/django-rest-framework	2014-11-25 16:07:14 +00:00
José Padilla	e1b8412eed	Add markdown and PyYAML to tox test requirements	2014-11-25 09:22:29 -04:00
Dougal Matthews	04abe9830c	Add a docs build to the Tox run	2014-11-25 12:42:39 +00:00
Tymur Maryokhin	c559ec6da8	Removed dots in Django versions in tox. Refs #2124.	2014-11-25 12:03:54 +01:00
Tymur Maryokhin	b6de2660ea	Added python 3.2 to test against django master . Related to #2075.	2014-11-25 11:09:36 +01:00
Tymur Maryokhin	585054f012	Streamlined tox config with 1.8 features	2014-11-25 10:57:46 +01:00
Tom Christie	b001a146d7	Add django master to build matrix. Closes #2075.	2014-11-17 09:56:20 +00:00
Tom Christie	0e59c27e2f	Merge branch 'master' into version-3.0	2014-10-31 15:19:40 +00:00
José Padilla	8af3d5db49	Use PYTHONDONTWRITEBYTECODE=1 on tox environment ... This fixes bad marshal data errors after running tests with tox and later running tests manually via runtests.py. Fixes #1957	2014-10-28 16:58:25 -04:00
Tom Christie	dee3f78cb6	FileField and ImageField	2014-09-26 17:06:20 +01:00
Jharrod LaFon	afaa52a378	Removes OAuth dependencies from tox configurations	2014-09-05 15:42:29 -07:00
José Padilla	fc250bf74b	Test with released Django 1.7	2014-09-03 09:58:21 -07:00
Tom Christie	19f3134062	Add flake8 to requirements	2014-08-19 13:42:01 +01:00
Tom Christie	bf09c32de8	Code linting and added runtests.py	2014-08-19 13:28:07 +01:00
Tom Christie	e385a7b8eb	Merge master	2014-08-19 10:11:10 +01:00
Xavier Ordoquy	0cbdbd24e5	Updated the tox file.	2014-07-28 13:54:43 +02:00
Xavier Ordoquy	2489e38a06	Merge remote-tracking branch 'origin/master' into 2.4.0 ... 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-06-23 14:02:45 +02:00
Xavier Ordoquy	b370fb40b6	Typo in the Python version.	2014-05-16 01:06:34 +02:00
Xavier Ordoquy	e5556079fc	Updated tox with Python 2.4	2014-05-16 00:50:16 +02:00