encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-14 13:46:59 +03:00
Code Issues Packages Projects Releases Wiki Activity
8,053 Commits 18 Branches 132 Tags 104 MiB
e4e75f1c7c
Commit Graph

150 Commits

Author SHA1 Message Date
Tom Christie
1df5844e67 Merge pull request #3208 from treyhunner/add-codecov 
Report test coverage via Codecov
 2015-08-03 17:13:46 +01:00
Trey Hunner
5b95536376 Run codecov after success on Travis CI 2015-07-31 18:21:52 -07:00
Tom Christie
c8ad0cce19 Bump minimum Django version to 1.5 2015-07-30 15:43:39 +01:00
José Padilla
b4ba8ef4d7 Setup isort for code style linting 2015-06-26 09:16:33 -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
b3956bc591 Upgrade testing env name to django18beta 2015-02-26 13:23:05 +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
04a5f7bf0a Move 1.8-alpha out of 'expected failures' 2015-01-23 13:04:29 +00:00
David Muller
a82a4d0a09 Add Django 1.8 alpha to test matrix 2015-01-18 15:04:50 -08: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
1fcb495456 Updated travis config 2014-11-25 10:58:03 +01:00
Josh Kalderimis
5cda5ad18e Use the new build env on Travis 
faster vms, more ram, more cpu, better vm boot times

official docs coming soon
 2014-11-18 13:06:08 -05:00
Tom Christie
b001a146d7 Add django master to build matrix. Closes #2075. 2014-11-17 09:56:20 +00:00
José Padilla
6901677cbd Install tox correctly 2014-09-05 17:56:25 -07:00
José Padilla
a01176ce5f Install tox 2014-09-05 17:50:49 -07:00
José Padilla
7173e134dd Try running Tox from Travis 2014-09-05 17:47: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
5429c2800e Django-guardian version cleanup. 2014-07-28 08:00:50 +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
af1ee3e631 Fixed a small change in the 1.7 beta url. 2014-05-18 09:38:46 +02:00
Xavier Ordoquy
a2e1024f8b Updated Django versions. 2014-05-18 09:27:23 +02:00
Corey Farwell
8ecb778cd2 Enable testing on Python 3.4 2014-05-11 20:29:01 -07: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
b04cd57050 Bumped tests against Django from 1.7a2 to 1.7b1 2014-03-21 16:37:27 +01:00
Tom Christie
4001cd74ed Pin pillow to 2.3.0 2014-03-07 14:15:56 +00:00
Xavier Ordoquy
3d7cb72e0a Merge remote-tracking branch 'reference/master' into feature/django_1_7 2014-03-03 11:41:07 +01: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
Adam McKerlie
0620263d24 Update Travis to test Django 1.6.2 
We should be testing the latest version of Django 1.6 as we're doing in the other 1.x releases.
 2014-02-27 11:47:21 -05:00
Xavier Ordoquy
d498460253 Skip Python 2.6 build for Django 1.7 2014-02-13 13:10:48 +01:00
Xavier Ordoquy
57103587e0 Fixed a typo. 2014-02-13 12:50:04 +01:00
Xavier Ordoquy
c61d311acb Use 1.7a2 for django 1.7 line and added django-guardian PR for python 3.x or django 1.7 tests. 2014-02-13 12:34:50 +01:00
Xavier Ordoquy
ef742f2d46 Upgraded django-oauth-plus 2014-01-30 17:18:03 +01:00
Xavier Ordoquy
9c910a3f6d Install Pillow for ImageField to work. 2014-01-28 23:43:37 +01:00
Xavier Ordoquy
12d0563082 Updated the django-filter version and added tests against Django 1.7a1 2014-01-28 07:40:13 +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é
f2ea5780d2 Exclude 1.4 on python 3 2013-11-08 14:58:36 +01: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
Tom Christie
21cd638659 Merge master 2013-09-25 09:44:26 +01:00
Tom Christie
a1d7ed20d2 Add Django Guardian to travis testing 2013-09-10 21:06:53 +01:00
Tom Christie
44ceef8415 Updating 2.4.0 release notes 2013-08-21 21:30:25 +01:00
Tom Christie
6cc4fe5637 Drop coveralls as seems to be screwing with things 2013-06-14 12:55:48 +01:00
Tom Christie
34f34f40b8 Adding coveralls to travis builds 2013-06-14 12:43:34 +01:00
Xavier Ordoquy
9d4fc3226e Upgraded the django-oauth2-provider. 2013-06-02 21:34:12 +02:00
Xavier Ordoquy
1f03b267cf Added Django 1.6a1 to the test matrix. 2013-05-28 14:49:27 +02:00
Xavier Ordoquy
ed0bd195f5 Updated the dependencies version and added the ALLOWED_HOSTS for tests. 2013-05-18 12:07:44 +02: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
Tom Christie
a4b33992a5 Merge OAuth2 work. 2013-03-07 17:43:13 +00:00
Tom Christie
d4e3610e71 Merge & clean OAuth support 2013-03-07 09:01:53 +00:00
Pierre Dulac
6f5764105b Use the PyPI django-oauth2-provider version 2013-03-06 19:15:33 +01:00
Pierre Dulac
182edb3e9b Add django-oauth2-provider to .travis.yml 2013-03-01 21:25:42 +01:00
Tom Christie
6e6f6f2c7d Update for Django 1.5 2013-02-27 21:14:40 +00:00
swistakm
dd355d511c oauth2 & django-oauth-plus installed only on 2.x 2013-02-27 10:56:04 +01:00
swistakm
e2b11a29d1 add django-oauth-plus & oauth2 to .travis.yml 2013-02-25 17:00:09 +01:00
Tom Christie
dcee027fa9 defusedxml for security fix. 
As per:
http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html
 2013-02-22 13:17:22 +00:00
