Merge branch 'main' into python-support-315

Author: browniebroke

.github/dependabot.yml

@@ -45,3 +45,14 @@ updates:
       interval: weekly
     cooldown:
       default-days: 7
+
+  - package-ecosystem: "pre-commit"
+    directory: "/"
+    groups:
+      pre-commit:
+        patterns:
+        - "*"
+    schedule:
+      interval: weekly
+    cooldown:
+      default-days: 7

.github/workflows/main.yml

@@ -73,7 +73,7 @@ jobs:
         tox -e base,dist,docs
 
     - name: Upload coverage
-      uses: codecov/codecov-action@v7.0.0
+      uses: codecov/codecov-action@v7.1.0
       with:
         env_vars: TOXENV,DJANGO
 

.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
   hooks:
   - id: blacken-docs
     additional_dependencies:
-    - black==26.1.0
+    - black==26.5.1
 - repo: https://github.com/codespell-project/codespell
   # Configuration for codespell is in pyproject.toml
   rev: v2.4.3

docs/api-guide/filtering.md

@@ -374,6 +374,11 @@ The [djangorestframework-word-filter][django-rest-framework-word-search-filter]
 
 [drf-url-filter][drf-url-filter] is a simple Django app to apply filters on drf `ModelViewSet`'s `Queryset` in a clean, simple and configurable way. It also supports validations on incoming query params and their values. A beautiful python package `Voluptuous` is being used for validations on the incoming query parameters. The best part about voluptuous is you can define your own validations as per your query params requirements.
 
+### rest-filters
+
+[rest-filters][rest-filters] is a modern, typed replacement for `django-filter` that uses DRF's serializer API. In addition to basic filtering, rest-filters supports filter groups, nested filters and filter defaults. It also includes a constraint system to perform validation across filters with ease. Since it uses the serializer API, you can use your existing serializers or serializer fields to parse query parameters.
+
+
 [cite]: https://docs.djangoproject.com/en/stable/topics/db/queries/#retrieving-specific-objects-with-filters
 [django-filter-docs]: https://django-filter.readthedocs.io/en/latest/index.html
 [django-filter-drf-docs]: https://django-filter.readthedocs.io/en/latest/guide/rest_framework.html
@@ -382,6 +387,7 @@ The [djangorestframework-word-filter][django-rest-framework-word-search-filter]
 [django-rest-framework-word-search-filter]: https://github.com/trollknurr/django-rest-framework-word-search-filter
 [django-url-filter]: https://github.com/miki725/django-url-filter
 [drf-url-filter]: https://github.com/manjitkumar/drf-url-filters
+[rest-filters]: https://github.com/realsuayip/rest-filters
 [HStoreField]: https://docs.djangoproject.com/en/stable/ref/contrib/postgres/fields/#hstorefield
 [JSONField]: https://docs.djangoproject.com/en/stable/ref/models/fields/#django.db.models.JSONField
 [postgres-search]: https://docs.djangoproject.com/en/stable/ref/contrib/postgres/search/

pyproject.toml

@@ -65,7 +65,7 @@ djangomain = [ "django @ https://github.com/django/django/archive/main.tar.gz" ]
 optional = [
   # Optional packages which may be used with REST framework.
   "django-filter",
-  "django-guardian>=2.4.0,<3.5",
+  "django-guardian>=2.4.0,<3.6",
   "inflection==0.5.1",
   "legacy-cgi; python_version>='3.13'",
   "markdown>=3.3.7",

tests/test_model_serializer.py

@@ -13,7 +13,7 @@
 import tempfile
 
 import pytest
-from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.core.serializers.json import DjangoJSONEncoder
 from django.core.validators import (
     MaxLengthValidator, MaxValueValidator, MinLengthValidator,
@@ -1498,3 +1498,39 @@ class Meta:
         serializer.save()
 
         self.assertEqual(instance.char_field, 'value changed by signal')
+
+
+class OverflowModel(models.Model):
+    value = models.IntegerField(unique=True, validators=[
+        MaxValueValidator(9223372036854775807),
+    ])
+
+
+class Issue7134Test(TestCase):
+
+    def test_model(self):
+        """
+        Assert that Django can validate the overflow model.
+        """
+        with self.assertRaises(ValidationError):
+            OverflowModel(value=9223372036854775808).full_clean()
+
+    def test_serializer(self):
+        class TestSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = OverflowModel
+                fields = '__all__'
+
+            def validate_value(self, value):
+                assert False
+
+        serializer = TestSerializer(data={'value': 9223372036854775808})
+
+        with self.assertRaises(serializers.ValidationError) as ctx:
+            serializer.is_valid(raise_exception=True)
+
+        # Check that the error code of the validation error
+        self.assertEqual(
+            [error.code for error in ctx.exception.detail['value']],
+            ['max_value'],
+        )