From f3dbe9bb2aa627b3485c2ed44f889a1bc5463081 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Wed, 3 Jun 2015 16:57:18 +0100 Subject: [PATCH 1/4] Bump to version 3.1.3 --- rest_framework/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 84989717d..33414f767 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.1.2' +__version__ = '3.1.3' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2015 Tom Christie' From bc778732bf956966b28dc3e6a425bf29eb9a23de Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Wed, 3 Jun 2015 17:27:38 +0100 Subject: [PATCH 2/4] Release notes for 3.1.3 --- docs/topics/release-notes.md | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 0503f2844..54339c542 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,23 @@ You can determine your currently installed version using `pip freeze`: ## 3.1.x series +### 3.1.3 + +**Date**: [4th June 2015][3.1.3-milestone]. + +* Add `DurationField`. ([#2481][gh2481], [#2989][gh2989]) +* Add `format` argument to `UUIDField`. ([#2788][gh2788], [#3000][gh3000]) +* `MultipleChoiceField` empties incorrectly on a partial update using multipart/form-data ([#2993][gh2993], [#2894][gh2894]) +* Fix a bug in options related to read-only `RelatedField`. ([#2981][gh2981], [#2811][gh2811]) +* Fix nested serializers with `unique_together` relations. ([#2975][gh2975]) +* Allow unexpected values for `ChoiceField`/`MultipleChoiceField` representations. ([#2839][gh2839], [#2940][gh2940]) +* Rollback the transaction on error if `ATOMIC_REQUESTS` is set. ([#2887][gh2887], [#2034][gh2034]) +* Set the action on a view when override_method regardless of its None-ness. ([#2933][gh2933]) +* `DecimalField` accepts `2E+2` as 200 and validates decimal place correctly. ([#2948][gh2948], [#2947][gh2947]) +* Support basic authentication with custom `UserModel` that change `username`. ([#2952][gh2952]) +* `IPAddressField` improvements. ([#2747][gh2747]) + + ### 3.1.2 **Date**: [13rd May 2015][3.1.2-milestone]. @@ -206,6 +223,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.1.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.0+Release%22 [3.1.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.1+Release%22 [3.1.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.2+Release%22 +[3.1.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.3+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -341,3 +359,22 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh2863]: https://github.com/tomchristie/django-rest-framework/issues/2863 [gh2868]: https://github.com/tomchristie/django-rest-framework/issues/2868 [gh2905]: https://github.com/tomchristie/django-rest-framework/issues/2905 + +[gh2481]: https://github.com/tomchristie/django-rest-framework/issues/2481 +[gh2989]: https://github.com/tomchristie/django-rest-framework/issues/2989 +[gh2788]: https://github.com/tomchristie/django-rest-framework/issues/2788 +[gh3000]: https://github.com/tomchristie/django-rest-framework/issues/3000 +[gh2993]: https://github.com/tomchristie/django-rest-framework/issues/2993 +[gh2894]: https://github.com/tomchristie/django-rest-framework/issues/2894 +[gh2981]: https://github.com/tomchristie/django-rest-framework/issues/2981 +[gh2811]: https://github.com/tomchristie/django-rest-framework/issues/2811 +[gh2975]: https://github.com/tomchristie/django-rest-framework/issues/2975 +[gh2839]: https://github.com/tomchristie/django-rest-framework/issues/2839 +[gh2940]: https://github.com/tomchristie/django-rest-framework/issues/2940 +[gh2887]: https://github.com/tomchristie/django-rest-framework/issues/2887 +[gh2034]: https://github.com/tomchristie/django-rest-framework/issues/2034 +[gh2933]: https://github.com/tomchristie/django-rest-framework/issues/2933 +[gh2948]: https://github.com/tomchristie/django-rest-framework/issues/2948 +[gh2947]: https://github.com/tomchristie/django-rest-framework/issues/2947 +[gh2952]: https://github.com/tomchristie/django-rest-framework/issues/2952 +[gh2747]: https://github.com/tomchristie/django-rest-framework/issues/2747 From 757e45aceeca53ce51c5b7afcb3503507a0d2521 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Thu, 4 Jun 2015 14:37:01 +0100 Subject: [PATCH 3/4] Adding the last minute PR. --- docs/topics/release-notes.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 54339c542..c26ccab43 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -54,7 +54,7 @@ You can determine your currently installed version using `pip freeze`: * Set the action on a view when override_method regardless of its None-ness. ([#2933][gh2933]) * `DecimalField` accepts `2E+2` as 200 and validates decimal place correctly. ([#2948][gh2948], [#2947][gh2947]) * Support basic authentication with custom `UserModel` that change `username`. ([#2952][gh2952]) -* `IPAddressField` improvements. ([#2747][gh2747]) +* `IPAddressField` improvements. ([#2747][gh2747], [#2618][gh2618], [#3008][gh3008]) ### 3.1.2 @@ -378,3 +378,5 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh2947]: https://github.com/tomchristie/django-rest-framework/issues/2947 [gh2952]: https://github.com/tomchristie/django-rest-framework/issues/2952 [gh2747]: https://github.com/tomchristie/django-rest-framework/issues/2747 +[gh2618]: https://github.com/tomchristie/django-rest-framework/issues/2618 +[gh3008]: https://github.com/tomchristie/django-rest-framework/issues/3008 From 886220cb70a78c6fb94bc6cc3a864e939da5edaa Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Thu, 4 Jun 2015 14:54:26 +0100 Subject: [PATCH 4/4] Last minute pull request --- docs/topics/release-notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index c26ccab43..4bfcb0033 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -55,6 +55,7 @@ You can determine your currently installed version using `pip freeze`: * `DecimalField` accepts `2E+2` as 200 and validates decimal place correctly. ([#2948][gh2948], [#2947][gh2947]) * Support basic authentication with custom `UserModel` that change `username`. ([#2952][gh2952]) * `IPAddressField` improvements. ([#2747][gh2747], [#2618][gh2618], [#3008][gh3008]) +* Improve `DecimalField` for easier subclassing. ([#2695][gh2695]) ### 3.1.2 @@ -380,3 +381,4 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh2747]: https://github.com/tomchristie/django-rest-framework/issues/2747 [gh2618]: https://github.com/tomchristie/django-rest-framework/issues/2618 [gh3008]: https://github.com/tomchristie/django-rest-framework/issues/3008 +[gh2695]: https://github.com/tomchristie/django-rest-framework/issues/2695