Commit Graph

5077 Commits

Author SHA1 Message Date
Omer Katz
6048152c2c Merge 36cd8663d4 into 637af1fc14 2015-02-10 23:44:19 +00:00
Xavier Ordoquy
637af1fc14 Merge pull request #2540 from linovia/release/3.0.5
Release/3.0.5
2015-02-10 23:48:38 +01:00
Xavier Ordoquy
59b3fe8f39 Bumped the version to 3.0.5 2015-02-10 22:48:04 +01:00
Xavier Ordoquy
f6033cee87 Add release notes for 3.0.5. 2015-02-10 22:46:54 +01:00
Tom Christie
b999db1c46 Merge pull request #2535 from carltongibson/search-filter-duplicates
Fix duplicate results of `ManyToManyField` when using `SearchFilter`.
2015-02-10 10:43:00 +00:00
Carlton Gibson
3522b69394 Add distinct call in filter_queryset 2015-02-10 10:51:38 +01:00
Carlton Gibson
d87bb67d11 Failing test case for #1488 2015-02-10 10:50:35 +01: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
873fb69395 Merge pull request #2530 from tomchristie/attribute-proxying-fix
Fix misleading `AttributeError` tracebacks on `Request` objects.
2015-02-09 17:56:25 +00:00
Tom Christie
1a087c8c5b Fix .gitignore 2015-02-09 17:47:59 +00:00
Tom Christie
b2939c157d Fixes for latest version of pep8 2015-02-09 17:43:20 +00:00
Tom Christie
0669f507b3 pep8 fix 2015-02-09 17:22:13 +00:00
Tom Christie
54d82f59ed Py3 compat fix 2015-02-09 17:19:22 +00:00
Tom Christie
d13c807616 Fix misleading AttributeErrors 2015-02-09 17:02:54 +00:00
Omer Katz
36cd8663d4 Added full stack benchmarks with filters. 2015-02-07 13:11:18 +02:00
Omer Katz
a8e7f664db Fixed the lint error. 2015-02-07 13:09:15 +02:00
José Padilla
235b98e427 Merge pull request #2460 from mmarvick/master
Small fixes to the tutorial
2015-02-06 11:31:25 -04:00
Tom Christie
0e4d202c58 Merge pull request #2527 from linovia/feature/secured_pypi_upload
Use twine to upload to pypi.
2015-02-06 13:10:48 +00:00
Xavier Ordoquy
750d0c9f2b Add Twine to the requirements. 2015-02-06 13:57:08 +01:00
Xavier Ordoquy
238a3b507b Add Twine to the requirements. 2015-02-06 13:50:40 +01:00
Xavier Ordoquy
9dd97a0ee5 Fixed a typo. 2015-02-06 10:23:58 +01:00
Xavier Ordoquy
75ff754517 Use twine to upload to pypi. 2015-02-06 10:12:57 +01:00
Michael Marvick
5bf803b6ed Revert some of the changes made in 1-serialization.md 2015-02-05 19:42:36 -08:00
Omer Katz
1a08c0ce8a Fixed the failing full stack benchmarks. 2015-02-06 00:08:03 +02:00
Xavier Ordoquy
24372ec778 Merge pull request #2524 from Kaptian/patch-1
Allow non-standard User models with Throttling
2015-02-05 23:02:59 +01:00
Kaptian
fffde8a63b Update throttling.py
Use pk pseudo attribute for identifying the user (in case the user model is not the default and has a different column name for the unique id)
2015-02-05 13:27:26 -08:00
Omer Katz
48eb711a42 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework into topic/benchmarks 2015-02-05 21:26:08 +02:00
Tom Christie
3b00824560 Merge pull request #2518 from longhotsummer/patch-1
FIX: Don't default to list in method args
2015-02-04 14:30:53 +00:00
Greg Kempe
e13d2af137 Parens around if clause 2015-02-04 16:26:23 +02:00
Tom Christie
d21617ff3b Merge pull request #2519 from Ofir-Purple/optimize-token-auth-queries
Prefetching the user object when getting the token in TokenAuthentication
2015-02-04 14:20:21 +00:00
Greg Kempe
d920683237 Use inline if 2015-02-04 16:13:30 +02:00
Ofir Ovadia
58e7bbc8ec Prefetching the user object when getting the token in TokenAuthentication.
Since the user object is fetched 4 lines after getting Token from the database, this removes a DB query for each token-authenticated request.
2015-02-04 16:08:41 +02:00
Greg Kempe
7bb5fd270d FIX: Don't default to list in method args
Fixes @list_route and @detail_route so that they don't initialize their `methods` parameter as a list. In some cases the list gets cleared, and the result is that default parameter is now empty, and may get reused unexpectedly.
2015-02-04 16:03:03 +02:00
Omer Katz
90930ad1f5 Added some full stack benchmarks.
Some of them fail and I don't know why yet.
2015-02-04 09:50:43 +02:00
Omer Katz
7b2192d861 Benchmarking nested serialization with many objects. 2015-02-04 09:50:43 +02:00
Omer Katz
41d93d18a4 Increased the number of iterations for more accurate results. 2015-02-04 09:50:43 +02:00
Xavier Ordoquy
46181341d5 Merge pull request #2512 from heywbj/docs
Add django-rest-framework-recursive to docs
2015-02-04 00:13:52 +01:00
Warren Jin
76efbdddb6 docs 2015-02-03 17:18:54 -05:00
Omer Katz
866d41f263 Increased the number of iterations for more accurate results. 2015-02-03 17:24:32 +02:00
Tom Christie
33cfc2e486 Merge pull request #2509 from jamescooke/doc-fixes
Small documentation fixes
2015-02-03 13:51:03 +00:00
James Cooke
f676569661 Small documentation fixes
* Remove "you you" from viewsets API-guide
* Fix link from routers API-guide to viewsets API-guide
2015-02-03 13:43:03 +00:00
Omer Katz
6994cc2bb3 Added a benchmark that measures rendering a dictionary to JSON. 2015-02-03 15:15:42 +02:00
Omer Katz
acdb4548a8 Added a benchmark that will verify that the serializer fields are cached. 2015-02-03 11:11:31 +02:00
Omer Katz
677362ac67 The benchmarks are now Python 3 compatibility. 2015-02-03 11:08:44 +02:00
Omer Katz
6118c69530 Deactivated running benchmarks in travis for now. 2015-02-03 10:11:11 +02:00
Omer Katz
5f49f97c95 Added a benchmark to the serializer's get_fields() method. 2015-02-03 10:05:42 +02:00
Omer Katz
59659835e8 Added a basic benchmark suite for serializers. 2015-02-03 10:00:42 +02:00
Tom Christie
67933d658e Merge pull request #2503 from tail/missing-space-error-string
Fixed missing whitespace in error string.
2015-02-03 00:19:52 +00:00
Jason Yan
4b65e9e42b Fixed missing whitespace in error string. 2015-02-02 16:14:34 -08:00
Xavier Ordoquy
0a805d979d Merge pull request #2501 from thedrow/patch-10
Fixed typos in docstrings
2015-02-02 10:00:24 +01:00