Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit 5537147

Browse files
muhammad-ammarmuhammad-ammar
authored
Merge pull request #464 from edx/ammar/downgrade-edx-drf-extensions-to-6.4.0
fix: downgrade edx-drf-extensions to 6.4.0
2 parents dc05a80 + 4712100 commit 5537147

10 files changed

Lines changed: 55 additions & 47 deletions

File tree

‎requirements/base.txt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ asgiref==3.4.1
88
# via django
99
boto==2.42.0
1010
# via -r requirements/base.in
11-
boto3==1.18.6
11+
boto3==1.18.12
1212
# via -r requirements/base.in
13-
botocore==1.21.6
13+
botocore==1.21.12
1414
# via
1515
# boto3
1616
# s3transfer
@@ -20,7 +20,7 @@ certifi==2021.5.30
2020
# requests
2121
cffi==1.14.6
2222
# via cryptography
23-
charset-normalizer==2.0.3
23+
charset-normalizer==2.0.4
2424
# via requests
2525
coreapi==2.3.3
2626
# via
@@ -34,7 +34,7 @@ cryptography==3.4.7
3434
# via
3535
# django-fernet-fields
3636
# pyjwt
37-
django==3.2.5
37+
django==3.2.6
3838
# via
3939
# -r requirements/base.in
4040
# django-cors-headers
@@ -93,16 +93,17 @@ edx-api-doc-tools==1.4.3
9393
# via -r requirements/base.in
9494
edx-ccx-keys==1.2.1
9595
# via -r requirements/base.in
96-
edx-django-release-util==1.0.0
96+
edx-django-release-util==1.1.0
9797
# via -r requirements/base.in
9898
edx-django-utils==4.2.0
9999
# via
100100
# -r requirements/base.in
101101
# edx-drf-extensions
102102
# edx-enterprise-data
103103
# edx-rest-api-client
104-
edx-drf-extensions==6.6.0
104+
edx-drf-extensions==6.4.0
105105
# via
106+
# -c requirements/constraints.txt
106107
# -r requirements/base.in
107108
# edx-enterprise-data
108109
# edx-rbac
@@ -144,7 +145,7 @@ markdown==3.3.4
144145
# via -r requirements/base.in
145146
markupsafe==2.0.1
146147
# via jinja2
147-
newrelic==6.4.4.161
148+
newrelic==6.6.0.162
148149
# via edx-django-utils
149150
ordered-set==3.1.1
150151
# via
@@ -220,7 +221,7 @@ stevedore==3.3.0
220221
# via
221222
# edx-django-utils
222223
# edx-opaque-keys
223-
tqdm==4.61.2
224+
tqdm==4.62.0
224225
# via -r requirements/base.in
225226
unicodecsv==0.14.1
226227
# via djangorestframework-csv

‎requirements/constraints.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# link to other information that will help people in the future to remove the
88
# pin when possible. Writing an issue against the offending project and
99
# linking to it here is good.
10-
10+
1111
# TODO: Many pinned dependencies should be unpinned and/or moved to this constraints file.
1212

1313
# django-storages version 1.9 drops support for boto storage backend.
@@ -26,3 +26,6 @@ tox==3.14.6
2626
# Use same version of edx-lint
2727
pylint==2.4.4
2828
pylint-django==2.0.11
29+
30+
31+
edx-drf-extensions==6.4.0

‎requirements/dev.txt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ asgiref==3.4.1
88
# via django
99
boto==2.42.0
1010
# via -r requirements/base.in
11-
boto3==1.18.6
11+
boto3==1.18.12
1212
# via -r requirements/base.in
13-
botocore==1.21.6
13+
botocore==1.21.12
1414
# via
1515
# boto3
1616
# s3transfer
@@ -20,7 +20,7 @@ certifi==2021.5.30
2020
# requests
2121
cffi==1.14.6
2222
# via cryptography
23-
charset-normalizer==2.0.3
23+
charset-normalizer==2.0.4
2424
# via requests
2525
coreapi==2.3.3
2626
# via
@@ -34,7 +34,7 @@ cryptography==3.4.7
3434
# via
3535
# django-fernet-fields
3636
# pyjwt
37-
django==3.2.5
37+
django==3.2.6
3838
# via
3939
# -r requirements/base.in
4040
# django-cors-headers
@@ -93,16 +93,17 @@ edx-api-doc-tools==1.4.3
9393
# via -r requirements/base.in
9494
edx-ccx-keys==1.2.1
9595
# via -r requirements/base.in
96-
edx-django-release-util==1.0.0
96+
edx-django-release-util==1.1.0
9797
# via -r requirements/base.in
9898
edx-django-utils==4.2.0
9999
# via
100100
# -r requirements/base.in
101101
# edx-drf-extensions
102102
# edx-enterprise-data
103103
# edx-rest-api-client
104-
edx-drf-extensions==6.6.0
104+
edx-drf-extensions==6.4.0
105105
# via
106+
# -c requirements/constraints.txt
106107
# -r requirements/base.in
107108
# edx-enterprise-data
108109
# edx-rbac
@@ -144,7 +145,7 @@ markdown==3.3.4
144145
# via -r requirements/base.in
145146
markupsafe==2.0.1
146147
# via jinja2
147-
newrelic==6.4.4.161
148+
newrelic==6.6.0.162
148149
# via edx-django-utils
149150
ordered-set==3.1.1
150151
# via
@@ -220,7 +221,7 @@ stevedore==3.3.0
220221
# via
221222
# edx-django-utils
222223
# edx-opaque-keys
223-
tqdm==4.61.2
224+
tqdm==4.62.0
224225
# via -r requirements/base.in
225226
unicodecsv==0.14.1
226227
# via djangorestframework-csv

