Skip to content

Commit 2b777df

Browse files
authored
Merge pull request #256 from eadwinCode/ninja_140
feat: Ninja 1.4.0 Support
2 parents cab4953 + df6509e commit 2b777df

File tree

5 files changed

+22
-13
lines changed

5 files changed

+22
-13
lines changed

ninja_extra/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Django Ninja Extra - Class Based Utility and more for Django Ninja(Fast Django REST framework)"""
22

3-
__version__ = "0.22.6"
3+
__version__ = "0.22.8"
44

55
import django
66

ninja_extra/operation.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,10 +379,10 @@ def add_operation(
379379
description: Optional[str] = None,
380380
tags: Optional[List[str]] = None,
381381
deprecated: Optional[bool] = None,
382-
by_alias: bool = False,
383-
exclude_unset: bool = False,
384-
exclude_defaults: bool = False,
385-
exclude_none: bool = False,
382+
by_alias: Optional[bool] = None,
383+
exclude_unset: Optional[bool] = None,
384+
exclude_defaults: Optional[bool] = None,
385+
exclude_none: Optional[bool] = None,
386386
url_name: Optional[str] = None,
387387
include_in_schema: bool = True,
388388
openapi_extra: Optional[Dict[str, Any]] = None,

ninja_extra/router.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ def add_api_operation(
3434
description: Optional[str] = None,
3535
tags: Optional[List[str]] = None,
3636
deprecated: Optional[bool] = None,
37-
by_alias: bool = False,
38-
exclude_unset: bool = False,
39-
exclude_defaults: bool = False,
40-
exclude_none: bool = False,
37+
by_alias: Optional[bool] = None,
38+
exclude_unset: Optional[bool] = None,
39+
exclude_defaults: Optional[bool] = None,
40+
exclude_none: Optional[bool] = None,
4141
url_name: Optional[str] = None,
4242
include_in_schema: bool = True,
4343
openapi_extra: Optional[Dict[str, Any]] = None,

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ classifiers = [
4242

4343
requires = [
4444
"Django >= 2.2",
45-
"django-ninja==1.3.0",
45+
"django-ninja==1.4.0",
4646
"injector >= 0.19.0",
4747
"asgiref",
4848
"contextlib2"

tests/test_pagination.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,19 +272,28 @@ def test_case5(self):
272272
assert response["items"] == ITEMS[10:20]
273273

274274
schema = api.get_openapi_schema()["paths"]["/api/items_5"]["get"]
275-
# print(schema)
275+
# print(schema["parameters"])
276276
assert schema["parameters"] == [
277277
{
278278
"in": "query",
279279
"name": "page",
280+
"required": False,
280281
"schema": {
281-
"title": "Page",
282282
"default": 1,
283283
"minimum": 1,
284+
"title": "Page",
284285
"type": "integer",
285286
},
287+
},
288+
{
289+
"in": "query",
290+
"name": "page_size",
286291
"required": False,
287-
}
292+
"schema": {
293+
"anyOf": [{"minimum": 1, "type": "integer"}, {"type": "null"}],
294+
"title": "Page Size",
295+
},
296+
},
288297
]
289298

290299
def test_case6(self):

0 commit comments

Comments
 (0)