Skip to content

Commit ba54faa

Browse files
JoelLefkowitzJoelLefkowitz
committed
Merge branch '1.21.x' into pr/445
2 parents 67f5489 + 6745ddb commit ba54faa

File tree

112 files changed

+10248
-1813
lines changed

Some content is hidden

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

112 files changed

+10248
-1813
lines changed

‎.cspell.json

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
{
2+
"language": "en",
3+
"ignorePaths": [
4+
"./app.json",
5+
".gitignore",
6+
"*.coverage",
7+
"*.min.js",
8+
"**/__pycache__/**",
9+
"**/*.egg-info/**",
10+
"**/*.git/**",
11+
"**/build/**",
12+
"**/coverage/**",
13+
"**/dist/**",
14+
"**/migrations/**",
15+
"**/swagger-ui-dist/**",
16+
"**/venv/**"
17+
],
18+
"dictionaries": [
19+
"css",
20+
"django",
21+
"fonts",
22+
"local",
23+
"misc",
24+
"python",
25+
"softwareTerms"
26+
],
27+
"words": [
28+
"addopts",
29+
"apiview",
30+
"askar",
31+
"auths",
32+
"authtoken",
33+
"autoclass",
34+
"autodata",
35+
"automodule",
36+
"avenir",
37+
"barebones",
38+
"basepath",
39+
"beaugunderson",
40+
"blueyed",
41+
"builddir",
42+
"bysource",
43+
"cacheable",
44+
"callabale",
45+
"camelize",
46+
"camelized",
47+
"classdoc",
48+
"codecov",
49+
"codegen",
50+
"coreapi",
51+
"coreschema",
52+
"corsheaders",
53+
"coveragerc",
54+
"cristi",
55+
"cristian",
56+
"cschema",
57+
"csrfmiddlewaretoken",
58+
"csrftoken",
59+
"dascalescu",
60+
"datadiff",
61+
"deauth",
62+
"deauthorize",
63+
"deprecated",
64+
"djangorestframework",
65+
"djmaster",
66+
"docstrings",
67+
"documentclass",
68+
"elnappo",
69+
"envlist",
70+
"eryk",
71+
"exitfirst",
72+
"extrahead",
73+
"figwidth",
74+
"filterset",
75+
"formop",
76+
"genindex",
77+
"getdefault",
78+
"ghuser",
79+
"gunicorn",
80+
"herokuapp",
81+
"hirokawa",
82+
"howto",
83+
"htbp",
84+
"htmlhelp",
85+
"immutablehash",
86+
"indentless",
87+
"initkwargs",
88+
"joellefkowitz",
89+
"jsons",
90+
"keepdb",
91+
"keyframeprefix",
92+
"letterpaper",
93+
"levelname",
94+
"linenos",
95+
"maxdepth",
96+
"minversion",
97+
"modindex",
98+
"monokai",
99+
"myparent",
100+
"napierała",
101+
"nbsp",
102+
"noscm",
103+
"npmignore",
104+
"odict",
105+
"omap",
106+
"paginators",
107+
"papersize",
108+
"passwordadmin",
109+
"plugable",
110+
"pointsize",
111+
"popd",
112+
"posargs",
113+
"preauth",
114+
"preauthorize",
115+
"prepended",
116+
"proxied",
117+
"psycopg",
118+
"pushd",
119+
"putenv",
120+
"pythonpath",
121+
"pytz",
122+
"qinsq",
123+
"quickstart",
124+
"rebilly",
125+
"redoc",
126+
"referenceable",
127+
"reftest",
128+
"refuri",
129+
"regexes",
130+
"representer",
131+
"rsichny",
132+
"rtype",
133+
"ruamel",
134+
"scrollbars",
135+
"searchbox",
136+
"serializers",
137+
"setuptools",
138+
"sidemenu",
139+
"sourcedir",
140+
"sphinxbuild",
141+
"sphinxopts",
142+
"sphinxproj",
143+
"staticfiles",
144+
"subclassing",
145+
"swaggerapi",
146+
"tenerowicz",
147+
"testenv",
148+
"testproj",
149+
"therefromhere",
150+
"toctree",
151+
"undoc",
152+
"unencrypted",
153+
"uritemplate",
154+
"urlconf",
155+
"urlconfs",
156+
"urlpatterns",
157+
"versionadded",
158+
"versionchanged",
159+
"versionmodified",
160+
"viewcode",
161+
"viewset",
162+
"viewsets",
163+
"vigrond",
164+
"vschema",
165+
"whitenoise",
166+
"wsgi",
167+
"xdist",
168+
"yasg",
169+
"yasgdoc",
170+
"yetanother",
171+
"yetanothers",
172+
"yourapp",
173+
"yusupov",
174+
"zbyszek"
175+
]
176+
}

