Skip to content

Commit bedd893

Browse files
authored
Merge pull request #3286 from learningequality/dependabot/pip/django-3.2.5
Bump django from 3.2.4 to 3.2.5
2 parents 0041400 + 85216e9 commit bedd893

File tree

3 files changed

+29
-44
lines changed

3 files changed

+29
-44
lines changed

requirements-dev.txt

Lines changed: 27 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,18 @@ coverage[toml]==5.5
7171
# pytest-cov
7272
git+https://github.com/someshchaturvedi/customizable-django-profiler.git#customizable-django-profiler
7373
# via -r requirements-dev.in
74-
dataclasses==0.8
75-
# via werkzeug
7674
decorator==5.0.9
7775
# via
7876
# ipython
7977
# traitlets
8078
distlib==0.3.1
8179
# via virtualenv
80+
django==3.2.5
81+
# via
82+
# -c requirements.txt
83+
# django-debug-toolbar
84+
# djangorestframework
85+
# drf-yasg
8286
django-concurrent-test-helper==0.7.0
8387
# via -r requirements-dev.in
8488
django-debug-panel==0.8.3
@@ -87,12 +91,6 @@ django-debug-toolbar==1.9.1
8791
# via
8892
# -r requirements-dev.in
8993
# django-debug-panel
90-
django==3.2.4
91-
# via
92-
# -c requirements.txt
93-
# django-debug-toolbar
94-
# djangorestframework
95-
# drf-yasg
9694
djangorestframework==3.12.4
9795
# via
9896
# -c requirements.txt
@@ -109,12 +107,12 @@ filelock==3.0.12
109107
# via virtualenv
110108
flake8==3.4.1
111109
# via -r requirements-dev.in
112-
flask-basicauth==0.2.0
113-
# via locust
114110
flask==1.1.2
115111
# via
116112
# flask-basicauth
117113
# locust
114+
flask-basicauth==0.2.0
115+
# via locust
118116
flower==0.9.4
119117
# via -r requirements-dev.in
120118
fonttools==4.24.0
@@ -138,16 +136,7 @@ idna==2.10
138136
importlib-metadata==1.7.0
139137
# via
140138
# -c requirements.txt
141-
# kombu
142-
# pep517
143-
# pluggy
144139
# pre-commit
145-
# pytest
146-
# virtualenv
147-
importlib-resources==5.2.0
148-
# via
149-
# pre-commit
150-
# virtualenv
151140
importmagic==0.1.7
152141
# via -r requirements-dev.in
153142
inflection==0.5.1
@@ -156,10 +145,10 @@ iniconfig==1.1.1
156145
# via pytest
157146
ipdb==0.13.7
158147
# via -r requirements-dev.in
159-
ipython-genutils==0.2.0
160-
# via traitlets
161148
ipython==7.16.1
162149
# via ipdb
150+
ipython-genutils==0.2.0
151+
# via traitlets
163152
isort==5.8.0
164153
# via
165154
# -r requirements-dev.in
@@ -191,6 +180,8 @@ locust==1.5.3
191180
# via -r requirements-dev.in
192181
markupsafe==2.0.1
193182
# via jinja2
183+
matplotlib-inline==0.1.3
184+
# via ipython
194185
mccabe==0.6.1
195186
# via
196187
# flake8
@@ -249,10 +240,10 @@ pyflakes==1.5.0
249240
# flake8
250241
pygments==2.9.0
251242
# via ipython
252-
pyinstrument-cext==0.2.4
253-
# via pyinstrument
254243
pyinstrument==3.4.2
255244
# via -r requirements-dev.in
245+
pyinstrument-cext==0.2.4
246+
# via pyinstrument
256247
pylint==2.8.2
257248
# via -r requirements-dev.in
258249
pyls-isort==0.2.2
@@ -265,6 +256,15 @@ pyparsing==2.4.7
265256
# via
266257
# -c requirements.txt
267258
# packaging
259+
pytest==6.2.4
260+
# via
261+
# -r requirements-dev.in
262+
# pytest-cov
263+
# pytest-django
264+
# pytest-logging
265+
# pytest-pythonpath
266+
# pytest-timeout
267+
# pytest-watch
268268
pytest-cov==2.12.0
269269
# via -r requirements-dev.in
270270
pytest-django==4.3.0
@@ -277,15 +277,6 @@ pytest-timeout==1.4.2
277277
# via -r requirements-dev.in
278278
pytest-watch==4.2.0
279279
# via -r requirements-dev.in
280-
pytest==6.2.4
281-
# via
282-
# -r requirements-dev.in
283-
# pytest-cov
284-
# pytest-django
285-
# pytest-logging
286-
# pytest-pythonpath
287-
# pytest-timeout
288-
# pytest-watch
289280
python-dateutil==2.8.1
290281
# via
291282
# -c requirements.txt
@@ -319,10 +310,10 @@ requests==2.25.1
319310
# locust
320311
rope==0.19.0
321312
# via -r requirements-dev.in
322-
ruamel.yaml.clib==0.2.2
323-
# via ruamel.yaml
324313
ruamel.yaml==0.17.4
325314
# via drf-yasg
315+
ruamel.yaml.clib==0.2.2
316+
# via ruamel.yaml
326317
service-factory==0.1.6
327318
# via -r requirements-dev.in
328319
six==1.16.0
@@ -357,13 +348,9 @@ toml==0.10.2
357348
tornado==6.1
358349
# via flower
359350
traitlets==4.3.3
360-
# via ipython
361-
typed-ast==1.4.3
362-
# via astroid
363-
typing-extensions==3.10.0.0
364351
# via
365-
# -c requirements.txt
366-
# asgiref
352+
# ipython
353+
# matplotlib-inline
367354
ujson==4.0.2
368355
# via
369356
# python-jsonrpc-server
@@ -407,8 +394,6 @@ zipp==3.4.1
407394
# via
408395
# -c requirements.txt
409396
# importlib-metadata
410-
# importlib-resources
411-
# pep517
412397
zope.event==4.5.0
413398
# via gevent
414399
zope.interface==5.4.0

requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pycountry==17.5.14
1717
pathlib
1818
progressbar2==3.38.0
1919
python-postmark==0.5.0
20-
Django==3.2.4
20+
Django==3.2.5
2121
django-webpack-loader==0.7.0
2222
google-cloud-error-reporting
2323
google-cloud-storage

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ chardet==4.0.0
3838
# via requests
3939
confusable-homoglyphs==3.2.0
4040
# via django-registration
41-
django==3.2.4
41+
django==3.2.5
4242
# via
4343
# -r requirements.in
4444
# django-bulk-update

0 commit comments

Comments
 (0)