Skip to content

Commit 30a6147

Browse files
authored
Merge pull request #219 from openedx/aht/BOM-3213-REMOVE-I18N-CONSTRAINT
Removed i18n pin and ran make upgrade
2 parents 582597a + 7baa868 commit 30a6147

20 files changed

Lines changed: 415 additions & 179 deletions

File tree

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with
4646
pip-compile --upgrade -o requirements/test.txt requirements/test.in
4747
pip-compile --upgrade -o requirements/tox.txt requirements/tox.in
4848
pip-compile --upgrade -o requirements/ci.txt requirements/ci.in
49+
pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
4950
# Let tox control the Django version version for tests
5051
grep -e "^django==" requirements/test.txt > requirements/django.txt
5152
sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp

lti_consumer/lti_1p3/extensions/rest_framework/authentication.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
Implements a custom authentication class to be used by LTI Advantage extensions.
55
"""
6-
from django.utils.translation import ugettext as _
6+
from django.utils.translation import gettext as _
77
from rest_framework import authentication
88
from rest_framework import exceptions
99

lti_consumer/lti_1p3/tests/test_deep_linking.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
Unit tests for LTI 1.3 consumer implementation
33
"""
44
from __future__ import absolute_import, unicode_literals
5+
from unittest.mock import patch
56

67
from django.test.testcases import TestCase
7-
from mock import patch
8-
98
from lti_consumer.lti_1p3.constants import LTI_DEEP_LINKING_ACCEPTED_TYPES
109
from lti_consumer.lti_1p3.deep_linking import LtiDeepLinking
1110
from lti_consumer.lti_1p3 import exceptions

lti_consumer/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
from django.db import models
77
from django.core.validators import MinValueValidator
88
from django.core.exceptions import ValidationError
9-
from django.utils.translation import ugettext_lazy as _
109

1110
from jsonfield import JSONField
1211
from Cryptodome.PublicKey import RSA
1312
from opaque_keys.edx.django.models import CourseKeyField, UsageKeyField
1413
from opaque_keys.edx.keys import CourseKey
1514
from config_models.models import ConfigurationModel
15+
from django.utils.translation import gettext_lazy as _
1616

1717
# LTI 1.1
1818
from lti_consumer.lti_1p1.consumer import LtiConsumer1p1

lti_consumer/plugin/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ def deep_linking_response_endpoint(request, lti_config_id=None):
213213
content_type = content_item.get('type')
214214

215215
# Retrieve serializer (or raise)
216+
# pylint: disable=consider-iterating-dictionary
216217
if content_type not in LTI_DL_CONTENT_TYPE_SERIALIZER_MAP.keys():
217218
raise LtiDeepLinkingContentTypeNotSupported()
218219
serializer_cls = LTI_DL_CONTENT_TYPE_SERIALIZER_MAP[content_type]

lti_consumer/tests/unit/plugin/test_views_lti_deep_linking.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
"""
22
Tests for LTI Advantage Assignments and Grades Service views.
33
"""
4-
import ddt
5-
from mock import patch, PropertyMock, Mock
4+
from unittest.mock import patch, PropertyMock, Mock
65

6+
import ddt
77
from Cryptodome.PublicKey import RSA
88
from jwkest.jwk import RSAKey
99
from rest_framework.test import APITransactionTestCase

lti_consumer/tests/unit/plugin/test_views_lti_nrps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
Tests for LTI Names and Role Provisioning Service views.
33
"""
4-
from mock import Mock, patch, PropertyMock
4+
from unittest.mock import Mock, patch, PropertyMock
55
from Cryptodome.PublicKey import RSA
66
from jwkest.jwk import RSAKey
77
from rest_framework.test import APITransactionTestCase

requirements/base.txt

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
#
77
appdirs==1.4.4
88
# via fs
9+
asgiref==3.4.1
10+
# via django
911
bleach==4.1.0
1012
# via -r requirements/base.in
1113
certifi==2021.10.8
1214
# via requests
13-
charset-normalizer==2.0.7
15+
charset-normalizer==2.0.10
1416
# via requests
15-
django==2.2.24
17+
django==3.2.11
1618
# via
1719
# -c requirements/common_constraints.txt
1820
# -r requirements/base.in
@@ -22,25 +24,25 @@ django==2.2.24
2224
# djangorestframework
2325
# edx-django-utils
2426
# jsonfield
25-
django-config-models==2.2.0
27+
django-config-models==2.2.2
2628
# via
2729
# -c requirements/constraints.txt
2830
# -r requirements/base.in
2931
django-crum==0.7.9
3032
# via edx-django-utils
3133
django-filter==21.1
3234
# via -r requirements/base.in
33-
django-waffle==2.2.1
35+
django-waffle==2.3.0
3436
# via edx-django-utils
35-
djangorestframework==3.12.4
37+
djangorestframework==3.13.1
3638
# via
3739
# -c requirements/constraints.txt
3840
# django-config-models
39-
edx-django-utils==4.4.0
41+
edx-django-utils==4.4.1
4042
# via django-config-models
4143
edx-opaque-keys[django]==2.2.2
4244
# via -r requirements/base.in
43-
fs==2.4.13
45+
fs==2.4.14
4446
# via xblock
4547
future==0.18.2
4648
# via pyjwkest
@@ -50,11 +52,11 @@ jsonfield==3.1.0
5052
# via -r requirements/base.in
5153
lazy==1.4
5254
# via -r requirements/base.in
53-
lxml==4.6.4
55+
lxml==4.7.1
5456
# via
5557
# -r requirements/base.in
5658
# xblock
57-
mako==1.1.5
59+
mako==1.1.6
5860
# via
5961
# -r requirements/base.in
6062
# xblock-utils
@@ -66,34 +68,35 @@ newrelic==7.2.4.171
6668
# via edx-django-utils
6769
oauthlib==3.1.1
6870
# via -r requirements/base.in
69-
packaging==21.2
71+
packaging==21.3
7072
# via bleach
71-
pbr==5.7.0
73+
pbr==5.8.0
7274
# via stevedore
73-
psutil==5.8.0
75+
psutil==5.9.0
7476
# via edx-django-utils
75-
pycryptodomex==3.11.0
77+
pycryptodomex==3.12.0
7678
# via
7779
# -r requirements/base.in
7880
# pyjwkest
7981
pyjwkest==1.4.2
8082
# via -r requirements/base.in
81-
pymongo==3.12.1
83+
pymongo==4.0.1
8284
# via edx-opaque-keys
83-
pyparsing==2.4.7
85+
pyparsing==3.0.6
8486
# via packaging
8587
python-dateutil==2.8.2
8688
# via xblock
8789
pytz==2021.3
8890
# via
8991
# django
92+
# djangorestframework
9093
# fs
9194
# xblock
9295
pyyaml==6.0
9396
# via xblock
94-
requests==2.26.0
97+
requests==2.27.1
9598
# via pyjwkest
96-
simplejson==3.17.5
99+
simplejson==3.17.6
97100
# via xblock-utils
98101
six==1.16.0
99102
# via
@@ -107,9 +110,9 @@ stevedore==3.5.0
107110
# via
108111
# edx-django-utils
109112
# edx-opaque-keys
110-
urllib3==1.26.7
113+
urllib3==1.26.8
111114
# via requests
112-
web-fragments==1.1.0
115+
web-fragments==2.0.0
113116
# via
114117
# xblock
115118
# xblock-utils

0 commit comments

Comments
 (0)