Skip to content

Commit 1e85e81

Browse files
author
M. Zulqarnain
authored
Merge pull request #94 from edx/bom-1953
BOM-1953 : Replace pycryptodome with pycryptodomex
2 parents a8c1c79 + a7af9fc commit 1e85e81

11 files changed

Lines changed: 26 additions & 29 deletions

File tree

‎lti_consumer/lti_1p3/key_handlers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import time
1010
import json
1111

12-
from Crypto.PublicKey import RSA
12+
from Cryptodome.PublicKey import RSA
1313
from jwkest import BadSyntax, WrongNumberOfParts, jwk
1414
from jwkest.jwk import RSAKey, load_jwks_from_url
1515
from jwkest.jws import JWS, NoSuitableSigningKeys

‎lti_consumer/lti_1p3/tests/test_consumer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from mock import patch
1111
from django.test.testcases import TestCase
1212

13-
from Crypto.PublicKey import RSA
13+
from Cryptodome.PublicKey import RSA
1414
from jwkest.jwk import load_jwks
1515
from jwkest.jws import JWS
1616

‎lti_consumer/lti_1p3/tests/test_key_handlers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from mock import patch
1010
from django.test.testcases import TestCase
1111

12-
from Crypto.PublicKey import RSA
12+
from Cryptodome.PublicKey import RSA
1313
from jwkest.jwk import RSAKey, load_jwks
1414
from jwkest.jws import JWS
1515

‎lti_consumer/lti_xblock.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
from django.utils import timezone
6262
from web_fragments.fragment import Fragment
6363

64-
from Crypto.PublicKey import RSA
64+
from Cryptodome.PublicKey import RSA
6565
from webob import Response
6666
from xblock.core import List, Scope, String, XBlock
6767
from xblock.fields import Boolean, Float, Integer

‎lti_consumer/tests/unit/test_lti_xblock.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import uuid
99

1010
import ddt
11-
from Crypto.PublicKey import RSA
11+
from Cryptodome.PublicKey import RSA
1212
from django.test.testcases import TestCase
1313
from django.utils import timezone
1414
from jwkest.jwk import RSAKey

‎requirements/base.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ mako
99
lazy
1010
XBlock
1111
xblock-utils
12+
pycryptodomex
1213
pyjwkest
13-
pycryptodome

‎requirements/base.txt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@ mako==1.1.3 # via -r requirements/base.in, xblock-utils
1818
markupsafe==1.1.1 # via mako, xblock
1919
oauthlib==3.1.0 # via -r requirements/base.in
2020
packaging==20.4 # via bleach
21-
pycryptodome==3.9.8 # via -r requirements/base.in
22-
pycryptodomex==3.9.8 # via pyjwkest
21+
pycryptodomex==3.9.8 # via -r requirements/base.in, pyjwkest
2322
pyjwkest==1.4.2 # via -r requirements/base.in
2423
pyparsing==2.4.7 # via packaging
2524
python-dateutil==2.8.1 # via xblock
2625
pytz==2020.1 # via django, fs, xblock
2726
pyyaml==5.3.1 # via xblock
2827
requests==2.24.0 # via pyjwkest
29-
simplejson==3.17.0 # via xblock-utils
28+
simplejson==3.17.2 # via xblock-utils
3029
six==1.15.0 # via bleach, fs, packaging, pyjwkest, python-dateutil, xblock
3130
sqlparse==0.3.1 # via django
32-
typing==3.7.4.1 # via fs
33-
urllib3==1.25.9 # via requests
31+
typing==3.7.4.3 # via fs
32+
urllib3==1.25.10 # via requests
3433
web-fragments==0.3.2 # via xblock, xblock-utils
3534
webencodings==0.5.1 # via bleach
3635
webob==1.8.6 # via xblock

‎requirements/test.txt‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
appdirs==1.4.4 # via -r requirements/base.txt, fs
88
astroid==2.3.3 # via pylint, pylint-celery
99
bleach==3.1.5 # via -r requirements/base.txt
10-
boto3==1.14.20 # via fs-s3fs
11-
botocore==1.17.20 # via boto3, s3transfer
10+
boto3==1.14.27 # via fs-s3fs
11+
botocore==1.17.27 # via boto3, s3transfer
1212
certifi==2020.6.20 # via -r requirements/base.txt, requests
1313
chardet==3.0.4 # via -r requirements/base.txt, requests
1414
click-log==0.3.2 # via edx-lint
@@ -36,7 +36,6 @@ mock==3.0.5 # via -c requirements/constraints.txt, -r requirements
3636
oauthlib==3.1.0 # via -r requirements/base.txt
3737
packaging==20.4 # via -r requirements/base.txt, bleach
3838
pep8==1.7.1 # via -r requirements/test.in
39-
pycryptodome==3.9.8 # via -r requirements/base.txt
4039
pycryptodomex==3.9.8 # via -r requirements/base.txt, pyjwkest
4140
pyjwkest==1.4.2 # via -r requirements/base.txt
4241
pylint-celery==0.3 # via edx-lint
@@ -49,12 +48,12 @@ pytz==2020.1 # via -r requirements/base.txt, django, fs, xblock
4948
pyyaml==5.3.1 # via -r requirements/base.txt, xblock
5049
requests==2.24.0 # via -r requirements/base.txt, coveralls, pyjwkest
5150
s3transfer==0.3.3 # via boto3
52-
simplejson==3.17.0 # via -r requirements/base.txt, xblock-utils
51+
simplejson==3.17.2 # via -r requirements/base.txt, xblock-utils
5352
six==1.15.0 # via -r requirements/base.txt, astroid, bleach, edx-lint, fs, fs-s3fs, mock, packaging, pyjwkest, python-dateutil, xblock
5453
sqlparse==0.3.1 # via -r requirements/base.txt, django
5554
typed-ast==1.4.1 # via astroid
56-
typing==3.7.4.1 # via -r requirements/base.txt, fs
57-
urllib3==1.25.9 # via -r requirements/base.txt, botocore, requests
55+
typing==3.7.4.3 # via -r requirements/base.txt, fs
56+
urllib3==1.25.10 # via -r requirements/base.txt, botocore, requests
5857
web-fragments==0.3.2 # via -r requirements/base.txt, xblock, xblock-utils
5958
webencodings==0.5.1 # via -r requirements/base.txt, bleach
6059
webob==1.8.6 # via -r requirements/base.txt, xblock

