From eb3d078a2cbda2d6e576cbfd773f153d1bdf5c5b Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Fri, 6 Oct 2017 13:18:31 +0200 Subject: [PATCH] Version 3.7: Announcement etc (#5437) * Set version number for 3.7.0 release * Rename release notes section Moved issue links to top for easier access. (Can move back later) * Add release note for #5273 * Add release note for #5440 * Add release note for #5265 Strict JSON handling * Add release note for #5250 * Add release notes for #5170 * Add release notes for #5443 * Add release notes for #5448 * Add release notes for #5452 * Add release not for #5342 * Add release notes for 5454 * Add release notes for #5058 & #5457 Remove Django 1.8 & 1.9 from README and setup.py * Release notes for merged 3.6.5 milestone tickets Tickets migrated to 3.7.0 milestone. * Add release notes for #5469 * Add release notes from AM 2ndOct * Add final changes to the release notes. * Add date and milestone link Move issue links back to bottom. * Update translations from transifex * Begin releae anouncement * Add release note for #5482 * 3.7 release announcement & related docs. --- README.md | 4 +- docs/api-guide/schemas.md | 5 +- docs/img/bayer.png | Bin 0 -> 42939 bytes docs/index.md | 4 +- docs/topics/3.7-announcement.md | 131 ++++++++++++++++++ docs/topics/release-notes.md | 101 +++++++++++++- mkdocs.yml | 1 + rest_framework/__init__.py | 2 +- .../locale/en/LC_MESSAGES/django.mo | Bin 10226 -> 10226 bytes .../locale/en/LC_MESSAGES/django.po | 2 +- .../locale/ko_KR/LC_MESSAGES/django.mo | Bin 11720 -> 11815 bytes .../locale/ko_KR/LC_MESSAGES/django.po | 35 ++--- setup.py | 3 - 13 files changed, 257 insertions(+), 31 deletions(-) create mode 100644 docs/img/bayer.png create mode 100644 docs/topics/3.7-announcement.md diff --git a/README.md b/README.md index 814da6e920..3501745551 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,8 @@ There is a live example API for testing purposes, [available here][sandbox]. # Requirements -* Python (2.7, 3.2, 3.3, 3.4, 3.5, 3.6) -* Django (1.8, 1.9, 1.10, 1.11) +* Python (2.7, 3.4, 3.5, 3.6) +* Django (1.10, 1.11, 2.0 alpha) # Installation diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 51a6c00c6e..29b779d50f 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -155,7 +155,7 @@ Basic usage is just to provide the title for your schema and call generator = schemas.SchemaGenerator(title='Flight Search API') schema = generator.get_schema() -### Per-View Schema Customisation +## Per-View Schema Customisation By default, view introspection is performed by an `AutoSchema` instance accessible via the `schema` attribute on `APIView`. This provides the @@ -191,7 +191,7 @@ To customise the `Link` generation you may: class CustomSchema(AutoSchema): def get_link(...): - # Implemet custom introspection here (or in other sub-methods) + # Implement custom introspection here (or in other sub-methods) class CustomView(APIView): ... @@ -784,3 +784,4 @@ in [OpenAPI][open-api] format. [api-blueprint]: https://apiblueprint.org/ [static-files]: https://docs.djangoproject.com/en/stable/howto/static-files/ [named-arguments]: https://docs.djangoproject.com/en/stable/topics/http/urls/#named-groups + \ No newline at end of file diff --git a/docs/img/bayer.png b/docs/img/bayer.png new file mode 100644 index 0000000000000000000000000000000000000000..e8ef56f5f2ed31166a363509c4121774cecf004a GIT binary patch literal 42939 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 literal 0 HcmV?d00001 diff --git a/docs/index.md b/docs/index.md index fbb5bc1bb0..d44e5ec8fa 100644 --- a/docs/index.md +++ b/docs/index.md @@ -87,7 +87,7 @@ continued development by **[signing up for a paid plan][funding]**. REST framework requires the following: * Python (2.7, 3.2, 3.3, 3.4, 3.5, 3.6) -* Django (1.8, 1.9, 1.10, 1.11) +* Django (1.10, 1.11, 2.0 alpha) The following packages are optional: @@ -247,6 +247,7 @@ General guides to using REST framework. * [3.4 Announcement][3.4-announcement] * [3.5 Announcement][3.5-announcement] * [3.6 Announcement][3.6-announcement] +* [3.7 Announcement][3.7-announcement] * [Kickstarter Announcement][kickstarter-announcement] * [Mozilla Grant][mozilla-grant] * [Funding][funding] @@ -377,6 +378,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [3.4-announcement]: topics/3.4-announcement.md [3.5-announcement]: topics/3.5-announcement.md [3.6-announcement]: topics/3.6-announcement.md +[3.7-announcement]: topics/3.7-announcement.md [kickstarter-announcement]: topics/kickstarter-announcement.md [mozilla-grant]: topics/mozilla-grant.md [funding]: topics/funding.md diff --git a/docs/topics/3.7-announcement.md b/docs/topics/3.7-announcement.md new file mode 100644 index 0000000000..deba645c3a --- /dev/null +++ b/docs/topics/3.7-announcement.md @@ -0,0 +1,131 @@ + + + +# Django REST framework 3.7 + +The 3.7 release focuses on improvements to schema generation and the interactive API documentation. + +This release has been made possible by [Bayer](https://www.bayer.com/) who have sponsored the release. + + + +--- + +## Funding + +If you use REST framework commercially and would like to see this work continue, we strongly encourage you to invest in its continued development by +**[signing up for a paid plan][funding]**. + + +
+ +*As well as our release sponsor, we'd like to say thanks in particular our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), and [Rollbar](https://rollbar.com).* + +--- + +## Customizing API docs & schema generation. + +The schema generation introduced in 3.5 and the related API docs generation in 3.6 are both hugely powerful features, however they've been somewhat limited in cases where the view introspection isn't able to correctly identify the schema for a particular view. + +In order to try to address this we're now adding the ability for per-view customization of the API schema. The interface that we're adding for this allows either basic manual overrides over which fields should be included on a view, or for more complex programmatic overriding of the schema generation. We believe this release comprehensively addresses some of the existing shortcomings of the schema features. + +Let's take a quick look at using the new functionality... + +The `APIView` class has a `schema` attribute, that is used to control how the Schema for that particular view is generated. The default behaviour is to use the `AutoSchema` class. + + from rest_framework.views import APIView + from rest_framework.schemas import AutoSchema + + class CustomView(APIView): + schema = AutoSchema() # Included for demonstration only. This is the default behavior. + +We can remove a view from the API schema and docs, like so: + + class CustomView(APIView): + schema = None + +If we want to mostly use the default behavior, but additionally include some additional fields on a particular view, we can now do so easily... + + class CustomView(APIView): + schema = AutoSchema(manual_fields=[ + coreapi.Field('search', location='query') + ]) + +To ignore the automatic generation for a particular view, and instead specify the schema explicitly, we use the `ManualSchema` class instead... + + class CustomView(APIView): + schema = ManualSchema(fields=[...]) + +For more advanced behaviors you can subclass `AutoSchema` to provide for customized schema generation, and apply that to particular views. + + class CustomView(APIView): + schema = CustomizedSchemaGeneration() + +For full details on the new functionality, please see the [Schema Documentation][schema-docs]. + +--- + +## Django 2.0 support + +REST framework 3.7 supports Django versions 1.10, 1.11, and 2.0 alpha. + +--- + +## Minor fixes and improvements + +There are a large number of minor fixes and improvements in this release. See the [release notes](release-notes.md) page for a complete listing. + +The number of [open tickets against the project](https://github.com/encode/django-rest-framework/issues) currently at its lowest number in quite some time, and we're continuing to focus on reducing these to a manageable amount. + +--- + +## Deprecations + +### `exclude_from_schema` + +Both `APIView.exclude_from_schema` and the `exclude_from_schema` argument to the `@api_view` decorator and now `PendingDeprecation`. They will be moved to deprecated in the 3.8 release, and removed entirely in 3.9. + +For `APIView` you should instead set a `schema = None` attribute on the view class. + +For function based views the `@schema` decorator can be used to exclude the view from the schema, by using `@schema(None)`. + +### `DjangoFilterBackend` + +The `DjangoFilterBackend` was moved to pending deprecation in 3.5, and deprecated in 3.6. It has now been removed from the core framework. + +The functionality remains fully available, but is instead provided in the `django-filter` package. + +--- + +## What's next + +We're still planning to work on improving real-time support for REST framework by providing documentation on integrating with Django channels, as well adding support for more easily adding WebSocket support to existing HTTP endpoints. + +This will likely be timed so that any REST framework development here ties in with similar work on [API Star][api-star]. + +[funding]: funding.md +[schema-docs]: ../api-guide/schemas.md +[api-star]: https://github.com/encode/apistar \ No newline at end of file diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index ef43df6701..09ff6a9a2b 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -38,18 +38,69 @@ You can determine your currently installed version using `pip freeze`: --- -## 3.6.x series +## 3.7.x series + +### 3.7.0 -### 3.6.5 +**Date**: [6th October 2017][3.7.0-milestone] * Fix `DjangoModelPermissions` to ensure user authentication before calling the view's `get_queryset()` method. As a side effect, this changes the order of the HTTP method permissions and authentication checks, and 405 responses will only be returned when authenticated. If you want to replicate the old behavior, see the PR for details. [#5376][gh5376] * Deprecated `exclude_from_schema` on `APIView` and `api_view` decorator. Set `schema = None` or `@schema(None)` as appropriate. [#5422][gh5422] -* Timezone-aware `DateTimeField`s now respect active or default `timezone` during serialization, instead of always using UTC. +* Timezone-aware `DateTimeField`s now respect active or default `timezone` during serialization, instead of always using UTC. [#5435][gh5435] Resolves inconsistency whereby instances were serialised with supplied datetime for `create` but UTC for `retrieve`. [#3732][gh3732] **Possible backwards compatibility break** if you were relying on datetime strings being UTC. Have client interpret datetimes or [set default or active timezone (docs)][djangodocs-set-timezone] to UTC if needed. +* Removed DjangoFilterBackend inline with deprecation policy. Use `django_filters.rest_framework.FilterSet` and/or `django_filters.rest_framework.DjangoFilterBackend` instead. [#5273][gh5273] +* Don't strip microseconds from `time` when encoding. Makes consistent with `datetime`. + **BC Change**: Previously only milliseconds were encoded. [#5440][gh5440] +* Added `STRICT_JSON` setting (default `True`) to raise exception for the extended float values (`nan`, `inf`, `-inf`) accepted by Python's `json` module. + **BC Change**: Previously these values would converted to corresponding strings. Set `STRICT_JSON` to `False` to restore the previous behaviour. [#5265][gh5265] +* Add support for `page_size` parameter in CursorPaginator class [#5250][gh5250] +* Make `DEFAULT_PAGINATION_CLASS` `None` by default. + **BC Change**: If your were **just** setting `PAGE_SIZE` to enable pagination you will need to add `DEFAULT_PAGINATION_CLASS`. + The previous default was `rest_framework.pagination.PageNumberPagination`. There is a system check warning to catch this case. You may silence that if you are setting pagination class on a per-view basis. [#5170][gh5170] +* Catch `APIException` from `get_serializer_fields` in schema generation. [#5443][gh5443] +* Allow custom authentication and permission classes when using `include_docs_urls` [#5448][gh5448] +* Defer translated string evaluation on validators. [#5452][gh5452] +* Added default value for 'detail' param into 'ValidationError' exception [#5342][gh5342] +* Adjust schema get_filter_fields rules to match framework [#5454][gh5454] +* Updated test matrix to add Django 2.0 and drop Django 1.8 & 1.9 + **BC Change**: This removes Django 1.8 and Django 1.9 from Django REST Framework supported versions. [#5457][gh5457] +* Fixed a deprecation warning in serializers.ModelField [#5058][gh5058] +* Added a more explicit error message when `get_queryset` returned `None` [#5348][gh5348] +* Fix docs for Response `data` description [#5361][gh5361] +* Fix __pychache__/.pyc excludes when packaging [#5373][gh5373] +* Fix default value handling for dotted sources [#5375][gh5375] +* Ensure content_type is set when passing empty body to RequestFactory [#5351][gh5351] +* Fix ErrorDetail Documentation [#5380][gh5380] +* Allow optional content in the generic content form [#5372][gh5372] +* Updated supported values for the NullBooleanField [#5387][gh5387] +* Fix ModelSerializer custom named fields with source on model [#5388][gh5388] +* Fixed the MultipleFieldLookupMixin documentation example to properly check for object level permission [#5398][gh5398] +* Update get_object() example in permissions.md [#5401][gh5401] +* Fix authtoken managment command [#5415][gh5415] +* Fix schema generation markdown [#5421][gh5421] +* Allow `ChoiceField.choices` to be set dynamically [#5426][gh5426] +* Add the project layout to the quickstart [#5434][gh5434] +* Reuse 'apply_markdown' function in 'render_markdown' templatetag [#5469][gh5469] +* Added links to `drf-openapi` package in docs [#5470][gh5470] +* Added docstrings code highlighting with pygments [#5462][gh5462] +* Fixed documentation rendering for views named `data` [#5472][gh5472] +* Docs: Clarified 'to_internal_value()' validation behavior [#5466][gh5466] +* Fix missing six.text_type() call on APIException.__str__ [#5476][gh5476] +* Document documentation.py [#5478][gh5478] +* Fix naming collisions in Schema Generation [#5464][gh5464] +* Call Django's authenticate function with the request object [#5295][gh5295] +* Update coreapi JS to 0.1.1 [#5479][gh5479] +* Have `is_list_view` recognise RetrieveModel… views [#5480][gh5480] +* Remove Django 1.8 & 1.9 compatibility code [#5481][gh5481] +* Remove deprecated schema code from DefaultRouter [#5482][gh5482] + + +## 3.6.x series + ### 3.6.4 **Date**: [21st August 2017][3.6.4-milestone] @@ -756,6 +807,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.6.2-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.6.2+Release%22 [3.6.3-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.6.3+Release%22 [3.6.4-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.6.4+Release%22 +[3.7.0-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.7.0+Release%22 [gh2013]: https://github.com/encode/django-rest-framework/issues/2013 @@ -1427,9 +1479,50 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh5147]: https://github.com/encode/django-rest-framework/issues/5147 [gh5131]: https://github.com/encode/django-rest-framework/issues/5131 - + +[gh5481]: https://github.com/encode/django-rest-framework/issues/5481 +[gh5480]: https://github.com/encode/django-rest-framework/issues/5480 +[gh5479]: https://github.com/encode/django-rest-framework/issues/5479 +[gh5295]: https://github.com/encode/django-rest-framework/issues/5295 +[gh5464]: https://github.com/encode/django-rest-framework/issues/5464 +[gh5478]: https://github.com/encode/django-rest-framework/issues/5478 +[gh5476]: https://github.com/encode/django-rest-framework/issues/5476 +[gh5466]: https://github.com/encode/django-rest-framework/issues/5466 +[gh5472]: https://github.com/encode/django-rest-framework/issues/5472 +[gh5462]: https://github.com/encode/django-rest-framework/issues/5462 +[gh5470]: https://github.com/encode/django-rest-framework/issues/5470 +[gh5469]: https://github.com/encode/django-rest-framework/issues/5469 +[gh5435]: https://github.com/encode/django-rest-framework/issues/5435 +[gh5434]: https://github.com/encode/django-rest-framework/issues/5434 +[gh5426]: https://github.com/encode/django-rest-framework/issues/5426 +[gh5421]: https://github.com/encode/django-rest-framework/issues/5421 +[gh5415]: https://github.com/encode/django-rest-framework/issues/5415 +[gh5401]: https://github.com/encode/django-rest-framework/issues/5401 +[gh5398]: https://github.com/encode/django-rest-framework/issues/5398 +[gh5388]: https://github.com/encode/django-rest-framework/issues/5388 +[gh5387]: https://github.com/encode/django-rest-framework/issues/5387 +[gh5372]: https://github.com/encode/django-rest-framework/issues/5372 +[gh5380]: https://github.com/encode/django-rest-framework/issues/5380 +[gh5351]: https://github.com/encode/django-rest-framework/issues/5351 +[gh5375]: https://github.com/encode/django-rest-framework/issues/5375 +[gh5373]: https://github.com/encode/django-rest-framework/issues/5373 +[gh5361]: https://github.com/encode/django-rest-framework/issues/5361 +[gh5348]: https://github.com/encode/django-rest-framework/issues/5348 +[gh5058]: https://github.com/encode/django-rest-framework/issues/5058 +[gh5457]: https://github.com/encode/django-rest-framework/issues/5457 [gh5376]: https://github.com/encode/django-rest-framework/issues/5376 [gh5422]: https://github.com/encode/django-rest-framework/issues/5422 [gh5408]: https://github.com/encode/django-rest-framework/issues/5408 [gh3732]: https://github.com/encode/django-rest-framework/issues/3732 [djangodocs-set-timezone]: https://docs.djangoproject.com/en/1.11/topics/i18n/timezones/#default-time-zone-and-current-time-zone +[gh5273]: https://github.com/encode/django-rest-framework/issues/5273 +[gh5440]: https://github.com/encode/django-rest-framework/issues/5440 +[gh5265]: https://github.com/encode/django-rest-framework/issues/5265 +[gh5250]: https://github.com/encode/django-rest-framework/issues/5250 +[gh5170]: https://github.com/encode/django-rest-framework/issues/5170 +[gh5443]: https://github.com/encode/django-rest-framework/issues/5443 +[gh5448]: https://github.com/encode/django-rest-framework/issues/5448 +[gh5452]: https://github.com/encode/django-rest-framework/issues/5452 +[gh5342]: https://github.com/encode/django-rest-framework/issues/5342 +[gh5454]: https://github.com/encode/django-rest-framework/issues/5454 +[gh5482]: https://github.com/encode/django-rest-framework/issues/5482 \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index d9e96961a7..8fbe150a18 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -70,6 +70,7 @@ pages: - '3.4 Announcement': 'topics/3.4-announcement.md' - '3.5 Announcement': 'topics/3.5-announcement.md' - '3.6 Announcement': 'topics/3.6-announcement.md' + - '3.7 Announcement': 'topics/3.7-announcement.md' - 'Kickstarter Announcement': 'topics/kickstarter-announcement.md' - 'Mozilla Grant': 'topics/mozilla-grant.md' - 'Funding': 'topics/funding.md' diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index ae130a4d47..bc4ddff068 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ """ __title__ = 'Django REST framework' -__version__ = '3.6.4' +__version__ = '3.7.0' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2017 Tom Christie' diff --git a/rest_framework/locale/en/LC_MESSAGES/django.mo b/rest_framework/locale/en/LC_MESSAGES/django.mo index 13760f707539fa5c2f961f3edb61ce0ef08c3b1b..79ab5852223a8a544aa4adce6b5e8ddd26282e10 100644 GIT binary patch delta 26 hcmez5|H*&D6LDU1T?0#9BSQrvLn}kW%^$@X1ptUQ2!j9s delta 21 dcmez5|H*&D6Y\n" "Language-Team: English (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en/)\n" "MIME-Version: 1.0\n" diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo index f83b7ed71b63d3d110a39732d083b34041064211..9fb8ae279813603f90bd6bc096ad27b52d28137c 100644 GIT binary patch delta 1261 zcmajdT}V@57zgkt%P=!2E5BxW)Lff3^9xdw0uwE>&~j;M$gv%DIXBzMWw; z7d2&(C06EO=0!;teNb16pqoJIGVq*PSKSoW|7|Bk3EIW^z0Z5z_j#VZ?|EA>S?OK~ z=z6z~XkjN&HW57vC(43fU?z->AWDJf;2!9JI_Os7Pw+J2^^rvBunbnSb+865De9w$ zP9UC#`7l^TbRL$dsEbN5n8Cy`xFMP_Lv#}6L9gQWT|_3t{0Z>Ld0S5 zM0+6*S=6@I)pB5@Hu1+rzH?&z%q!`G|+{?VGJHacGOGI3S-p%_$EAv_$9>Y z(J#oZDhgHEN$4SK;5r`YiRK_H^bz8AXc@9~;Tr$CVwi-u4Q_;86Bw|K4`D9!!dkdZ z>)+50(G%T)ctvlN`EM{EaYUluDwv1(K0E*=$i9_$RAX0E0$HA`uo_Om<3vX&1m|3c ziE_xU;x60|v$30fR2Lz;+i}QF;ynz3Tax`oC3|iKzS^3TrAy1?QnIo$Qj=2f3ohbq zO}bJmZ?>8ECW|$jE8wksy}@Fx%{A8MTH3iBv!z8awHSrgEYIz*$iPj$A-g0x<*`xm zsj6rt@`ObH2olf6szqHw_cq_igmi6CQz!5S!K!78Z>ZIq^{0xsM!u;|i9Mm}nSfM( zKCYw2D3}aYX1+nNb#hYwASby;Ss{m$TlBbOr%TgpHePBLwBmQo8>-5ldibrNvCvgo?CPe%l%LOU1&|m$Ridf?x+~Euio{-wWh)Um+!XAYqM}H ziRjg+g8rV6=X0VrK!*eI4fpwmT-@T^09w#A3f2ar&1STiaU-*wJkqoB2gGTe>Nmf0 BW_$nu delta 1184 zcma*lUr19?90%}UE7vfUW>nftum4ta&HvG~lE5%C1OJ3Y8giGj#5rpd3`90-Qm{P; zx8<@~gAB2-w25S`DDWX6s^<`@r^0(?*h@qNeUDxr?8!ac&+m8c`JMCIId`<_ZR5ne z%Jp#r(foFzQX(4PNmK&ALo>`sBFcx2Fbn#i2~H~cXIPJXQ!-HzJOeF!9&Cj_6dQIC zokac;R=_PfqI0lLM=q*GFo6O7LX|=oAvz9^!a2o+-9$Fz_0SAoL*CGDSO8N~i3(wj z;x*WSd>U56_%ytOXJI3J1S{cY0lVEoP$Lix!f&t}y3&dE!C$ZmW@Qi^gMEr~unM_0 zlV}fYf;{)YHuwQzX(~aNPB;U3!=`MaVps>UG+lQgIDlXb@}vF=9WYV9lJ~=d$fqGr zkA6aaRq@!BpF}0(4fNrGo@fm6jov}r4lO}GFLv+BymDwn-VW8!HHd&0-h~zL4ZHv~ zhLwU#karq@=#8F3zQGrG1jghLmB9+de#lR57V>Xp3GypS!>+u(7Fu98JV8`WpAb}G zK#wYZ6_;Ti)S#MwRA$KU)&>*cJs1ZcE50y=hhk>89yXiui-dyW(*0&*K7O&)qO;3% z$|2gFHnFSIQ7Tk*cG`u?ZqY6*%(&TzJ9;}H9J*pZZ)q(k3=i!{j#0CjXKZ*%is-79 zFsx1aquD4wh)803rt~UHEt#`j>Wfyf#p;lT^ag1$Tf+^f>7S_Lds^G9ww7kQ*kN_{ zN{czV_^3ay@YE+T&j<_oC9QFrlxXNs$pccKL7z7+KOAGj9)V4I*c~6cA7S2c<_)sI zNG_obVYwT(V6lnzb~YT5%8W@dyg|40*O2B?-e&Z)h+Wp^<(+#oM9d$F`p0DN4cWVP`LzoO?9R<~m7iX1@4tGv-?Ogz)pB_vAWK2~ZKc() M*7#l}#pUY$0m=$PUH||9 diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po index 152bc7b00d..43dbe0cddb 100644 --- a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po +++ b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# GarakdongBigBoy , 2017 # Joon Hwan 김준환 , 2017 # SUN CHOI , 2015 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-07-12 16:13+0100\n" -"PO-Revision-Date: 2017-08-03 14:58+0000\n" -"Last-Translator: Joon Hwan 김준환 \n" +"PO-Revision-Date: 2017-09-28 09:41+0000\n" +"Last-Translator: GarakdongBigBoy \n" "Language-Team: Korean (Korea) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ko_KR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +46,7 @@ msgstr "토큰 헤더가 유효하지 않습니다. 인증데이터(credentials) #: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." -msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 빈칸(spaces)를 포함하지 않아야 합니다." +msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 빈칸(spaces)을 포함하지 않아야 합니다." #: authentication.py:185 msgid "" @@ -118,7 +119,7 @@ msgstr "자격 인증데이터(authentication credentials)가 제공되지 않 #: exceptions.py:99 msgid "You do not have permission to perform this action." -msgstr "이 작업을 " +msgstr "이 작업을 수행할 권한(permission)이 없습니다." #: exceptions.py:104 views.py:81 msgid "Not found." @@ -143,11 +144,11 @@ msgstr "요청이 지연(throttled)되었습니다." #: fields.py:269 relations.py:206 relations.py:239 validators.py:98 #: validators.py:181 msgid "This field is required." -msgstr "이 항목을 채워주십시오." +msgstr "이 필드는 필수 항목입니다." #: fields.py:270 msgid "This field may not be null." -msgstr "이 칸은 null일 수 없습니다." +msgstr "이 필드는 null일 수 없습니다." #: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." @@ -155,15 +156,15 @@ msgstr "\"{input}\"이 유효하지 않은 부울(boolean)입니다." #: fields.py:674 msgid "This field may not be blank." -msgstr "이 칸은 blank일 수 없습니다." +msgstr "이 필드는 blank일 수 없습니다." #: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." -msgstr "이 칸이 글자 수가 {max_length} 이하인지 확인하십시오." +msgstr "이 필드의 글자 수가 {max_length} 이하인지 확인하십시오." #: fields.py:676 msgid "Ensure this field has at least {min_length} characters." -msgstr "이 칸이 글자 수가 적어도 {min_length} 이상인지 확인하십시오." +msgstr "이 필드의 글자 수가 적어도 {min_length} 이상인지 확인하십시오." #: fields.py:713 msgid "Enter a valid email address." @@ -285,7 +286,7 @@ msgstr "파일명을 알 수 없습니다." #: fields.py:1361 msgid "The submitted file is empty." -msgstr "제출된 파일이 비어있습니다." +msgstr "제출한 파일이 비어있습니다." #: fields.py:1362 msgid "" @@ -398,31 +399,31 @@ msgstr "선택할 아이템이 없습니다." #: validators.py:43 msgid "This field must be unique." -msgstr "이 칸은 반드시 고유해야 합니다." +msgstr "이 필드는 반드시 고유(unique)해야 합니다." #: validators.py:97 msgid "The fields {field_names} must make a unique set." -msgstr "{field_names} 필드는 반드시 고유하게 설정해야 합니다." +msgstr "필드 {field_names} 는 반드시 고유(unique)해야 합니다." #: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." -msgstr "이 칸은 \"{date_field}\"날짜에 대해 고유해야합니다." +msgstr "이 필드는 고유(unique)한 \"{date_field}\" 날짜를 갖습니다." #: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." -msgstr "이 칸은 \"{date_field}\" 월에 대해 고유해야합니다." +msgstr "이 필드는 고유(unique)한 \"{date_field}\" 월을 갖습니다. " #: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." -msgstr "이 칸은 \"{date_field}\" 년에 대해 고유해야합니다." +msgstr "이 필드는 고유(unique)한 \"{date_field}\" 년을 갖습니다. " #: versioning.py:42 msgid "Invalid version in \"Accept\" header." -msgstr "\"Accept\" header내 버전이 유효하지 않습니다." +msgstr "\"Accept\" 헤더(header)의 버전이 유효하지 않습니다." #: versioning.py:73 msgid "Invalid version in URL path." -msgstr "URL path내 버전이 유효하지 않습니다." +msgstr "URL path의 버전이 유효하지 않습니다." #: versioning.py:115 msgid "Invalid version in URL path. Does not match any version namespace." diff --git a/setup.py b/setup.py index 36227938b6..f9f8a7bb4b 100755 --- a/setup.py +++ b/setup.py @@ -92,8 +92,6 @@ def get_package_data(package): 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'Framework :: Django', - 'Framework :: Django :: 1.8', - 'Framework :: Django :: 1.9', 'Framework :: Django :: 1.10', 'Framework :: Django :: 1.11', 'Intended Audience :: Developers', @@ -103,7 +101,6 @@ def get_package_data(package): 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Topic :: Internet :: WWW/HTTP',