Skip to content

Commit 309a7ef

Browse files
edx-requirements-botUsamaSadiq
edx-requirements-bot
authored and
UsamaSadiq
committed
fix: add common constraint
Added django-not-configured in pylintrc
1 parent 9e30d95 commit 309a7ef

10 files changed

Lines changed: 648 additions & 195 deletions

File tree

‎code_annotations/generate_docs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def _add_report_file_to_full_report(self, report_file, report):
6868
for report_annotation in report[filename]:
6969
index_keys = ('line_number', 'annotation_token', 'annotation_data')
7070

71-
if all([loaded_annotation[k] == report_annotation[k] for k in index_keys]):
71+
if all(loaded_annotation[k] == report_annotation[k] for k in index_keys):
7272
report_annotation.update(loaded_annotation)
7373
found = True
7474
break

‎pylintrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ disable =
285285
unused-wildcard-import,
286286
global-statement,
287287
no-else-return,
288+
django-not-configured,
288289

289290
apply-builtin,
290291
backtick,

‎requirements/base.txt‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,27 @@
44
#
55
# make upgrade
66
#
7-
click==7.1.2 # via -r requirements/base.in
8-
django==2.2.17 # via -c requirements/constraints.txt, -r requirements/base.in
9-
jinja2==2.11.2 # via -r requirements/base.in
10-
markupsafe==1.1.1 # via jinja2
11-
pbr==5.5.1 # via stevedore
12-
python-slugify==4.0.1 # via -r requirements/base.in
13-
pytz==2020.4 # via django
14-
pyyaml==5.3.1 # via -r requirements/base.in
15-
sqlparse==0.4.1 # via django
16-
stevedore==3.3.0 # via -r requirements/base.in
17-
text-unidecode==1.3 # via python-slugify
7+
click==7.1.2
8+
# via -r requirements/base.in
9+
django==2.2.22
10+
# via
11+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
12+
# -r requirements/base.in
13+
jinja2==2.11.3
14+
# via -r requirements/base.in
15+
markupsafe==1.1.1
16+
# via jinja2
17+
pbr==5.6.0
18+
# via stevedore
19+
python-slugify==5.0.2
20+
# via -r requirements/base.in
21+
pytz==2021.1
22+
# via django
23+
pyyaml==5.4.1
24+
# via -r requirements/base.in
25+
sqlparse==0.4.1
26+
# via django
27+
stevedore==3.3.0
28+
# via -r requirements/base.in
29+
text-unidecode==1.3
30+
# via python-slugify

‎requirements/constraints.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
# pin when possible. Writing an issue against the offending project and
99
# linking to it here is good.
1010

11-
# stay on an lts release
12-
django<2.3
11+
# Common constraints for edx repos
12+
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
13+

‎requirements/dev.txt‎