‎requirements/tox.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ py==1.9.0 # via tox
1515
pyparsing==2.4.7 # via packaging
1616
six==1.15.0 # via packaging, tox, virtualenv
1717
toml==0.10.1 # via tox
18-
tox==3.16.1 # via -r requirements/tox.in
19-
virtualenv==20.0.26 # via tox
18+
tox==3.18.0 # via -r requirements/tox.in
19+
virtualenv==20.0.28 # via tox
2020
zipp==1.1.1 # via -c requirements/constraints.txt, importlib-metadata, importlib-resources

‎requirements/travis.txt‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
appdirs==1.4.4 # via -r requirements/test.txt, -r requirements/tox.txt, fs, virtualenv
88
astroid==2.3.3 # via -r requirements/test.txt, pylint, pylint-celery
99
bleach==3.1.5 # via -r requirements/test.txt
10-
boto3==1.14.20 # via -r requirements/test.txt, fs-s3fs
11-
botocore==1.17.20 # via -r requirements/test.txt, boto3, s3transfer
10+
boto3==1.14.27 # via -r requirements/test.txt, fs-s3fs
11+
botocore==1.17.27 # via -r requirements/test.txt, boto3, s3transfer
1212
certifi==2020.6.20 # via -r requirements/test.txt, requests
1313
chardet==3.0.4 # via -r requirements/test.txt, requests
1414
click-log==0.3.2 # via -r requirements/test.txt, edx-lint
@@ -43,7 +43,6 @@ packaging==20.4 # via -r requirements/test.txt, -r requirements/tox.tx
4343
pep8==1.7.1 # via -r requirements/test.txt
4444
pluggy==0.13.1 # via -r requirements/tox.txt, tox
4545
py==1.9.0 # via -r requirements/tox.txt, tox
46-
pycryptodome==3.9.8 # via -r requirements/test.txt
4746
pycryptodomex==3.9.8 # via -r requirements/test.txt, pyjwkest
4847
pyjwkest==1.4.2 # via -r requirements/test.txt
4948
pylint-celery==0.3 # via -r requirements/test.txt, edx-lint
@@ -56,15 +55,15 @@ pytz==2020.1 # via -r requirements/test.txt, django, fs, xblock
5655
pyyaml==5.3.1 # via -r requirements/test.txt, xblock
5756
requests==2.24.0 # via -r requirements/test.txt, coveralls, pyjwkest
5857
s3transfer==0.3.3 # via -r requirements/test.txt, boto3
59-
simplejson==3.17.0 # via -r requirements/test.txt, xblock-utils
60-
six==1.15.0 # via -r requirements/test.txt, -r requirements/tox.txt, -r requirements/travis.in, astroid, bleach, edx-lint, fs, fs-s3fs, mock, packaging, pyjwkest, python-dateutil, tox, virtualenv, xblock
58+
simplejson==3.17.2 # via -r requirements/test.txt, xblock-utils
59+
six==1.15.0 # via -r requirements/test.txt, -r requirements/tox.txt, astroid, bleach, edx-lint, fs, fs-s3fs, mock, packaging, pyjwkest, python-dateutil, tox, virtualenv, xblock
6160
sqlparse==0.3.1 # via -r requirements/test.txt, django
6261
toml==0.10.1 # via -r requirements/tox.txt, tox
63-
tox==3.16.1 # via -r requirements/tox.txt
62+
tox==3.18.0 # via -r requirements/tox.txt
6463
typed-ast==1.4.1 # via -r requirements/test.txt, astroid
65-
typing==3.7.4.1 # via -r requirements/test.txt, fs
66-
urllib3==1.25.9 # via -r requirements/test.txt, botocore, requests
67-
virtualenv==20.0.26 # via -r requirements/tox.txt, tox
64+
typing==3.7.4.3 # via -r requirements/test.txt, fs
65+
urllib3==1.25.10 # via -r requirements/test.txt, botocore, requests
66+
virtualenv==20.0.28 # via -r requirements/tox.txt, tox
6867
web-fragments==0.3.2 # via -r requirements/test.txt, xblock, xblock-utils
6968
webencodings==0.5.1 # via -r requirements/test.txt, bleach
7069
webob==1.8.6 # via -r requirements/test.txt, xblock

0 commit comments

Comments
 (0)