Skip to content

Commit 8611a28

Browse files
UsamaSadiqUsamaSadiq
authored
Merge pull request #64 from edx/usamasadiq/remove-django-requirement
remove django from base requirements
2 parents fd85c29 + 0103924 commit 8611a28

File tree

13 files changed

+73
-33
lines changed

13 files changed

+73
-33
lines changed

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
4343
# Make sure to compile files after any other files they include!
4444
pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
4545
pip-compile --upgrade -o requirements/base.txt requirements/base.in
46+
pip-compile --upgrade -o requirements/django.txt requirements/django.in
4647
pip-compile --upgrade -o requirements/test.txt requirements/test.in
4748
pip-compile --upgrade -o requirements/doc.txt requirements/doc.in
4849
pip-compile --upgrade -o requirements/quality.txt requirements/quality.in

‎requirements/base.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
-c constraints.txt
44

55
click>=7.0,<8.0
6-
Django # Web application framework
76
Jinja2
87
pyyaml
98
python-slugify

‎requirements/base.txt‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,23 @@
55
# make upgrade
66
#
77
click==7.1.2
8-
# via -r requirements/base.in
9-
django==2.2.22
108
# via
119
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
1210
# -r requirements/base.in
1311
jinja2==2.11.3
14-
# via -r requirements/base.in
12+
# via
13+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
14+
# -r requirements/base.in
1515
markupsafe==1.1.1
16-
# via jinja2
16+
# via
17+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
18+
# jinja2
1719
pbr==5.6.0
1820
# via stevedore
1921
python-slugify==5.0.2
2022
# via -r requirements/base.in
21-
pytz==2021.1
22-
# via django
2323
pyyaml==5.4.1
2424
# via -r requirements/base.in
25-
sqlparse==0.4.1
26-
# via django
2725
stevedore==3.3.0
2826
# via -r requirements/base.in
2927
text-unidecode==1.3

‎requirements/constraints.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@
1010

1111
# Common constraints for edx repos
1212
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
13-

‎requirements/dev.txt‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ click-log==0.3.2
3232
# edx-lint
3333
click==7.1.2
3434
# via
35+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
3536
# -r requirements/pip-tools.txt
3637
# -r requirements/quality.txt
3738
# click-log
@@ -44,19 +45,19 @@ code-annotations==1.1.1
4445
# edx-lint
4546
codecov==2.1.11
4647
# via -r requirements/travis.txt
47-
coverage==5.5
48+
coverage[toml]==5.5
4849
# via
4950
# -r requirements/quality.txt
5051
# -r requirements/travis.txt
5152
# codecov
5253
# pytest-cov
53-
diff-cover==5.1.0
54+
diff-cover==5.1.1
5455
# via -r requirements/dev.in
5556
distlib==0.3.1
5657
# via
5758
# -r requirements/travis.txt
5859
# virtualenv
59-
django==2.2.22
60+
django==2.2.23
6061
# via
6162
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
6263
# -r requirements/quality.txt
@@ -87,6 +88,7 @@ jinja2-pluralize==0.3.0
8788
# via diff-cover
8889
jinja2==2.11.3
8990
# via
91+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
9092
# -r requirements/quality.txt
9193
# code-annotations
9294
# diff-cover
@@ -97,6 +99,7 @@ lazy-object-proxy==1.6.0
9799
# astroid
98100
markupsafe==1.1.1
99101
# via
102+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
100103
# -r requirements/quality.txt
101104
# jinja2
102105
mccabe==0.6.1
@@ -136,7 +139,7 @@ py==1.10.0
136139
# tox
137140
pycodestyle==2.7.0
138141
# via -r requirements/quality.txt
139-
pydocstyle==6.0.0
142+
pydocstyle==6.1.1
140143
# via -r requirements/quality.txt
141144
pygments==2.9.0
142145
# via diff-cover
@@ -165,7 +168,7 @@ pyparsing==2.4.7
165168
# -r requirements/quality.txt
166169
# -r requirements/travis.txt
167170
# packaging
168-
pytest-cov==2.11.1
171+
pytest-cov==2.12.0
169172
# via -r requirements/quality.txt
170173
pytest==6.2.4
171174
# via
@@ -215,6 +218,7 @@ toml==0.10.2
215218
# -r requirements/pip-tools.txt
216219
# -r requirements/quality.txt
217220
# -r requirements/travis.txt
221+
# coverage
218222
# pep517
219223
# pylint
220224
# pytest