Lines changed: 233 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,60 +4,239 @@
44
#
55
# make upgrade
66
#
7-
appdirs==1.4.4 # via -r requirements/travis.txt, virtualenv
8-
astroid==2.4.2 # via -r requirements/quality.txt, pylint, pylint-celery
9-
attrs==20.3.0 # via -r requirements/quality.txt, pytest
10-
certifi==2020.12.5 # via -r requirements/travis.txt, requests
11-
chardet==4.0.0 # via -r requirements/travis.txt, requests
12-
click-log==0.3.2 # via -r requirements/quality.txt, edx-lint
13-
click==7.1.2 # via -r requirements/pip-tools.txt, -r requirements/quality.txt, click-log, edx-lint, pip-tools
14-
codecov==2.1.11 # via -r requirements/travis.txt
15-
coverage==5.3.1 # via -r requirements/quality.txt, -r requirements/travis.txt, codecov, pytest-cov
16-
diff-cover==4.0.1 # via -r requirements/dev.in
17-
distlib==0.3.1 # via -r requirements/travis.txt, virtualenv
18-
django==2.2.17 # via -c requirements/constraints.txt, -r requirements/quality.txt
19-
edx-lint==1.6 # via -r requirements/quality.txt
20-
filelock==3.0.12 # via -r requirements/travis.txt, tox, virtualenv
21-
idna==2.10 # via -r requirements/travis.txt, requests
22-
inflect==5.0.2 # via jinja2-pluralize
23-
iniconfig==1.1.1 # via -r requirements/quality.txt, pytest
24-
isort==5.6.4 # via -r requirements/quality.txt, pylint
25-
jinja2-pluralize==0.3.0 # via diff-cover
26-
jinja2==2.11.2 # via -r requirements/quality.txt, diff-cover, jinja2-pluralize
27-
lazy-object-proxy==1.4.3 # via -r requirements/quality.txt, astroid
28-
markupsafe==1.1.1 # via -r requirements/quality.txt, jinja2
29-
mccabe==0.6.1 # via -r requirements/quality.txt, pylint
30-
mock==4.0.3 # via -r requirements/quality.txt
31-
packaging==20.8 # via -r requirements/quality.txt, -r requirements/travis.txt, pytest, tox
32-
pbr==5.5.1 # via -r requirements/quality.txt, stevedore
33-
pip-tools==5.4.0 # via -r requirements/pip-tools.txt
34-
pluggy==0.13.1 # via -r requirements/quality.txt, -r requirements/travis.txt, diff-cover, pytest, tox
35-
py==1.10.0 # via -r requirements/quality.txt, -r requirements/travis.txt, pytest, tox
36-
pycodestyle==2.6.0 # via -r requirements/quality.txt
37-
pydocstyle==5.1.1 # via -r requirements/quality.txt
38-
pygments==2.7.3 # via diff-cover
39-
pylint-celery==0.3 # via -r requirements/quality.txt, edx-lint
40-
pylint-django==2.3.0 # via -r requirements/quality.txt, edx-lint
41-
pylint-plugin-utils==0.6 # via -r requirements/quality.txt, pylint-celery, pylint-django
42-
pylint==2.6.0 # via -r requirements/quality.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
43-
pyparsing==2.4.7 # via -r requirements/quality.txt, -r requirements/travis.txt, packaging
44-
pytest-cov==2.10.1 # via -r requirements/quality.txt
45-
pytest==6.2.1 # via -r requirements/quality.txt, pytest-cov
46-
python-slugify==4.0.1 # via -r requirements/quality.txt
47-
pytz==2020.4 # via -r requirements/quality.txt, django
48-
pyyaml==5.3.1 # via -r requirements/quality.txt
49-
requests==2.25.1 # via -r requirements/travis.txt, codecov
50-
six==1.15.0 # via -r requirements/pip-tools.txt, -r requirements/quality.txt, -r requirements/travis.txt, astroid, edx-lint, pip-tools, tox, virtualenv
51-
snowballstemmer==2.0.0 # via -r requirements/quality.txt, pydocstyle
52-
sqlparse==0.4.1 # via -r requirements/quality.txt, django
53-
stevedore==3.3.0 # via -r requirements/quality.txt
54-
text-unidecode==1.3 # via -r requirements/quality.txt, python-slugify
55-
toml==0.10.2 # via -r requirements/quality.txt, -r requirements/travis.txt, pylint, pytest, tox
56-
tox-battery==0.6.1 # via -r requirements/travis.txt
57-
tox==3.20.1 # via -r requirements/travis.txt, tox-battery
58-
urllib3==1.26.2 # via -r requirements/travis.txt, requests
59-
virtualenv==20.2.2 # via -r requirements/travis.txt, tox
60-
wrapt==1.12.1 # via -r requirements/quality.txt, astroid
7+
appdirs==1.4.4
8+
# via
9+
# -r requirements/travis.txt
10+
# virtualenv
11+
astroid==2.5.6
12+
# via
13+
# -r requirements/quality.txt
14+
# pylint
15+
# pylint-celery
16+
attrs==21.2.0
17+
# via
18+
# -r requirements/quality.txt
19+
# pytest
20+
certifi==2020.12.5
21+
# via
22+
# -r requirements/travis.txt
23+
# requests
24+
chardet==4.0.0
25+
# via
26+
# -r requirements/travis.txt
27+
# diff-cover
28+
# requests
29+
click-log==0.3.2
30+
# via
31+
# -r requirements/quality.txt
32+
# edx-lint
33+
click==7.1.2
34+
# via
35+
# -r requirements/pip-tools.txt
36+
# -r requirements/quality.txt
37+
# click-log
38+
# code-annotations
39+
# edx-lint
40+
# pip-tools
41+
code-annotations==1.1.1
42+
# via
43+
# -r requirements/quality.txt
44+
# edx-lint
45+
codecov==2.1.11
46+
# via -r requirements/travis.txt
47+
coverage==5.5
48+
# via
49+
# -r requirements/quality.txt
50+
# -r requirements/travis.txt
51+
# codecov
52+
# pytest-cov
53+
diff-cover==5.1.0
54+
# via -r requirements/dev.in
55+
distlib==0.3.1
56+
# via
57+
# -r requirements/travis.txt
58+
# virtualenv
59+
django==2.2.22
60+
# via
61+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
62+
# -r requirements/quality.txt
63+
# code-annotations
64+
# edx-lint
65+
edx-lint==5.0.0
66+
# via -r requirements/quality.txt
67+
filelock==3.0.12
68+
# via
69+
# -r requirements/travis.txt
70+
# tox
71+
# virtualenv
72+
idna==2.10
73+
# via
74+
# -r requirements/travis.txt
75+
# requests
76+
inflect==5.3.0
77+
# via jinja2-pluralize
78+
iniconfig==1.1.1
79+
# via
80+
# -r requirements/quality.txt
81+
# pytest
82+
isort==5.8.0
83+
# via
84+
# -r requirements/quality.txt
85+
# pylint
86+
jinja2-pluralize==0.3.0
87+
# via diff-cover
88+
jinja2==2.11.3
89+
# via
90+
# -r requirements/quality.txt
91+
# code-annotations
92+
# diff-cover
93+
# jinja2-pluralize
94+
lazy-object-proxy==1.6.0
95+
# via
96+
# -r requirements/quality.txt
97+
# astroid
98+
markupsafe==1.1.1
99+
# via
100+
# -r requirements/quality.txt
101+
# jinja2
102+
mccabe==0.6.1
103+
# via
104+
# -r requirements/quality.txt
105+
# pylint
106+
mock==4.0.3
107+
# via -r requirements/quality.txt
108+
packaging==20.9
109+
# via
110+
# -r requirements/quality.txt
111+
# -r requirements/travis.txt
112+
# pytest
113+
# tox
114+
pbr==5.6.0
115+
# via
116+
# -r requirements/quality.txt
117+
# stevedore
118+
pep517==0.10.0
119+
# via
120+
# -r requirements/pip-tools.txt
121+
# pip-tools
122+
pip-tools==6.1.0
123+
# via -r requirements/pip-tools.txt
124+
pluggy==0.13.1
125+
# via
126+
# -r requirements/quality.txt
127+
# -r requirements/travis.txt
128+
# diff-cover
129+
# pytest
130+
# tox
131+
py==1.10.0
132+
# via
133+
# -r requirements/quality.txt
134+
# -r requirements/travis.txt
135+
# pytest
136+
# tox
137+
pycodestyle==2.7.0
138+
# via -r requirements/quality.txt
139+
pydocstyle==6.0.0
140+
# via -r requirements/quality.txt
141+
pygments==2.9.0
142+
# via diff-cover
143+
pylint-celery==0.3
144+
# via
145+
# -r requirements/quality.txt
146+
# edx-lint
147+
pylint-django==2.4.4
148+
# via
149+
# -r requirements/quality.txt
150+
# edx-lint
151+
pylint-plugin-utils==0.6
152+
# via
153+
# -r requirements/quality.txt
154+
# pylint-celery
155+
# pylint-django
156+
pylint==2.8.2
157+
# via
158+
# -r requirements/quality.txt
159+
# edx-lint
160+
# pylint-celery
161+
# pylint-django
162+
# pylint-plugin-utils
163+
pyparsing==2.4.7
164+
# via
165+
# -r requirements/quality.txt
166+
# -r requirements/travis.txt
167+
# packaging
168+
pytest-cov==2.11.1
169+
# via -r requirements/quality.txt
170+
pytest==6.2.4
171+
# via
172+
# -r requirements/quality.txt
173+
# pytest-cov
174+
python-slugify==5.0.2
175+
# via
176+
# -r requirements/quality.txt
177+
# code-annotations
178+
pytz==2021.1
179+
# via
180+
# -r requirements/quality.txt
181+
# django
182+
pyyaml==5.4.1
183+
# via
184+
# -r requirements/quality.txt
185+
# code-annotations
186+
requests==2.25.1
187+
# via
188+
# -r requirements/travis.txt
189+
# codecov
190+
six==1.16.0
191+
# via
192+
# -r requirements/quality.txt
193+
# -r requirements/travis.txt
194+
# edx-lint
195+
# tox
196+
# virtualenv
197+
snowballstemmer==2.1.0
198+
# via
199+
# -r requirements/quality.txt
200+
# pydocstyle
201+
sqlparse==0.4.1
202+
# via
203+
# -r requirements/quality.txt
204+
# django
205+
stevedore==3.3.0
206+
# via
207+
# -r requirements/quality.txt
208+
# code-annotations
209+
text-unidecode==1.3
210+
# via
211+
# -r requirements/quality.txt
212+
# python-slugify
213+
toml==0.10.2
214+
# via
215+
# -r requirements/pip-tools.txt
216+
# -r requirements/quality.txt
217+
# -r requirements/travis.txt
218+
# pep517
219+
# pylint
220+
# pytest
221+
# tox
222+
tox-battery==0.6.1
223+
# via -r requirements/travis.txt
224+
tox==3.23.1
225+
# via
226+
# -r requirements/travis.txt
227+
# tox-battery
228+
urllib3==1.26.4
229+
# via
230+
# -r requirements/travis.txt
231+
# requests
232+
virtualenv==20.4.6
233+
# via
234+
# -r requirements/travis.txt
235+
# tox
236+
wrapt==1.12.1
237+
# via
238+
# -r requirements/quality.txt
239+
# astroid
61240

62241
# The following packages are considered to be unsafe in a requirements file:
63242
# pip

0 commit comments

Comments
 (0)