Merge branch 'master' into issue-templates

Author: n2ygk

CHANGELOG.md

@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 Note that in line with [Django REST Framework policy](http://www.django-rest-framework.org/topics/release-notes/),
 any parts of the framework not mentioned in the documentation should generally be considered private API, and may be subject to change.
 
-## [Unreleased]
+## [4.2.0] - 2021-05-12
 
 ### Added
 
@@ -26,16 +26,13 @@ any parts of the framework not mentioned in the documentation should generally b
       name='order-related'),
   ```
 * Ensure default `included_resources` are considered when calculating prefetches.
-
+* Avoided error when using `include` query parameter on related urls (a regression since 4.1.0)
 
 ### Deprecated
 
 * Deprecated default `format_type` argument of `rest_framework_json_api.utils.format_value`. Use `rest_framework_json_api.utils.format_field_name` or specify specifc `format_type` instead.
-* Deprecated `format_type` argument of `rest_framework_json_api.utils.format_link_segment`. Use `format_value` instead.
+* Deprecated `format_type` argument of `rest_framework_json_api.utils.format_link_segment`. Use `rest_framework_json_api.utils.format_value` instead.
 
-### Fixed
-
-* Avoided error when using `include` query parameter on related urls (a regression since 4.1.0)
 
 ## [4.1.0] - 2021-03-08
 

SECURITY.md

@@ -4,6 +4,6 @@
 
 If you believe you've found something in Django REST Framework JSON API which has security implications, please **do not raise the issue in a public forum**.
 
-Send a description of the issue via email to [[email protected]][security-mail]. The project maintainers will then work with you to resolve any issues where required, prior to any public disclosure.
+Send a description of the issue via email to [rest-framework-jsonapi-[email protected]][security-mail]. The project maintainers will then work with you to resolve any issues where required, prior to any public disclosure.
 
-[security-mail]: mailto:[email protected]
+[security-mail]: mailto:rest-framework-jsonapi-[email protected]

requirements/requirements-codestyle.txt

@@ -1,4 +1,4 @@
-black==20.8b1
+black==21.4b2
 flake8==3.9.1
 flake8-isort==4.0.0
 isort==5.8.0

requirements/requirements-testing.txt

@@ -1,6 +1,6 @@
 django-debug-toolbar==3.2.1
 factory-boy==3.2.0
-Faker==8.1.0
+Faker==8.1.2
 pytest==6.2.3
 pytest-cov==2.11.1
 pytest-django==4.2.0

rest_framework_json_api/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 __title__ = "djangorestframework-jsonapi"
-__version__ = "4.1.0"
+__version__ = "4.2.0"
 __author__ = ""
 __license__ = "BSD"
 __copyright__ = ""

rest_framework_json_api/utils.py

@@ -326,7 +326,7 @@ def get_resource_type_from_serializer(serializer):
 
 
 def get_included_resources(request, serializer=None):
-    """ Build a list of included resources. """
+    """Build a list of included resources."""
     include_resources_param = request.query_params.get("include") if request else None
     if include_resources_param:
         return include_resources_param.split(",")

rest_framework_json_api/views.py

@@ -81,7 +81,7 @@ def get_queryset(self, *args, **kwargs):
 
 class AutoPrefetchMixin(object):
     def get_queryset(self, *args, **kwargs):
-        """ This mixin adds automatic prefetching for OneToOne and ManyToMany fields. """
+        """This mixin adds automatic prefetching for OneToOne and ManyToMany fields."""
         qs = super(AutoPrefetchMixin, self).get_queryset(*args, **kwargs)
 
         included_resources = get_included_resources(