‎requirements/django.in‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Additional Django dependencies for running django based annotation checks.
2+
3+
-c constraints.txt
4+
5+
django # Required for django apps & models annotations

‎requirements/django.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#
2+
# This file is autogenerated by pip-compile
3+
# To update, run:
4+
#
5+
# make upgrade
6+
#
7+
django==2.2.23
8+
# via
9+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
10+
# -r requirements/django.in
11+
pytz==2021.1
12+
# via django
13+
sqlparse==0.4.1
14+
# via django

‎requirements/doc.txt‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ chardet==4.0.0
2121
# doc8
2222
# requests
2323
click==7.1.2
24-
# via -r requirements/test.txt
25-
coverage==5.5
24+
# via
25+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
26+
# -r requirements/test.txt
27+
coverage[toml]==5.5
2628
# via
2729
# -r requirements/test.txt
2830
# pytest-cov
29-
django==2.2.22
31+
django==2.2.23
3032
# via
3133
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
3234
# -r requirements/test.txt
@@ -51,10 +53,12 @@ iniconfig==1.1.1
5153
# pytest
5254
jinja2==2.11.3
5355
# via
56+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
5457
# -r requirements/test.txt
5558
# sphinx
5659
markupsafe==1.1.1
5760
# via
61+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
5862
# -r requirements/test.txt
5963
# jinja2
6064
# sphinx
@@ -87,7 +91,7 @@ pyparsing==2.4.7
8791
# via
8892
# -r requirements/test.txt
8993
# packaging
90-
pytest-cov==2.11.1
94+
pytest-cov==2.12.0
9195
# via -r requirements/test.txt
9296
pytest==6.2.4
9397
# via
@@ -116,7 +120,7 @@ six==1.16.0
116120
# readme-renderer
117121
snowballstemmer==2.1.0
118122
# via sphinx
119-
sphinx==4.0.0
123+
sphinx==4.0.1
120124
# via
121125
# -r requirements/doc.in
122126
# edx-sphinx-theme
@@ -147,6 +151,7 @@ text-unidecode==1.3
147151
toml==0.10.2
148152
# via
149153
# -r requirements/test.txt
154+
# coverage
150155
# pytest
151156
urllib3==1.26.4
152157
# via requests

‎requirements/pip-tools.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
# make upgrade
66
#
77
click==7.1.2
8-
# via pip-tools
8+
# via
9+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
10+
# pip-tools
911
pep517==0.10.0
1012
# via pip-tools
1113
pip-tools==6.1.0

‎requirements/quality.txt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@ click-log==0.3.2
1616
# via edx-lint
1717
click==7.1.2
1818
# via
19+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
1920
# -r requirements/test.txt
2021
# click-log
2122
# code-annotations
2223
# edx-lint
2324
code-annotations==1.1.1
2425
# via edx-lint
25-
coverage==5.5
26+
coverage[toml]==5.5
2627
# via
2728
# -r requirements/test.txt
2829
# pytest-cov
29-
django==2.2.22
30+
django==2.2.23
3031
# via
3132
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
3233
# -r requirements/test.txt
@@ -44,12 +45,14 @@ isort==5.8.0
4445
# pylint
4546
jinja2==2.11.3
4647
# via
48+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
4749
# -r requirements/test.txt
4850
# code-annotations
4951
lazy-object-proxy==1.6.0
5052
# via astroid
5153
markupsafe==1.1.1
5254
# via
55+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
5356
# -r requirements/test.txt
5457
# jinja2
5558
mccabe==0.6.1
@@ -74,7 +77,7 @@ py==1.10.0
7477
# pytest
7578
pycodestyle==2.7.0
7679
# via -r requirements/quality.in
77-
pydocstyle==6.0.0
80+
pydocstyle==6.1.1
7881
# via -r requirements/quality.in
7982
pylint-celery==0.3
8083
# via edx-lint
@@ -94,7 +97,7 @@ pyparsing==2.4.7
9497
# via
9598
# -r requirements/test.txt
9699
# packaging
97-
pytest-cov==2.11.1
100+
pytest-cov==2.12.0
98101
# via -r requirements/test.txt
99102
pytest==6.2.4
100103
# via
@@ -131,6 +134,7 @@ text-unidecode==1.3
131134
toml==0.10.2
132135
# via
133136
# -r requirements/test.txt
137+
# coverage
134138
# pylint
135139
# pytest
136140
wrapt==1.12.1

0 commit comments

Comments
 (0)