From d759e8d4508465a429ebe5857c503c2b78e9c5ef Mon Sep 17 00:00:00 2001 From: tomchristie Date: Sat, 8 Sep 2012 11:08:54 -0700 Subject: [PATCH] Updated DjangoCon US 2012 Sprints (markdown) --- DjangoCon-US-2012-Sprints.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DjangoCon-US-2012-Sprints.md b/DjangoCon-US-2012-Sprints.md index 0d0f656..9fadbf7 100644 --- a/DjangoCon-US-2012-Sprints.md +++ b/DjangoCon-US-2012-Sprints.md @@ -75,9 +75,9 @@ I think the base ModelResource will probably need to be composed of `APIView` Dj REST framework should now support object level permissions. (See `SingleObjectBaseView.get_object()` in `generics.py`.) Using a view with `DjangoModelPermissions`, install `django-guardian` and see if you can get everything playing together nicely. If so, the Authentication documentation should be updated to reflect that. -### Make the tests pass on travis CI +### ~~Make the tests pass on travis CI~~ -A lot of the tests are in a bit of a hacky state right now. I can live with that for the moment, but what's particularly awkward is that they pass for me locally, but not on [Travis CI][travis]. What gives? Make it work. Get cake and karma. +~~A lot of the tests are in a bit of a hacky state right now. I can live with that for the moment, but what's particularly awkward is that they pass for me locally, but not on [Travis CI][travis]. What gives? Make it work. Get cake and karma.~~ **Green! https://github.com/tomchristie/django-rest-framework/pull/251 - @mjumbewu**