Skip to content

Commit

Permalink
Merge pull request #829 from edx/jenkins/upgrade-python-requirements-…
Browse files Browse the repository at this point in the history
…f89c1eb

Python Requirements Update
  • Loading branch information
MichaelRoytman authored Apr 14, 2021
2 parents eddca36 + 80e3ede commit 79b12f5
Show file tree
Hide file tree
Showing 10 changed files with 56 additions and 52 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Change Log
Unreleased
~~~~~~~~~~

[3.8.6] - 2021-04-13
~~~~~~~~~~~~~~~~~~~~
* Fix JWT encoding bug introduced by version 2.0.1 of pyjwt[crypto] library.
* Add RST validator

[3.8.5] - 2021-04-07
Expand Down
2 changes: 1 addition & 1 deletion edx_proctoring/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"""

# Be sure to update the version number in edx_proctoring/package.json
__version__ = '3.8.5'
__version__ = '3.8.6'

default_app_config = 'edx_proctoring.apps.EdxProctoringConfig' # pylint: disable=invalid-name
2 changes: 1 addition & 1 deletion edx_proctoring/backends/rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ def get_instructor_url(self, course_id, user, exam_id=None, attempt_id=None, sho
token['config'] = True
if attempt_id:
token['attempt_id'] = attempt_id
encoded = jwt.encode(token, self.client_secret).decode('utf-8')
encoded = jwt.encode(token, self.client_secret)
url = self.instructor_url.format(client_id=self.client_id, jwt=encoded)

log.debug(
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@edx/edx-proctoring",
"//": "Be sure to update the version number in edx_proctoring/__init__.py",
"//": "Note that the version format is slightly different than that of the Python version when using prereleases.",
"version": "3.8.5",
"version": "3.8.6",
"main": "edx_proctoring/static/index.js",
"scripts":{
"test":"gulp test"
Expand Down
18 changes: 9 additions & 9 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# make upgrade
#
amqp==5.0.5
amqp==5.0.6
# via kombu
appdirs==1.4.4
# via fs
billiard==3.6.3.0
billiard==3.6.4.0
# via celery
celery==5.0.4
# via
Expand All @@ -32,7 +32,7 @@ click==7.1.2
# click-didyoumean
# click-plugins
# click-repl
cryptography==3.4.6
cryptography==3.4.7
# via pyjwt
django-crum==0.7.9
# via
Expand All @@ -51,7 +51,7 @@ django-waffle==2.1.0
# edx-drf-extensions
django-webpack-loader==0.7.0
# via -r requirements/base.in
django==2.2.19
django==2.2.20
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
Expand All @@ -65,15 +65,15 @@ django==2.2.19
# event-tracking
# jsonfield2
# rest-condition
djangorestframework==3.12.2
djangorestframework==3.12.4
# via
# -r requirements/base.in
# drf-jwt
# edx-drf-extensions
# rest-condition
drf-jwt==1.18.0
drf-jwt==1.19.0
# via edx-drf-extensions
edx-django-utils==3.15.0
edx-django-utils==3.16.0
# via
# edx-drf-extensions
# edx-rest-api-client
Expand All @@ -93,7 +93,7 @@ edx-when==2.0.0
# via -r requirements/base.in
event-tracking==1.0.4
# via -r requirements/base.in
fs==2.4.12
fs==2.4.13
# via xblock
future==0.18.2
# via pyjwkest
Expand Down Expand Up @@ -125,7 +125,7 @@ pycryptodomex==3.10.1
# pyjwkest
pyjwkest==1.4.2
# via edx-drf-extensions
pyjwt[crypto]==1.7.1
pyjwt[crypto]==2.0.1
# via
# drf-jwt
# edx-rest-api-client
Expand Down
4 changes: 2 additions & 2 deletions requirements/celery50.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
amqp==5.0.5
billiard==3.6.3.0
amqp==5.0.6
billiard==3.6.4.0
celery==5.0.4
click-didyoumean==0.0.3
click-repl==0.1.6
Expand Down
20 changes: 10 additions & 10 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
appdirs==1.4.4
# via virtualenv
astroid==2.5.1
astroid==2.5.2
# via
# pylint
# pylint-celery
Expand All @@ -28,25 +28,25 @@ click==7.1.2
# code-annotations
# edx-lint
# pip-tools
code-annotations==1.1.0
code-annotations==1.1.1
# via edx-lint
colorama==0.4.4
# via twine
cryptography==3.4.6
cryptography==3.4.7
# via secretstorage
diff-cover==5.0.1
# via -r requirements/dev.in
distlib==0.3.1
# via virtualenv
django==2.2.19
django==2.2.20
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/dev.in
# -r requirements/quality.in
# code-annotations
# edx-i18n-tools
# edx-lint
docutils==0.16
docutils==0.17
# via readme-renderer
edx-i18n-tools==0.5.3
# via -r requirements/dev.in
Expand All @@ -60,7 +60,7 @@ filelock==3.0.12
# virtualenv
idna==2.10
# via requests
importlib-metadata==3.7.3
importlib-metadata==3.10.0
# via
# keyring
# twine
Expand All @@ -81,7 +81,7 @@ jinja2==2.11.3
# code-annotations
# diff-cover
# jinja2-pluralize
keyring==23.0.0
keyring==23.0.1
# via twine
lazy-object-proxy==1.6.0
# via astroid
Expand Down Expand Up @@ -111,7 +111,7 @@ pluggy==0.13.1
# via
# diff-cover
# tox
polib==1.1.0
polib==1.1.1
# via edx-i18n-tools
py==1.10.0
# via tox
Expand All @@ -133,7 +133,7 @@ pylint-plugin-utils==0.6
# via
# pylint-celery
# pylint-django
pylint==2.7.2
pylint==2.7.4
# via
# edx-lint
# pylint-celery
Expand Down Expand Up @@ -188,7 +188,7 @@ tox==3.23.0
# via
# -r requirements/dev.in
# tox-battery
tqdm==4.59.0
tqdm==4.60.0
# via twine
twine==3.4.1
# via
Expand Down
22 changes: 11 additions & 11 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#
alabaster==0.7.12
# via sphinx
amqp==5.0.5
amqp==5.0.6
# via kombu
appdirs==1.4.4
# via fs
babel==2.9.0
# via sphinx
billiard==3.6.3.0
billiard==3.6.4.0
# via celery
bleach==3.3.0
# via readme-renderer
Expand Down Expand Up @@ -40,7 +40,7 @@ click==7.1.2
# click-didyoumean
# click-plugins
# click-repl
cryptography==3.4.6
cryptography==3.4.7
# via pyjwt
django-crum==0.7.9
# via
Expand All @@ -59,7 +59,7 @@ django-waffle==2.1.0
# edx-drf-extensions
django-webpack-loader==0.7.0
# via -r requirements/base.in
django==2.2.19
django==2.2.20
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
Expand All @@ -73,23 +73,23 @@ django==2.2.19
# event-tracking
# jsonfield2
# rest-condition
djangorestframework==3.12.2
djangorestframework==3.12.4
# via
# -r requirements/base.in
# drf-jwt
# edx-drf-extensions
# rest-condition
doc8==0.8.1
# via -r requirements/doc.in
docutils==0.16
docutils==0.17
# via
# doc8
# readme-renderer
# restructuredtext-lint
# sphinx
drf-jwt==1.18.0
drf-jwt==1.19.0
# via edx-drf-extensions
edx-django-utils==3.15.0
edx-django-utils==3.16.0
# via
# edx-drf-extensions
# edx-rest-api-client
Expand All @@ -105,13 +105,13 @@ edx-opaque-keys==2.2.0
# edx-when
edx-rest-api-client==5.3.0
# via -r requirements/base.in
edx-sphinx-theme==2.0.0
edx-sphinx-theme==2.1.0
# via -r requirements/doc.in
edx-when==2.0.0
# via -r requirements/base.in
event-tracking==1.0.4
# via -r requirements/base.in
fs==2.4.12
fs==2.4.13
# via xblock
future==0.18.2
# via pyjwkest
Expand Down Expand Up @@ -160,7 +160,7 @@ pygments==2.8.1
# sphinx
pyjwkest==1.4.2
# via edx-drf-extensions
pyjwt[crypto]==1.7.1
pyjwt[crypto]==2.0.1
# via
# drf-jwt
# edx-rest-api-client
Expand Down
16 changes: 8 additions & 8 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --output-file=requirements/quality.txt requirements/quality.in
#
astroid==2.5.1
astroid==2.5.2
# via
# pylint
# pylint-celery
Expand All @@ -21,17 +21,17 @@ click==7.1.2
# click-log
# code-annotations
# edx-lint
code-annotations==1.1.0
code-annotations==1.1.1
# via edx-lint
colorama==0.4.4
# via twine
django==2.2.19
django==2.2.20
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/quality.in
# code-annotations
# edx-lint
docutils==0.16
docutils==0.17
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# readme-renderer
Expand All @@ -40,7 +40,7 @@ edx-lint==5.0.0
# via -r requirements/quality.in
idna==2.10
# via requests
importlib-metadata==3.7.3
importlib-metadata==3.10.0
# via
# keyring
# twine
Expand All @@ -50,7 +50,7 @@ isort==5.8.0
# pylint
jinja2==2.11.3
# via code-annotations
keyring==23.0.0
keyring==23.0.1
# via twine
lazy-object-proxy==1.6.0
# via astroid
Expand Down Expand Up @@ -78,7 +78,7 @@ pylint-plugin-utils==0.6
# via
# pylint-celery
# pylint-django
pylint==2.7.2
pylint==2.7.4
# via
# edx-lint
# pylint-celery
Expand Down Expand Up @@ -119,7 +119,7 @@ text-unidecode==1.3
# via python-slugify
toml==0.10.2
# via pylint
tqdm==4.59.0
tqdm==4.60.0
# via twine
twine==3.4.1
# via -r requirements/quality.in
Expand Down
Loading

0 comments on commit 79b12f5

Please sign in to comment.