Commit Graph

91 Commits

Author SHA1 Message Date
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
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
Tymur Maryokhin
f8fdfe5a93 Updated Django versions to match requirements 2014-12-04 00:03:08 +01: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
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
Xavier Ordoquy
7b4463f739 Merge remote-tracking branch 'reference/2.4.0' into feature/pytest
Conflicts:
	rest_framework/runtests/urls.py
	tests/test_response.py
	tox.ini
2014-05-01 08:01:38 +02:00
Xavier Ordoquy
2aca69a946 Merge remote-tracking branch 'reference/master' into feature/pytest
Conflicts:
	tests/test_serializer.py
2014-04-30 22:24:01 +02:00
Xavier Ordoquy
56b4390316 Merge remote-tracking branch 'origin/master' into 2.4.0
Conflicts:
	.travis.yml
	rest_framework/serializers.py
	rest_framework/tests/test_authentication.py
2014-04-30 22:21:26 +02:00
Xavier Ordoquy
4a1ef6d4b1 Updated Django's versions. 2014-04-27 11:52:33 +02:00
Xavier Ordoquy
f22ed49c64 Upgraded to pytest-django 2.6.1 2014-04-17 11:09:02 +02:00
Xavier Ordoquy
1797a74e82 Merge remote-tracking branch 'pelme/pytest' into feature/pytest
Conflicts:
	.travis.yml
	rest_framework/runtests/runtests.py
	tests/test_filters.py
	tests/test_pagination.py
	tox.ini
2014-04-17 09:53:44 +02:00
Xavier Ordoquy
d08536ad9d Merge remote-tracking branch 'origin/master' into 2.4.0
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-04-13 00:05:57 +02:00
Xavier Ordoquy
2a27674a79 Aligned the django-filter version with travis builds. 2014-03-23 15:40:42 +01:00
Xavier Ordoquy
b04cd57050 Bumped tests against Django from 1.7a2 to 1.7b1 2014-03-21 16:37:27 +01:00
Tom Christie
6cf19fa4ef Add Django 1.7 to tox 2014-03-07 14:16:31 +00:00
Tom Christie
4001cd74ed Pin pillow to 2.3.0 2014-03-07 14:15:56 +00:00
Andreas Pelme
971578ca34 Support for running the test suite with py.test
* 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-03-02 12:40:30 +01:00
Tom Christie
52686420f4 Merge branch 'bennbollay-patch-1' into 2.4.0
Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	rest_framework/compat.py
	tox.ini
2013-12-23 09:48:59 +00:00
Tom Christie
9c41c007af Merge branch 'master' into 2.4.0
Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/compat.py
2013-12-13 16:32:34 +00:00
Philip Forget
4b947a6a2a update requirements for django-oauth-plus to 2.2.1 2013-11-15 12:18:22 -05:00
Bruno Renié
1296753b5c Updated versions in tox and travis config 2013-11-08 11:58:14 +01:00
Tom Christie
e441f85109 Drop 1.3 support 2013-09-25 10:30:04 +01:00
bwreilly
b07de86ad3 some properly failing tests, set up for standard permissions 2013-09-06 12:35:06 -05:00
Tom Christie
2ca243a114 Fix up tests and tox 2013-06-05 13:20:06 +01:00
Tom Christie
b10869a08b Add Django 1.6 to docs and to tox 2013-06-02 21:14:02 +01:00
Tom Christie
73ab7dc3f1 Use django-filter 0.6a1 and add database query count tests for paginated, filtered lists. 2013-03-13 12:45:54 +00:00