Commit Graph

130 Commits

Author SHA1 Message Date
José Padilla
3bcb7dba8c Update Django versions 2015-11-24 14:23:14 -04:00
José Padilla
e2ac148367 Test against Django 1.9rc1 2015-11-17 09:58:55 -04:00
Ryan Hiebert
240eb672af Don't specify basepython
tox automatically includes basepython definitions for all the common
python versions, and will recognize it in factors of envs in the
envlist.
2015-11-05 12:12:29 -06:00
José Padilla
08a00ce46d Test against Django 1.8.6 2015-11-04 13:27:19 -04:00
Tom Christie
5b5d6f1d4b Test against Django 1.9 beta 2015-10-20 10:53:45 +01:00
Tom Christie
02e1f69d2b Django 1.9 support 2015-09-28 11:44:07 +01:00
Carlton Gibson
5c0dffa4f7 Remove Django 1.6 from test matrix 2015-09-22 15:39:51 +02:00
Carlton Gibson
524a28c6f8 Exclude Guardian testing against Django master 2015-09-22 15:14:25 +02:00
Carlton Gibson
8edb9d3c1f Drop testing against Django 1.5 2015-09-21 16:08:56 +02:00
Carlton Gibson
366dff4f26 Test Python 3.5 against Django master 2015-09-21 16:03:37 +02:00
Carlton Gibson
796baab86f Drop Pythons 3.2, 3.3 for Django master
No longer supported
2015-09-21 15:47:11 +02:00
José Padilla
01fa2647c9 Bump up maximum supported Django versions 2015-08-22 08:49:05 -04:00
Tymur Maryokhin
4e5da16961 Remove Django 1.4 compat code 2015-08-07 00:02:29 +02:00
Tom Christie
1df5844e67 Merge pull request #3208 from treyhunner/add-codecov
Report test coverage via Codecov
2015-08-03 17:13:46 +01:00
Tom Christie
c8ad0cce19 Bump minimum Django version to 1.5 2015-07-30 15:43:39 +01:00
Trey Hunner
cb257ec524 Measure code coverage in tox 2015-07-29 20:45:23 -07:00
José Padilla
b4ba8ef4d7 Setup isort for code style linting 2015-06-26 09:16:33 -04:00
José Padilla
b519407b57 Track maximum supported 1.7 and 1.8 versions 2015-06-22 16:04:52 -04:00
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