Skip to content

Commit 2445421

Browse files
authored
Merge branch 'master' into drop-break-long-headers
2 parents bf9212d + 1e9b5c1 commit 2445421

Some content is hidden

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

43 files changed

+988
-1180
lines changed

.github/ISSUE_TEMPLATE/1-issue.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ about: Please only raise an issue if you've been advised to do so after discussi
55

66
## Checklist
77

8+
<!--
9+
Note: REST framework is considered feature-complete. New functionality should be implemented outside the core REST framework. For details, please check the docs: https://www.django-rest-framework.org/community/third-party-packages/#about-third-party-packages
10+
-->
11+
812
- [ ] Raised initially as discussion #...
9-
- [ ] This cannot be dealt with as a third party library. (We prefer new functionality to be [in the form of third party libraries](https://www.django-rest-framework.org/community/third-party-packages/#about-third-party-packages) where possible.)
13+
- [ ] This is not a feature request suitable for implementation outside this project. Please elaborate what it is:
14+
- [ ] compatibility fix for new Django/Python version ...
15+
- [ ] other type of bug fix
16+
- [ ] other type of improvement that does not touch existing code or change existing behavior (e.g. wrapper for new Django field)
1017
- [ ] I have reduced the issue to the simplest possible case.

.github/workflows/main.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ jobs:
1414
strategy:
1515
matrix:
1616
python-version:
17-
- '3.6'
18-
- '3.7'
1917
- '3.8'
2018
- '3.9'
2119
- '3.10'
@@ -37,18 +35,9 @@ jobs:
3735
- name: Install dependencies
3836
run: python -m pip install --upgrade codecov tox
3937

40-
- name: Install tox-py
41-
if: ${{ matrix.python-version == '3.6' }}
42-
run: python -m pip install --upgrade tox-py
43-
4438
- name: Run tox targets for ${{ matrix.python-version }}
45-
if: ${{ matrix.python-version != '3.6' }}
4639
run: tox run -f py$(echo ${{ matrix.python-version }} | tr -d .)
4740

48-
- name: Run tox targets for ${{ matrix.python-version }}
49-
if: ${{ matrix.python-version == '3.6' }}
50-
run: tox --py current
51-
5241
- name: Run extra tox targets
5342
if: ${{ matrix.python-version == '3.9' }}
5443
run: |

PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*Note*: Before submitting this pull request, please review our [contributing guidelines](https://www.django-rest-framework.org/community/contributing/#pull-requests).
1+
*Note*: Before submitting a code change, please review our [contributing guidelines](https://www.django-rest-framework.org/community/contributing/#pull-requests).
22

33
## Description
44

README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ Some reasons you might want to use REST framework:
5353

5454
# Requirements
5555

56-
* Python 3.6+
57-
* Django 5.0, 4.2, 4.1, 4.0, 3.2, 3.1, 3.0
56+
* Python 3.8+
57+
* Django 5.0, 4.2
5858

5959
We **highly recommend** and only officially support the latest patch release of
6060
each Python and Django series.
@@ -172,8 +172,6 @@ Full documentation for the project is available at [https://www.django-rest-fram
172172

173173
For questions and support, use the [REST framework discussion group][group], or `#restframework` on libera.chat IRC.
174174

175-
You may also want to [follow the author on Twitter][twitter].
176-
177175
# Security
178176

179177
Please see the [security policy][security-policy].
@@ -184,7 +182,6 @@ Please see the [security policy][security-policy].
184182
[codecov]: https://codecov.io/github/encode/django-rest-framework?branch=master
185183
[pypi-version]: https://img.shields.io/pypi/v/djangorestframework.svg
186184
[pypi]: https://pypi.org/project/djangorestframework/
187-
[twitter]: https://twitter.com/starletdreaming
188185
[group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework
189186

190187
[funding]: https://fund.django-rest-framework.org/topics/funding/

docs/api-guide/serializers.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -845,8 +845,6 @@ Here's an example of how you might choose to implement multiple updates:
845845
class Meta:
846846
list_serializer_class = BookListSerializer
847847

848-
It is possible that a third party package may be included alongside the 3.1 release that provides some automatic support for multiple update operations, similar to the `allow_add_remove` behavior that was present in REST framework 2.
849-
850848
#### Customizing ListSerializer initialization
851849

852850
When a serializer with `many=True` is instantiated, we need to determine which arguments and keyword arguments should be passed to the `.__init__()` method for both the child `Serializer` class, and for the parent `ListSerializer` class.

docs/community/contributing.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66
77
There are many ways you can contribute to Django REST framework. We'd like it to be a community-led project, so please get involved and help shape the future of the project.
88

9-
---
9+
!!! note
1010

11-
**Note**: At this point in it's lifespan we consider Django REST framework to be essentially feature-complete. We may accept pull requests that track the continued development of Django versions, but would prefer not to accept new features or code formatting changes.
12-
13-
---
11+
At this point in its lifespan we consider Django REST framework to be feature-complete. We focus on pull requests that track the continued development of Django versions, and generally do not accept new features or code formatting changes.
1412

1513
## Community
1614

@@ -36,10 +34,9 @@ Our contribution process is that the [GitHub discussions page](https://github.co
3634

3735
Some tips on good potential issue reporting:
3836

39-
* When describing issues try to phrase your ticket in terms of the *behavior* you think needs changing rather than the *code* you think need changing.
37+
* Django REST framework is considered feature-complete. Please do not file requests to change behavior, unless it is required for security reasons or to maintain compatibility with upcoming Django or Python versions.
4038
* Search the GitHub project page for related items, and make sure you're running the latest version of REST framework before reporting an issue.
41-
* Feature requests will often be closed with a recommendation that they be implemented outside of the core REST framework library. Keeping new feature requests implemented as third party libraries allows us to keep down the maintenance overhead of REST framework, so that the focus can be on continued stability, bugfixes, and great documentation. At this point in it's lifespan we consider Django REST framework to be essentially feature-complete.
42-
* Closing an issue doesn't necessarily mean the end of a discussion. If you believe your issue has been closed incorrectly, explain why and we'll consider if it needs to be reopened.
39+
* Feature requests will typically be closed with a recommendation that they be implemented outside the core REST framework library (e.g. as third-party libraries). This approach allows us to keep down the maintenance overhead of REST framework, so that the focus can be on continued stability and great documentation.
4340

4441
## Triaging issues
4542

@@ -48,8 +45,8 @@ Getting involved in triaging incoming issues is a good way to start contributing
4845
* Read through the ticket - does it make sense, is it missing any context that would help explain it better?
4946
* Is the ticket reported in the correct place, would it be better suited as a discussion on the discussion group?
5047
* If the ticket is a bug report, can you reproduce it? Are you able to write a failing test case that demonstrates the issue and that can be submitted as a pull request?
51-
* If the ticket is a feature request, do you agree with it, and could the feature request instead be implemented as a third party package?
52-
* If a ticket hasn't had much activity and it addresses something you need, then comment on the ticket and try to find out what's needed to get it moving again.
48+
* If the ticket is a feature request, could the feature request instead be implemented as a third party package?
49+
* If a ticket hasn't had much activity and addresses something you need, then comment on the ticket and try to find out what's needed to get it moving again.
5350

5451
# Development
5552

0 commit comments

Comments
 (0)