Skip to content

Commit 8ab39ec

Browse files
Kostia-KKostia-K
authored
Merge branch 'encode:master' into fix-namespace-versioning
2 parents d4f7adc + aed7761 commit 8ab39ec

File tree

322 files changed

+20511
-10055
lines changed

Some content is hidden

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

322 files changed

+20511
-10055
lines changed

‎.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
github: encode
12
custom: https://fund.django-rest-framework.org/topics/funding/

‎.github/ISSUE_TEMPLATE/1-issue.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: Issue
3+
about: Please only raise an issue if you've been advised to do so after discussion. Thanks! 🙏
4+
---
5+
6+
## Checklist
7+
8+
- [ ] 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.)
10+
- [ ] I have reduced the issue to the simplest possible case.

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Discussions
4+
url: https://github.com/encode/django-rest-framework/discussions
5+
about: >
6+
The "Discussions" forum is where you want to start. 💖

‎.github/stale.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Documentation: https://github.com/probot/stale
2+
3+
# Number of days of inactivity before an issue becomes stale
4+
daysUntilStale: 60
5+
6+
# Number of days of inactivity before a stale issue is closed
7+
daysUntilClose: 7
8+
9+
# Comment to post when marking an issue as stale. Set to `false` to disable
10+
markComment: >
11+
This issue has been automatically marked as stale because it has not had
12+
recent activity. It will be closed if no further activity occurs. Thank you
13+
for your contributions.
14+
15+
# Comment to post when closing a stale issue. Set to `false` to disable
16+
closeComment: false
17+
18+
# Limit the number of actions per hour, from 1-30. Default is 30
19+
limitPerRun: 1
20+
21+
# Label to use when marking as stale
22+
staleLabel: stale

‎.github/workflows/main.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
9+
jobs:
10+
tests:
11+
name: Python ${{ matrix.python-version }}
12+
runs-on: ubuntu-20.04
13+
14+
strategy:
15+
matrix:
16+
python-version:
17+
- '3.6'
18+
- '3.7'
19+
- '3.8'
20+
- '3.9'
21+
- '3.10'
22+
- '3.11'
23+
24+
steps:
25+
- uses: actions/checkout@v3
26+
27+
- uses: actions/setup-python@v4
28+
with:
29+
python-version: ${{ matrix.python-version }}
30+
cache: 'pip'
31+
cache-dependency-path: 'requirements/*.txt'
32+
33+
- name: Upgrade packaging tools
34+
run: python -m pip install --upgrade pip setuptools virtualenv wheel
35+
36+
- name: Install dependencies
37+
run: python -m pip install --upgrade codecov tox
38+
39+
- name: Install tox-py
40+
if: ${{ matrix.python-version == '3.6' }}
41+
run: python -m pip install --upgrade tox-py
42+
43+
- name: Run tox targets for ${{ matrix.python-version }}
44+
if: ${{ matrix.python-version != '3.6' }}
45+
run: tox run -f py$(echo ${{ matrix.python-version }} | tr -d .)
46+
47+
- name: Run tox targets for ${{ matrix.python-version }}
48+
if: ${{ matrix.python-version == '3.6' }}
49+
run: tox --py current
50+
51+
- name: Run extra tox targets
52+
if: ${{ matrix.python-version == '3.9' }}
53+
run: |
54+
tox -e base,dist,docs
55+
56+
- name: Upload coverage
57+
run: |
58+
codecov -e TOXENV,DJANGO

‎.github/workflows/pre-commit.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: pre-commit
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
9+
jobs:
10+
pre-commit:
11+
runs-on: ubuntu-20.04
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
with:
16+
fetch-depth: 0
17+
18+
- uses: actions/setup-python@v2
19+
with:
20+
python-version: 3.9
21+
22+
- uses: pre-commit/[email protected]
23+
with:
24+
token: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
*.db
33
*~
44
.*
5+
*.py.bak
6+
57

68
/site/
79
/htmlcov/
@@ -13,6 +15,6 @@
1315
MANIFEST
1416
coverage.*
1517

18+
!.github
1619
!.gitignore
17-
!.travis.yml
18-
!.isort.cfg
20+
!.pre-commit-config.yaml

‎.pre-commit-config.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v3.4.0
4+
hooks:
5+
- id: check-added-large-files
6+
- id: check-case-conflict
7+
- id: check-json
8+
- id: check-merge-conflict
9+
- id: check-symlinks
10+
- id: check-toml
11+
- repo: https://github.com/pycqa/isort
12+
rev: 5.12.0
13+
hooks:
14+
- id: isort
15+
- repo: https://github.com/PyCQA/flake8
16+
rev: 3.9.0
17+
hooks:
18+
- id: flake8
19+
additional_dependencies:
20+
- flake8-tidy-imports

‎.travis.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎.tx/config

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[main]
2+
host = https://www.transifex.com
3+
lang_map = sr@latin:sr_Latn, zh-Hans:zh_Hans, zh-Hant:zh_Hant
4+
5+
[django-rest-framework.djangopo]
6+
file_filter = rest_framework/locale/<lang>/LC_MESSAGES/django.po
7+
source_file = rest_framework/locale/en_US/LC_MESSAGES/django.po
8+
source_lang = en_US
9+
type = PO

0 commit comments

Comments
 (0)