Merge branch 'master' into pyup-update-mypy-1.10.0-to-1.13.0

Author: alanjds

.github/workflows/main.yml

@@ -11,12 +11,12 @@ jobs:
     strategy:
       max-parallel: 6
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13-dev"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: "${{ matrix.python-version }}"
     - name: Install dependencies
@@ -37,9 +37,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.12
     - name: Install dependencies

CHANGELOG.md

@@ -0,0 +1,45 @@
+# Changelog
+
+## 0.95
+_Aug 27, 2025_
+
+* Fix 500 errors when receiving malformed JSON (@avacaru on PR#381)
+
+## 0.94.2
+_May 14, 2025_
+
+* Added tests for Django 5.1 and Python 3.13.
+* Removed tests for Django 4.1, Python 3.8 and DRF 3.13
+* Added support for `use_regex_path=False` in DRF 3.15 (@Gibsondz on PR#355)
+
+## 0.94.1
+_May 10, 2024_
+
+* Removed support for Django 3.2 LTS.
+* Changed minimum requirements (Python 3.8, Django 4.2, DRF 3.14)
+* Add type hints
+
+## 0.94.0
+_May 10, 2024_
+
+* Add initial type hint support
+* Removed Python 2 compatibility
+* Changed CI from Travis to GitHub CI
+* Updated timezone database
+
+## 0.93.5
+_Dec 19, 2023_
+
+* Add Support for Django 4.x
+* Removed support for Python 3.6, Django 1.11 and DRF 3.6
+* Change minimum requirements (Python 3.7, Django 3.2, DRF 3.14.0)
+* Update timezone database
+* Add swagger support for NestedViewSetMixin
+
+## 0.93.4
+_Oct 15, 2021_
+
+* Add serializer examples
+* Fix KeyError exception for nested resource during generate swagger ( #228 )
+* Improved documentation
+

README.md

@@ -17,11 +17,11 @@ exist without a domain, so you need it "nested" inside the domain.
 
 ## Requirements & Compatibility
 
-- Python (3.8, 3.9, 3.10, 3.11, 3.12)
-- Django (4.2, 5.0)
+- Python (3.9, 3.10, 3.11, 3.12, 3.13)
+- Django (4.2, 5.0, 5.1)
 - Django REST Framework (3.14, 3.15)
 
-It may work with lower versions, but since the release **0.93.5** is no more tested on CI for Python 3.6 or lower.<br/>
+It may work with lower versions, but since the release **0.94.2** is no more tested on CI for Python 3.8 or lower.<br/>
 And since **0.92.1** is no more tested on CI for Pythons 2.7 to 3.5, Django 1.11 to 2.1 or DRF 3.6 to 3.10.<br/>
 Before that, the release **0.90.2** was tested also with DRF 2.4.3 up to 3.7.
 

requirements-tox.txt

@@ -1,19 +1,19 @@
 # Test requirements
 
-pytest==8.2.0
+pytest==8.3.4
 pytest-cov==5.0.0
-pytest-django==4.8.0
-flake8==7.0.0
+pytest-django==4.9.0
+flake8==7.1.1
 ipdb==0.13.13
 pytz==2024.1
 
 # Type checking requirements
 mypy==1.13.0
-django-stubs==5.0.0
+django-stubs==5.1.1
 djangorestframework-stubs==3.15.0
 
 # wheel for PyPI installs
-wheel==0.43.0
+wheel==0.45.1
 
 # MkDocs for documentation previews/deploys
 mkdocs==1.5.2

requirements.txt

@@ -3,5 +3,5 @@
 
 # Minimum Django and REST framework version
 Django>=4.2
-djangorestframework>=3.14.0
+djangorestframework>=3.15.0
 

rest_framework_nested/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '0.94.1'
+__version__ = '0.95.0'

rest_framework_nested/routers.py

@@ -59,6 +59,7 @@ def __init__(
         self.parent_prefix = parent_prefix
         self.nest_count = getattr(parent_router, 'nest_count', 0) + 1
         self.nest_prefix = kwargs.pop('lookup', f'nested_{self.nest_count}') + '_'
+        self.use_regex_path = kwargs.get('use_regex_path', True)
 
         super().__init__(*args, **kwargs)
 
@@ -111,7 +112,11 @@ def __init__(
             # to escape it
             escaped_parent_regex = self.parent_regex.replace('{', '{{').replace('}', '}}')
 
-            route_contents['url'] = route.url.replace('^', '^' + escaped_parent_regex)
+            if self.use_regex_path:
+                route_contents['url'] = route.url.replace('^', '^' + escaped_parent_regex)
+            else:
+                route_contents['url'] = escaped_parent_regex + route_contents['url']
+
             nested_routes.append(type(route)(**route_contents))
 
         self.routes = nested_routes

rest_framework_nested/viewsets.py

@@ -64,19 +64,19 @@ def get_queryset(self) -> QuerySet[T_Model]:
             orm_filters[field_name] = self.kwargs[query_param]  # type: ignore[attr-defined]
         return queryset.filter(**orm_filters)
 
-    def initialize_request(self, request: HttpRequest, *args: Any, **kwargs: Any) -> Request:
+    def initial(self, request: Request, *args: Any, **kwargs: Any) -> None:
         """
         Adds the parent params from URL inside the children data available
         """
-        drf_request: Request = super().initialize_request(request, *args, **kwargs)  # type: ignore[misc]
+        # run all the DRF API policies first
+        super().initial(request, *args, **kwargs)  # type: ignore[misc]
 
         if getattr(self, 'swagger_fake_view', False):
-            return drf_request
+            return
 
         for url_kwarg, fk_filter in self._get_parent_lookup_kwargs().items():
             # fk_filter is alike 'grandparent__parent__pk'
             parent_arg = fk_filter.partition('__')[0]
-            for querydict in [drf_request.data, drf_request.query_params]:
+            for querydict in [request.data, request.query_params]:
                 with _force_mutable(querydict):
                     querydict[parent_arg] = kwargs[url_kwarg]
-        return drf_request

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.94.1
+current_version = 0.95.0
 commit = True
 tag = True
 

setup.py

@@ -76,7 +76,7 @@ def get_package_data(package):
     packages=get_packages(package),
     package_data=get_package_data(package),
     install_requires=[
-        'djangorestframework>=3.14.0',
+        'djangorestframework>=3.15.0',
         'Django>=4.2',
     ],
     python_requires=">=3.8",
@@ -96,6 +96,7 @@ def get_package_data(package):
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         'Topic :: Internet :: WWW/HTTP',
     ]
 )