‎requirements/django.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
django==3.2.5
1+
django==3.2.6

‎requirements/doc.txt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ asgiref==3.4.1
88
# via django
99
boto==2.42.0
1010
# via -r requirements/base.in
11-
boto3==1.18.6
11+
boto3==1.18.12
1212
# via -r requirements/base.in
13-
botocore==1.21.6
13+
botocore==1.21.12
1414
# via
1515
# boto3
1616
# s3transfer
@@ -20,7 +20,7 @@ certifi==2021.5.30
2020
# requests
2121
cffi==1.14.6
2222
# via cryptography
23-
charset-normalizer==2.0.3
23+
charset-normalizer==2.0.4
2424
# via requests
2525
coreapi==2.3.3
2626
# via
@@ -34,7 +34,7 @@ cryptography==3.4.7
3434
# via
3535
# django-fernet-fields
3636
# pyjwt
37-
django==3.2.5
37+
django==3.2.6
3838
# via
3939
# -r requirements/base.in
4040
# django-cors-headers
@@ -95,16 +95,17 @@ edx-api-doc-tools==1.4.3
9595
# via -r requirements/base.in
9696
edx-ccx-keys==1.2.1
9797
# via -r requirements/base.in
98-
edx-django-release-util==1.0.0
98+
edx-django-release-util==1.1.0
9999
# via -r requirements/base.in
100100
edx-django-utils==4.2.0
101101
# via
102102
# -r requirements/base.in
103103
# edx-drf-extensions
104104
# edx-enterprise-data
105105
# edx-rest-api-client
106-
edx-drf-extensions==6.6.0
106+
edx-drf-extensions==6.4.0
107107
# via
108+
# -c requirements/constraints.txt
108109
# -r requirements/base.in
109110
# edx-enterprise-data
110111
# edx-rbac
@@ -148,7 +149,7 @@ markdown==3.3.4
148149
# via -r requirements/base.in
149150
markupsafe==2.0.1
150151
# via jinja2
151-
newrelic==6.4.4.161
152+
newrelic==6.6.0.162
152153
# via edx-django-utils
153154
ordered-set==3.1.1
154155
# via
@@ -228,7 +229,7 @@ stevedore==3.3.0
228229
# via
229230
# edx-django-utils
230231
# edx-opaque-keys
231-
tqdm==4.61.2
232+
tqdm==4.62.0
232233
# via -r requirements/base.in
233234
unicodecsv==0.14.1
234235
# via djangorestframework-csv

‎requirements/pip_tools.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pip-tools==6.2.0
1212
# via -r requirements/pip_tools.in
1313
six==1.16.0
1414
# via -r requirements/pip_tools.in
15-
tomli==1.1.0
15+
tomli==1.2.0
1616
# via pep517
1717
wheel==0.36.2
1818
# via pip-tools

