[Python-modules-commits] [djangorestframework] 02/04: Merge tag 'upstream/3.6.3' into debian/master

Brian May bam at moszumanska.debian.org
Sun Jul 2 22:06:16 UTC 2017


This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch debian/master
in repository djangorestframework.

commit 2ed1f23d1b52ad1244122c08d9b2c216fc35ad5a
Merge: 09c77fc a69c17d
Author: Brian May <bam at debian.org>
Date:   Mon Jul 3 07:58:20 2017 +1000

    Merge tag 'upstream/3.6.3' into debian/master
    
    Upstream version 3.6.3

 .travis.yml                                        |   51 +-
 CONTRIBUTING.md                                    |    7 +-
 LICENSE.md                                         |    2 +-
 PULL_REQUEST_TEMPLATE.md                           |    2 +-
 README.md                                          |   28 +-
 codecov.yml                                        |    7 +
 docs/api-guide/authentication.md                   |    9 +-
 docs/api-guide/exceptions.md                       |   56 +-
 docs/api-guide/fields.md                           |   33 +-
 docs/api-guide/filtering.md                        |  125 +-
 docs/api-guide/generic-views.md                    |    9 +-
 docs/api-guide/metadata.md                         |   12 +
 docs/api-guide/pagination.md                       |   25 +-
 docs/api-guide/parsers.md                          |    2 +-
 docs/api-guide/permissions.md                      |   22 +-
 docs/api-guide/relations.md                        |   26 +-
 docs/api-guide/renderers.md                        |    6 +-
 docs/api-guide/responses.md                        |    2 +-
 docs/api-guide/reverse.md                          |    8 +-
 docs/api-guide/routers.md                          |   22 +-
 docs/api-guide/schemas.md                          |  223 ++-
 docs/api-guide/serializers.md                      |   87 +-
 docs/api-guide/settings.md                         |   44 +-
 docs/api-guide/status-codes.md                     |    5 +
 docs/api-guide/testing.md                          |  112 +-
 docs/api-guide/throttling.md                       |    8 +-
 docs/api-guide/validators.md                       |   23 +-
 docs/api-guide/versioning.md                       |    4 +-
 docs/api-guide/views.md                            |   14 +-
 docs/api-guide/viewsets.md                         |    2 +
 docs/img/api-docs.gif                              |  Bin 0 -> 5616028 bytes
 docs/img/api-docs.png                              |  Bin 0 -> 161971 bytes
 docs/img/books/hwa-cover.png                       |  Bin 0 -> 30506 bytes
 docs/img/books/tsd-cover.png                       |  Bin 0 -> 118271 bytes
 docs/img/django-filter.png                         |  Bin 13678 -> 0 bytes
 docs/img/premium/machinalis-readme.png             |  Bin 0 -> 12872 bytes
 docs/img/premium/micropyramid-readme.png           |  Bin 0 -> 23782 bytes
 docs/img/premium/rollbar-readme.png                |  Bin 0 -> 12367 bytes
 docs/img/premium/rover-readme.png                  |  Bin 53118 -> 53118 bytes
 docs/img/premium/sentry-readme.png                 |  Bin 24584 -> 24584 bytes
 docs/img/premium/stream-readme.png                 |  Bin 19341 -> 19341 bytes
 docs/img/raml.png                                  |  Bin 0 -> 37216 bytes
 docs/index.md                                      |   47 +-
 docs/topics/2.2-announcement.md                    |   12 +-
 docs/topics/2.4-announcement.md                    |    6 +-
 docs/topics/3.0-announcement.md                    |   12 +-
 docs/topics/3.1-announcement.md                    |    2 +-
 docs/topics/3.2-announcement.md                    |    2 +-
 docs/topics/3.3-announcement.md                    |    2 +-
 docs/topics/3.4-announcement.md                    |    6 +-
 docs/topics/3.5-announcement.md                    |  266 +++
 docs/topics/3.6-announcement.md                    |  199 ++
 docs/topics/ajax-csrf-cors.md                      |    2 +-
 docs/topics/api-clients.md                         |  212 +-
 docs/topics/browsable-api.md                       |    2 -
 docs/topics/browser-enhancements.md                |    2 +-
 docs/topics/contributing.md                        |    7 +-
 docs/topics/documenting-your-api.md                |  101 +-
 docs/topics/funding.md                             |   76 +-
 docs/topics/html-and-forms.md                      |    6 +-
 docs/topics/internationalization.md                |    4 +-
 docs/topics/jobs.md                                |   39 +
 docs/topics/kickstarter-announcement.md            |    2 +-
 docs/topics/project-management.md                  |   36 +-
 docs/topics/release-notes.md                       | 1252 ++++++++----
 ...-party-resources.md => third-party-packages.md} |   76 +-
 docs/topics/tutorials-and-resources.md             |  116 ++
 docs/tutorial/1-serialization.md                   |   39 +-
 docs/tutorial/3-class-based-views.md               |    2 +-
 docs/tutorial/4-authentication-and-permissions.md  |    6 +-
 .../5-relationships-and-hyperlinked-apis.md        |    6 +-
 docs/tutorial/6-viewsets-and-routers.md            |    2 +-
 docs/tutorial/7-schemas-and-client-libraries.md    |   57 +-
 docs/tutorial/quickstart.md                        |    4 +-
 docs_theme/404.html                                |    2 +-
 docs_theme/css/default.css                         |    5 +
 docs_theme/{base.html => main.html}                |   22 +-
 docs_theme/nav.html                                |    8 +-
 licenses/bootstrap.md                              |   22 +
 licenses/jquery.json-view.md                       |   22 +
 mkdocs.yml                                         |    8 +-
 requirements/requirements-documentation.txt        |    2 +-
 requirements/requirements-optionals.txt            |    7 +-
 requirements/requirements-testing.txt              |    6 +-
 rest_framework/__init__.py                         |    6 +-
 rest_framework/authtoken/models.py                 |    2 +-
 rest_framework/authtoken/serializers.py            |    9 +-
 rest_framework/compat.py                           |  115 +-
 rest_framework/decorators.py                       |    4 +-
 rest_framework/documentation.py                    |   64 +
 rest_framework/exceptions.py                       |  154 +-
 rest_framework/fields.py                           |  184 +-
 rest_framework/filters.py                          |  206 +-
 rest_framework/generics.py                         |    3 +-
 rest_framework/locale/da_DK/LC_MESSAGES/django.mo  |  Bin 529 -> 0 bytes
 rest_framework/locale/da_DK/LC_MESSAGES/django.po  |  439 -----
 rest_framework/mixins.py                           |    6 +
 rest_framework/negotiation.py                      |    2 +-
 rest_framework/pagination.py                       |  112 +-
 rest_framework/parsers.py                          |   15 +-
 rest_framework/permissions.py                      |   17 +-
 rest_framework/relations.py                        |   87 +-
 rest_framework/renderers.py                        |   81 +-
 rest_framework/request.py                          |   46 +-
 rest_framework/response.py                         |    6 +-
 rest_framework/reverse.py                          |    6 +-
 rest_framework/routers.py                          |  141 +-
 rest_framework/schemas.py                          |  669 +++++--
 rest_framework/serializers.py                      |  170 +-
 rest_framework/settings.py                         |   18 +-
 .../static/rest_framework/css/bootstrap-tweaks.css |    1 -
 .../static/rest_framework/css/bootstrap.min.css    |    7 +-
 .../static/rest_framework/docs/css/base.css        |  343 ++++
 .../docs/css/bootstrap-theme.min.css               |   11 +
 .../rest_framework/docs/css/bootstrap.min.css      |    6 +
 .../rest_framework/docs/css/font-awesome-4.0.3.css | 1338 +++++++++++++
 .../static/rest_framework/docs/css/highlight.css   |  125 ++
 .../docs/css/jquery.json-view.min.css              |   11 +
 .../docs/fonts/fontawesome-webfont.eot             |  Bin 0 -> 38205 bytes
 .../docs/fonts/fontawesome-webfont.svg             |  414 ++++
 .../docs/fonts/fontawesome-webfont.ttf             |  Bin 0 -> 80652 bytes
 .../docs/fonts/fontawesome-webfont.woff            |  Bin 0 -> 44432 bytes
 .../docs/fonts/glyphicons-halflings-regular.eot    |  Bin 0 -> 20127 bytes
 .../docs/fonts/glyphicons-halflings-regular.svg    |  288 +++
 .../docs/fonts/glyphicons-halflings-regular.ttf    |  Bin 0 -> 45404 bytes
 .../docs/fonts/glyphicons-halflings-regular.woff   |  Bin 0 -> 23424 bytes
 .../docs/fonts/glyphicons-halflings-regular.woff2  |  Bin 0 -> 18028 bytes
 .../static/rest_framework/docs/img/favicon.ico     |  Bin 0 -> 5430 bytes
 .../static/rest_framework/docs/img/grid.png        |  Bin 0 -> 1458 bytes
 .../static/rest_framework/docs/js/api.js           |  314 +++
 .../static/rest_framework/docs/js/bootstrap.min.js |    7 +
 .../rest_framework/docs/js/highlight.pack.js       |    2 +
 .../rest_framework/docs/js/jquery-1.10.2.min.js    |    6 +
 .../rest_framework/docs/js/jquery.json-view.min.js |    7 +
 .../static/rest_framework/js/bootstrap.min.js      |    8 +-
 .../static/rest_framework/js/coreapi-0.1.0.js      | 2040 ++++++++++++++++++++
 rest_framework/static/rest_framework/js/csrf.js    |    2 +-
 rest_framework/status.py                           |    6 +
 rest_framework/templates/rest_framework/admin.html |    1 +
 .../templates/rest_framework/admin/detail.html     |    2 +-
 .../templates/rest_framework/admin/dict_value.html |   11 +
 .../templates/rest_framework/admin/list.html       |    2 +-
 rest_framework/templates/rest_framework/base.html  |   13 +-
 .../templates/rest_framework/docs/auth/basic.html  |   38 +
 .../rest_framework/docs/auth/session.html          |   35 +
 .../templates/rest_framework/docs/auth/token.html  |   36 +
 .../templates/rest_framework/docs/document.html    |   30 +
 .../templates/rest_framework/docs/index.html       |   56 +
 .../templates/rest_framework/docs/interact.html    |   51 +
 .../docs/langs/javascript-intro.html               |    6 +
 .../rest_framework/docs/langs/javascript.html      |   15 +
 .../rest_framework/docs/langs/python-intro.html    |    3 +
 .../rest_framework/docs/langs/python.html          |   13 +
 .../rest_framework/docs/langs/shell-intro.html     |    3 +
 .../templates/rest_framework/docs/langs/shell.html |    6 +
 .../templates/rest_framework/docs/link.html        |  102 +
 .../templates/rest_framework/docs/sidebar.html     |   42 +
 .../horizontal/checkbox_multiple.html              |   10 +-
 .../templates/rest_framework/horizontal/input.html |    2 +-
 .../templates/rest_framework/horizontal/radio.html |   10 +-
 .../rest_framework/horizontal/select.html          |    4 +-
 .../rest_framework/horizontal/select_multiple.html |    4 +-
 .../rest_framework/inline/checkbox_multiple.html   |    6 +-
 .../templates/rest_framework/inline/input.html     |    2 +-
 .../templates/rest_framework/inline/radio.html     |    5 +-
 .../templates/rest_framework/inline/select.html    |    4 +-
 .../rest_framework/inline/select_multiple.html     |    3 +-
 .../templates/rest_framework/login_base.html       |    4 +-
 rest_framework/templates/rest_framework/schema.js  |    3 +
 .../rest_framework/vertical/checkbox_multiple.html |   10 +-
 .../templates/rest_framework/vertical/input.html   |    2 +-
 .../templates/rest_framework/vertical/radio.html   |    9 +-
 .../templates/rest_framework/vertical/select.html  |    4 +-
 .../rest_framework/vertical/select_multiple.html   |    3 +-
 rest_framework/templatetags/rest_framework.py      |  104 +-
 rest_framework/test.py                             |  127 +-
 rest_framework/throttling.py                       |    7 +-
 rest_framework/urlpatterns.py                      |    4 +-
 rest_framework/utils/breadcrumbs.py                |    7 +-
 rest_framework/utils/encoders.py                   |   10 +-
 rest_framework/utils/field_mapping.py              |  140 +-
 rest_framework/utils/formatting.py                 |   16 +-
 rest_framework/utils/html.py                       |    2 +-
 rest_framework/utils/mediatypes.py                 |    6 +-
 rest_framework/utils/model_meta.py                 |   15 +-
 rest_framework/utils/serializer_helpers.py         |   15 +-
 rest_framework/utils/urls.py                       |    4 +-
 rest_framework/validators.py                       |   28 +-
 rest_framework/versioning.py                       |    9 +-
 rest_framework/views.py                            |   31 +-
 rest_framework/viewsets.py                         |    4 +-
 schema-support                                     |    0
 setup.cfg                                          |    3 +
 setup.py                                           |   12 +-
 tests/browsable_api/test_browsable_api.py          |   18 +-
 tests/browsable_api/test_browsable_nested_api.py   |    8 +-
 tests/browsable_api/test_form_rendering.py         |    7 +-
 tests/conftest.py                                  |   15 +-
 tests/test_api_client.py                           |  474 +++++
 tests/test_atomic_requests.py                      |   46 +-
 tests/test_authentication.py                       |  141 +-
 tests/test_authtoken.py                            |   29 +
 tests/test_bound_fields.py                         |   33 +
 tests/test_compat.py                               |   67 +
 tests/test_decorators.py                           |   30 +-
 tests/test_description.py                          |   21 +-
 tests/test_encoders.py                             |   94 +
 tests/test_exceptions.py                           |   50 +-
 tests/test_fields.py                               |  242 ++-
 tests/test_filters.py                              |  420 ++--
 tests/test_generics.py                             |  225 ++-
 tests/test_htmlrenderer.py                         |   43 +-
 tests/test_lazy_hyperlinks.py                      |   49 +
 tests/test_metadata.py                             |   23 +-
 tests/test_model_serializer.py                     |  157 +-
 tests/test_multitable_inheritance.py               |    8 +-
 tests/test_negotiation.py                          |   69 +-
 tests/test_one_to_one_with_inheritance.py          |   46 +
 tests/test_pagination.py                           |  245 ++-
 tests/test_parsers.py                              |   80 +-
 tests/test_permissions.py                          |   25 +-
 tests/test_prefetch_related.py                     |   60 +
 tests/test_relations.py                            |   29 +-
 tests/test_relations_generic.py                    |    4 +-
 tests/test_relations_hyperlink.py                  |  109 +-
 tests/test_relations_pk.py                         |  120 +-
 tests/test_relations_slug.py                       |   72 +-
 tests/test_renderers.py                            |  215 ++-
 tests/test_request.py                              |   46 +-
 tests/test_requests_client.py                      |  256 +++
 tests/test_reverse.py                              |    8 +-
 tests/test_routers.py                              |  126 +-
 tests/test_schemas.py                              |  407 +++-
 tests/test_serializer.py                           |  256 ++-
 tests/test_serializer_bulk_update.py               |   24 +-
 tests/test_serializer_lists.py                     |  214 ++
 tests/test_serializer_nested.py                    |    6 +
 tests/test_templatetags.py                         |  228 ++-
 tests/test_testing.py                              |  103 +-
 tests/test_throttling.py                           |  150 +-
 tests/test_urlpatterns.py                          |   12 +-
 tests/test_utils.py                                |  103 +-
 tests/test_validation.py                           |   38 +-
 tests/test_validation_error.py                     |  101 +
 tests/test_validators.py                           |  157 +-
 tests/test_versioning.py                           |   93 +-
 tests/test_views.py                                |   42 +-
 tests/test_viewsets.py                             |   19 +-
 tests/test_write_only_fields.py                    |    6 +-
 tests/utils.py                                     |    2 +-
 tox.ini                                            |   37 +-
 251 files changed, 14949 insertions(+), 3034 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/djangorestframework.git



More information about the Python-modules-commits mailing list