diff --git a/docs/topics/3.3-announcement.md b/docs/topics/3.3-announcement.md index 66633a228..ae5071828 100644 --- a/docs/topics/3.3-announcement.md +++ b/docs/topics/3.3-announcement.md @@ -22,6 +22,8 @@ Significant new functionality in the 3.3 release includes: *Example of the new filter controls* +--- + ## Supported versions This release drops support for Django 1.5 and 1.6. Django 1.7, 1.8 or 1.9 are now required. @@ -46,6 +48,8 @@ The following pagination view attributes and settings have been moved into attri * `settings.PAGINATE_BY_PARAM` - Use `paginator.page_size_query_param` instead. * `settings.MAX_PAGINATE_BY` - Use `paginator.max_page_size` instead. +The `ModelSerializer` and `HyperlinkedModelSerializer` classes should now include either a `fields` or `exclude` option, although the `fields = '__all__'` shortcut may be used. Failing to include either of these two options is currently pending deprecation, and will be removed entirely in the 3.5 release. This behavior brings `ModelSerializer` more closely in line with Django's `ModelForm` behavior. + [forms-api]: html-and-forms.md [ajax-form]: https://github.com/tomchristie/ajax-form [jsonfield]: ../../api-guide/fields#jsonfield diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index cb4a17ef7..12d497e09 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -42,9 +42,18 @@ You can determine your currently installed version using `pip freeze`: ### 3.3.0 -**Date**: NOT YET RELEASED +**Date**: [27th October 2015][3.3.0-milestone] -* Removed support for Django Versions 1.5 & 1.6 ([#3421][gh3421], [#3429][gh3429]) +* HTML controls for filters. ([#3315][gh3315]) +* Forms API. ([#3475][gh3475]) +* AJAX browsable API. ([#3410][gh3410]) +* Added JSONField. ([#3454][gh3454]) +* Correctly map `to_field` when creating `ModelSerializer` relational fields. ([#3526][gh3526]) +* Map appropriate model `error_messages` on `ModelSerializer` uniqueness constraints. ([#3435][gh3435]) +* Include `max_length` constraint for `ModelSerializer` fields mapped from TextField. ([#3509][gh3509]) +* Added support for Django 1.9. ([#3450][gh3450], [#3525][gh3525]) +* Removed support for Django 1.5 & 1.6. ([#3421][gh3421], [#3429][gh3429]) +* Removed 'south' migrations. ([#3495][gh3495]) ## 3.2.x series @@ -543,5 +552,16 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh3415]: https://github.com/tomchristie/django-rest-framework/issues/3415 -[gh3421]: https://github.com/tomchristie/django-rest-framework/pulls/3421 -[gh3429]: https://github.com/tomchristie/django-rest-framework/pull/3429 +[gh3315]: https://github.com/tomchristie/django-rest-framework/issues/3315 +[gh3410]: https://github.com/tomchristie/django-rest-framework/issues/3410 +[gh3435]: https://github.com/tomchristie/django-rest-framework/issues/3435 +[gh3450]: https://github.com/tomchristie/django-rest-framework/issues/3450 +[gh3454]: https://github.com/tomchristie/django-rest-framework/issues/3454 +[gh3475]: https://github.com/tomchristie/django-rest-framework/issues/3475 +[gh3495]: https://github.com/tomchristie/django-rest-framework/issues/3495 +[gh3509]: https://github.com/tomchristie/django-rest-framework/issues/3509 +[gh3421]: https://github.com/tomchristie/django-rest-framework/issues/3421 +[gh3525]: https://github.com/tomchristie/django-rest-framework/issues/3525 +[gh3526]: https://github.com/tomchristie/django-rest-framework/issues/3526 +[gh3429]: https://github.com/tomchristie/django-rest-framework/issues/3429 + diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 63fdbecae..2e6085672 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -147,41 +147,6 @@ class TestPaginationDisabledIntegration: assert response.data == list(range(1, 101)) -class TestDeprecatedStylePagination: - """ - Integration tests for deprecated style of setting pagination - attributes on the view. - """ - - def setup(self): - class PassThroughSerializer(serializers.BaseSerializer): - def to_representation(self, item): - return item - - class ExampleView(generics.ListAPIView): - serializer_class = PassThroughSerializer - queryset = range(1, 101) - pagination_class = pagination.PageNumberPagination - paginate_by = 20 - page_query_param = 'page_number' - - self.view = ExampleView.as_view() - - def test_paginate_by_attribute_on_view(self): - request = factory.get('/?page_number=2') - response = self.view(request) - assert response.status_code == status.HTTP_200_OK - assert response.data == { - 'results': [ - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 - ], - 'previous': 'http://testserver/', - 'next': 'http://testserver/?page_number=3', - 'count': 100 - } - - class TestPageNumberPagination: """ Unit tests for `pagination.PageNumberPagination`.