Skip to content

Commit 7c014a3

Browse files
authored
Merge branch 'encode:master' into master
2 parents d4cee30 + 985dd73 commit 7c014a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+302
-327
lines changed

β€Ž.pre-commit-config.yamlβ€Ž

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,9 @@ repos:
3131
hooks:
3232
- id: codespell
3333
exclude: locale|kickstarter-announcement.md|coreapi-0.1.1.js
34+
35+
- repo: https://github.com/asottile/pyupgrade
36+
rev: v3.19.1
37+
hooks:
38+
- id: pyupgrade
39+
args: ["--py39-plus", "--keep-percent-format"]

β€Ždocs/api-guide/schemas.mdβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ If your views have related customizations that are needed frequently, you can
451451
create a base `AutoSchema` subclass for your project that takes additional
452452
`__init__()` kwargs to save subclassing `AutoSchema` for each view.
453453

454-
[cite]: https://blog.heroku.com/archives/2014/1/8/json_schema_for_heroku_platform_api
454+
[cite]: https://www.heroku.com/blog/json_schema_for_heroku_platform_api/
455455
[openapi]: https://github.com/OAI/OpenAPI-Specification
456456
[openapi-specification-extensions]: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#specification-extensions
457457
[openapi-operation]: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#operationObject

β€Ždocs/community/funding.mdβ€Ž

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ If you use REST framework commercially we strongly encourage you to invest in it
114114
Signing up for a paid plan will:
115115

116116
* Directly contribute to faster releases, more features, and higher quality software.
117-
* Allow more time to be invested in documentation, issue triage, and community support.
117+
* Allow more time to be invested in keeping the package up to date.
118118
* Safeguard the future development of REST framework.
119119

120120
REST framework continues to be open-source and permissively licensed, but we firmly believe it is in the commercial best-interest for users of the project to invest in its ongoing development.
@@ -134,18 +134,6 @@ REST framework continues to be open-source and permissively licensed, but we fir
134134

135135
---
136136

137-
## What future funding will enable
138-
139-
* Realtime API support, using WebSockets. This will consist of documentation and support for using REST framework together with Django Channels, plus integrating WebSocket support into the client libraries.
140-
* Better authentication defaults, possibly bringing JWT & CORS support into the core package.
141-
* Securing the community & operations manager position long-term.
142-
* Opening up and securing a part-time position to focus on ticket triage and resolution.
143-
* Paying for development time on building API client libraries in a range of programming languages. These would be integrated directly into the upcoming API documentation.
144-
145-
Sign up for a paid plan today, and help ensure that REST framework becomes a sustainable, full-time funded project.
146-
147-
---
148-
149137
## What our sponsors and users say
150138

151139
> As a developer, Django REST framework feels like an obvious and natural extension to all the great things that make up Django and it's community. Getting started is easy while providing simple abstractions which makes it flexible and customizable. Contributing and supporting Django REST framework helps ensure its future and one way or another it also helps Django, and the Python ecosystem.
@@ -165,6 +153,8 @@ DRF is one of the core reasons why Django is top choice among web frameworks tod
165153
>
166154
> — Andrew Conti, Django REST framework user
167155
156+
Sign up for a paid plan today, and help ensure that REST framework becomes a sustainable, full-time funded project.
157+
168158
---
169159

170160
## Individual plan

β€Ždocs/community/third-party-packages.mdβ€Ž

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ To submit new content, [create a pull request][drf-create-pr].
160160

161161
### Customization
162162

163+
* [drf-restwind][drf-restwind] - a modern re-imagining of the Django REST Framework utilizes TailwindCSS and DaisyUI to provide flexible and customizable UI solutions with minimal coding effort.
163164
* [drf-redesign][drf-redesign] - A project that gives a fresh look to the browse-able API using Bootstrap 5.
164165
* [drf-material][drf-material] - A project that gives a sleek and elegant look to the browsable API using Material Design.
165166

@@ -254,6 +255,7 @@ To submit new content, [create a pull request][drf-create-pr].
254255
[django-requestlogs]: https://github.com/Raekkeri/django-requestlogs
255256
[drf-standardized-errors]: https://github.com/ghazi-git/drf-standardized-errors
256257
[drf-api-action]: https://github.com/Ori-Roza/drf-api-action
258+
[drf-restwind]: https://github.com/youzarsiph/drf-restwind
257259
[drf-redesign]: https://github.com/youzarsiph/drf-redesign
258260
[drf-material]: https://github.com/youzarsiph/drf-material
259-
[django-pyoidc] : https://github.com/makinacorpus/django_pyoidc
261+
[django-pyoidc]: https://github.com/makinacorpus/django_pyoidc

β€Ždocs/img/drf-m-api-root.pngβ€Ž

81.1 KB
Loading
121 KB
Loading

β€Ždocs/img/drf-m-list-view.pngβ€Ž

123 KB
Loading

β€Ždocs/img/drf-r-api-root.pngβ€Ž

81.6 KB
Loading
118 KB
Loading

β€Ždocs/img/drf-r-list-view.pngβ€Ž

127 KB
Loading

0 commit comments

Comments
Β (0)