Merge branch 'encode:master' into django-rest-framework-guardian2

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - uses: actions/setup-python@v3
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'

docs/api-guide/validators.md

@@ -271,7 +271,6 @@ A validator may be any callable that raises a `serializers.ValidationError` on f
     def even_number(value):
         if value % 2 != 0:
             raise serializers.ValidationError('This field must be an even number.')
-        return value
 
 #### Field-level validation
 

requirements/requirements-optionals.txt

@@ -1,7 +1,7 @@
 # Optional packages which may be used with REST framework.
 coreapi==2.3.1
 coreschema==0.0.4
-django-filter>=2.4.0,<3.0
+django-filter
 django-guardian>=2.4.0,<2.5
 inflection==0.5.1
 markdown==3.3

requirements/requirements-packaging.txt

@@ -5,4 +5,4 @@ wheel>=0.35.1,<0.36
 twine>=3.2.0,<3.3
 
 # Transifex client for managing translation resources.
-transifex-client>=0.13.12,<0.14
+transifex-client

requirements/requirements-testing.txt

@@ -3,3 +3,5 @@ pytest>=6.2.0,<8.0
 pytest-cov>=4.0.0,<5.0
 pytest-django>=4.5.2,<5.0
 importlib-metadata<5.0
+# temporary pin of attrs
+attrs==22.1.0