‎requirements/production.txt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ asgiref==3.4.1
88
# via django
99
boto==2.42.0
1010
# via -r requirements/base.in
11-
boto3==1.18.6
11+
boto3==1.18.12
1212
# via -r requirements/base.in
13-
botocore==1.21.6
13+
botocore==1.21.12
1414
# via
1515
# boto3
1616
# s3transfer
@@ -20,7 +20,7 @@ certifi==2021.5.30
2020
# requests
2121
cffi==1.14.6
2222
# via cryptography
23-
charset-normalizer==2.0.3
23+
charset-normalizer==2.0.4
2424
# via requests
2525
coreapi==2.3.3
2626
# via
@@ -34,7 +34,7 @@ cryptography==3.4.7
3434
# via
3535
# django-fernet-fields
3636
# pyjwt
37-
django==3.2.5
37+
django==3.2.6
3838
# via
3939
# -r requirements/base.in
4040
# django-cors-headers
@@ -93,16 +93,17 @@ edx-api-doc-tools==1.4.3
9393
# via -r requirements/base.in
9494
edx-ccx-keys==1.2.1
9595
# via -r requirements/base.in
96-
edx-django-release-util==1.0.0
96+
edx-django-release-util==1.1.0
9797
# via -r requirements/base.in
9898
edx-django-utils==4.2.0
9999
# via
100100
# -r requirements/base.in
101101
# edx-drf-extensions
102102
# edx-enterprise-data
103103
# edx-rest-api-client
104-
edx-drf-extensions==6.6.0
104+
edx-drf-extensions==6.4.0
105105
# via
106+
# -c requirements/constraints.txt
106107
# -r requirements/base.in
107108
# edx-enterprise-data
108109
# edx-rbac
@@ -152,7 +153,7 @@ markupsafe==2.0.1
152153
# via jinja2
153154
mysqlclient==2.0.3
154155
# via -r requirements/production.in
155-
newrelic==6.4.4.161
156+
newrelic==6.6.0.162
156157
# via
157158
# -r requirements/production.in
158159
# edx-django-utils
@@ -234,7 +235,7 @@ stevedore==3.3.0
234235
# via
235236
# edx-django-utils
236237
# edx-opaque-keys
237-
tqdm==4.61.2
238+
tqdm==4.62.0
238239
# via -r requirements/base.in
239240
unicodecsv==0.14.1
240241
# via djangorestframework-csv

‎requirements/test.txt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ attrs==21.2.0
1212
# via pytest
1313
boto==2.42.0
1414
# via -r requirements/base.in
15-
boto3==1.18.6
15+
boto3==1.18.12
1616
# via -r requirements/base.in
17-
botocore==1.21.6
17+
botocore==1.21.12
1818
# via
1919
# boto3
2020
# s3transfer
@@ -26,7 +26,7 @@ cffi==1.14.6
2626
# via cryptography
2727
chardet==4.0.0
2828
# via diff-cover
29-
charset-normalizer==2.0.3
29+
charset-normalizer==2.0.4
3030
# via requests
3131
coreapi==2.3.3
3232
# via
@@ -46,7 +46,7 @@ cryptography==3.4.7
4646
# pyjwt
4747
ddt==1.4.2
4848
# via -r requirements/test.in
49-
diff-cover==6.2.0
49+
diff-cover==6.2.1
5050
# via -r requirements/test.in
5151
# via
5252
# -r requirements/base.in
@@ -108,16 +108,17 @@ edx-api-doc-tools==1.4.3
108108
# via -r requirements/base.in
109109
edx-ccx-keys==1.2.1
110110
# via -r requirements/base.in
111-
edx-django-release-util==1.0.0
111+
edx-django-release-util==1.1.0
112112
# via -r requirements/base.in
113113
edx-django-utils==4.2.0
114114
# via
115115
# -r requirements/base.in
116116
# edx-drf-extensions
117117
# edx-enterprise-data
118118
# edx-rest-api-client
119-
edx-drf-extensions==6.6.0
119+
edx-drf-extensions==6.4.0
120120
# via
121+
# -c requirements/constraints.txt
121122
# -r requirements/base.in
122123
# edx-enterprise-data
123124
# edx-rbac
@@ -174,7 +175,7 @@ markupsafe==2.0.1
174175
# via jinja2
175176
mccabe==0.6.1
176177
# via pylint
177-
newrelic==6.4.4.161
178+
newrelic==6.6.0.162
178179
# via edx-django-utils
179180
ordered-set==3.1.1
180181
# via
@@ -290,7 +291,7 @@ toml==0.10.2
290291
# via
291292
# pytest
292293
# pytest-cov
293-
tqdm==4.61.2
294+
tqdm==4.62.0
294295
# via -r requirements/base.in
295296
unicodecsv==0.14.1
296297
# via djangorestframework-csv

‎requirements/tox.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ filelock==3.0.12
1414
# virtualenv
1515
packaging==21.0
1616
# via tox
17-
platformdirs==2.1.0
17+
platformdirs==2.2.0
1818
# via virtualenv
1919
pluggy==0.13.1
2020
# via tox
@@ -35,5 +35,5 @@ tox==3.14.6
3535
# tox-battery
3636
tox-battery==0.6.1
3737
# via -r requirements/tox.in
38-
virtualenv==20.6.0
38+
virtualenv==20.7.0
3939
# via tox

‎requirements/travis.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#
77
certifi==2021.5.30
88
# via requests
9-
charset-normalizer==2.0.3
9+
charset-normalizer==2.0.4
1010
# via requests
11-
codecov==2.1.11
11+
codecov==2.1.12
1212
# via -r requirements/travis.in
1313
coverage==5.5
1414
# via codecov

0 commit comments

Comments
 (0)