‎.github/ISSUE_TEMPLATE/bug.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
name: 'Bug Report'
3+
about: Report a bug
4+
---
5+
6+
# Bug Report
7+
8+
## Description
9+
10+
<!-- edit: --> A clear and concise description of the problem...
11+
12+
## Is this a regression?
13+
14+
<!-- Did this behavior use to work in the previous version? -->
15+
<!-- edit: --> Yes, the previous version in which this bug was not present was: ...
16+
17+
## Minimal Reproduction
18+
19+
```code
20+
21+
```
22+
23+
## Stack trace / Error message
24+
25+
```code
26+
27+
```
28+
29+
<!-- If the issue is accompanied by an exception or an error, please share it below: -->
30+
31+
## Your Environment
32+
33+
```code
34+
35+
```

‎.github/ISSUE_TEMPLATE/feature.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: 'Feature Request'
3+
about: Suggest a feature
4+
---
5+
6+
# Feature Request
7+
8+
## Description
9+
10+
<!-- edit: --> A clear and concise description of the problem or missing capability...
11+
12+
## Describe the solution you'd like
13+
14+
<!-- edit: --> If you have a solution in mind, please describe it.
15+
16+
## Describe alternatives you've considered
17+
18+
<!-- edit: --> Have you considered any alternative solutions or workarounds?

‎.github/PULL_REQUEST_TEMPLATE/general.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# PR Checklist
2+
3+
Please check if your PR fulfills the following requirements:
4+
5+
- [ ] The commit message follows our contributing guidelines
6+
- [ ] Tests for the changes have been added (for bug fixes / features)
7+
- [ ] Docs have been added / updated (for bug fixes / features)
8+
9+
## PR Type
10+
11+
What kind of change does this PR introduce?
12+
13+
- [ ] Bugfix
14+
- [ ] Feature
15+
- [ ] Code style update
16+
- [ ] Refactoring (no functional changes)
17+
- [ ] Build related changes
18+
- [ ] CI related changes
19+
- [ ] Documentation content changes
20+
- [ ] Other
21+
22+
## What is the current behavior?
23+
24+
## What is the new behavior?
25+
26+
## Does this PR introduce a breaking change?
27+
28+
- [ ] Yes
29+
- [ ] No
30+
31+
## Other information

‎.github/workflows/publish.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Publish
2+
3+
on:
4+
push:
5+
tags:
6+
- "*.*.*"
7+
8+
jobs:
9+
publish:
10+
name: Publish the package on pypi
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout the source code
14+
uses: actions/checkout@v2
15+
16+
- name: Set the python version
17+
uses: actions/setup-python@v2
18+
19+
# This is the version of python used to package the code. The unit
20+
# tests will have run against python 3.6, 3.7 etc ensuring
21+
# compatibility with those runtimes.
22+
# https://github.com/axnsan12/drf-yasg/pull/741#discussion_r713297594
23+
with:
24+
python-version: 3.8
25+
26+
- name: Install pip dependencies
27+
run: pip install -r requirements/publish.txt
28+
29+
- name: Build the distributions
30+
run: python setup.py sdist bdist_wheel
31+
32+
- name: Publish the package
33+
uses: pypa/gh-action-pypi-publish@release/v1
34+
with:
35+
user: __token__
36+
password: ${{ secrets.PYPI_API_TOKEN }}

‎.github/workflows/review.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Review
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
review:
7+
name: Run linters and tests
8+
runs-on: ubuntu-latest
9+
strategy:
10+
matrix:
11+
python: [3.6, 3.7, 3.8, 3.9]
12+
13+
steps:
14+
- name: Set up pip package caching
15+
uses: actions/cache@v2
16+
with:
17+
path: ~/.cache/pip
18+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
19+
restore-keys: ${{ runner.os }}-pip-
20+
21+
- name: Checkout the source code
22+
uses: actions/checkout@v2
23+
24+
- name: Set the python version
25+
uses: actions/setup-python@v2
26+
with:
27+
python-version: ${{ matrix.python }}
28+
29+
- name: Install pip dependencies
30+
run: pip install -r requirements/ci.txt
31+
32+
- name: Run unit tests
33+
run: tox

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.idea/
12
node_modules/
23
testproj/db.sqlite3
34
testproj/staticfiles

‎.idea/codeStyles/Project.xml

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

‎.idea/codeStyles/codeStyleConfig.xml

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

0 commit comments

Comments
 (0)