Tom Christie
00752dcd2a Py3k cleanup 2013-02-01 15:07:51 +00:00
Xavier Ordoquy
0f0e76d8b1 Don't double install django-filter. 2013-01-08 00:00:28 +01:00
Xavier Ordoquy
5dd76c0706 Correctly remove from the matrix incompatible django / python versions. 2013-01-07 23:55:16 +01:00
Xavier Ordoquy
0252057ee0 Reverted on the right django 1.5 rc1 url and made sure we use mirrors for our django downloads. 2013-01-07 23:52:26 +01:00
Xavier Ordoquy
28248f3573 Attempt with another url for django 2013-01-07 23:46:44 +01:00
Xavier Ordoquy
86a3ad9b3d Check for travis builds. 2013-01-07 23:36:39 +01:00
Xavier Ordoquy
dd45642055 Try a lighter alternative to install django-filter trunk 2013-01-07 23:34:03 +01:00
Xavier Ordoquy
22a7dc27d8 Typo in the travis.yml. 2013-01-07 23:09:47 +01:00
Xavier Ordoquy
c1e3b42fee Conditional six installation (only for django 1.3.5) and install 3.2 compatible django-filter for python 3.2 test. 2013-01-07 22:41:42 +01:00
Xavier Ordoquy
fccf1814f1 Test against Django 1.5 rc1 2013-01-07 22:23:16 +01:00
Xavier Ordoquy
92f1109cd8 Exclude non python 3 compatible django verison from the test matrix. 2013-01-02 17:52:31 +01:00
Xavier Ordoquy
737349d238 Merge remote-tracking branch 'reference/py3k' into p3k 2013-01-02 16:09:21 +01:00
Marko Tibold
19da42822a Update yaml envs to latest Django 2012-12-13 23:14:45 +01:00
Xavier Ordoquy
fa53dde576 Reactivated the python 2.6 tests. 2012-12-02 01:26:02 +01:00
Xavier Ordoquy
bf8ceca122 Updated the build to use django 1.5 beta 1. 2012-11-28 10:52:03 +01:00
Xavier Ordoquy
237e35120d Exclude python3.2 for django < 1.5 2012-11-23 01:22:39 +01:00
Xavier Ordoquy
43c9a1c466 Don't test with python 3.3 2012-11-22 00:33:28 +01:00
Xavier Ordoquy
80b95438df Don't forget to add six for requirements. 2012-11-22 00:26:10 +01:00
Xavier Ordoquy
17234a5a3f Also test 3.2 2012-11-21 18:21:26 +01:00
Xavier Ordoquy
753c4fc4f6 Travis tests for python 3. 2012-11-21 18:03:46 +01:00
Tom Christie
2f2bde69e4 Docs, tox and travis use django-filter 0.5.4 2012-11-16 20:58:49 +00:00
Tom Christie
9fe317b2ca Make django-filter optional 2012-11-07 21:13:38 +00:00
Ben Konrath
806bb728bf Use requirements.txt in Travis 'install'. 2012-11-01 20:11:15 +01:00
Tom Christie
db0a9acfd7 Add PYTHONPATH in travis config 2012-10-11 13:12:43 +01:00
Tom Christie
3c9fb04299 Don't bother to setup.py test, just test directly 2012-10-11 13:09:53 +01:00
Tom Christie
d15e31b28d Drop coverage in travis tests 2012-10-11 13:05:01 +01:00
Tom Christie
72bdd0fcec Add basic serializer tests 2012-09-07 15:14:23 +01:00
Tom Christie
82056d8915 Add coverage to travis config 2012-09-07 13:35:57 +01:00
Tom Christie
07323d4cd6 Add travis config 2012-09-07 13:32:52 +01:00
Tom Christie
f95da04f1b Remove travis while in pre-release 2012-08-29 21:37:12 +01:00
Tom Christie
2af80a4811 Adding travis config 2012-08-29 21:25:50 +01:00