Skip to content

Commit

Permalink
Merge branch 'master' into nightly
Browse files Browse the repository at this point in the history
  • Loading branch information
@regisb
regisb committed Feb 9, 2023
2 parents 928859c + bda4e0a commit d385c44
Show file tree
Hide file tree
Showing 10 changed files with 133 additions and 101 deletions.
1 change: 1 addition & 0 deletions changelog.d/20230209_092607_regis_sec_lti.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- [Security] Fix grading issue in LTI consumer XBlock. See [security advisory](https://github.com/openedx/xblock-lti-consumer/security/advisories/GHSA-7j9p-67mm-5g87). (by @regisb)
1 change: 1 addition & 0 deletions docs/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
.. |tutor_version| replace:: {about["__version__"]}
"""


# Custom directives
def youtube(
_name: Any,
Expand Down
29 changes: 18 additions & 11 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile requirements/base.in
#
appdirs==1.4.4
# via -r requirements/base.in
cachetools==5.2.0
cachetools==5.3.0
# via google-auth
certifi==2022.12.7
# via
# kubernetes
# requests
charset-normalizer==2.1.1
charset-normalizer==3.0.1
# via requests
click==8.1.3
# via -r requirements/base.in
google-auth==2.15.0
google-auth==2.16.0
# via kubernetes
idna==3.4
# via requests
importlib-metadata==6.0.0
# via click
jinja2==3.1.2
# via -r requirements/base.in
kubernetes==25.3.0
# via -r requirements/base.in
markupsafe==2.1.1
markupsafe==2.1.2
# via jinja2
mypy==0.991
mypy==1.0.0
# via -r requirements/base.in
mypy-extensions==0.4.3
mypy-extensions==1.0.0
# via mypy
oauthlib==3.2.2
# via requests-oauthlib
Expand All @@ -38,15 +40,15 @@ pyasn1==0.4.8
# rsa
pyasn1-modules==0.2.8
# via google-auth
pycryptodome==3.16.0
pycryptodome==3.17
# via -r requirements/base.in
python-dateutil==2.8.2
# via kubernetes
pyyaml==6.0
# via
# -r requirements/base.in
# kubernetes
requests==2.28.1
requests==2.28.2
# via
# kubernetes
# requests-oauthlib
Expand All @@ -61,16 +63,21 @@ six==1.16.0
# python-dateutil
tomli==2.0.1
# via mypy
typed-ast==1.5.4
# via mypy
typing-extensions==4.4.0
# via
# -r requirements/base.in
# importlib-metadata
# mypy
urllib3==1.26.13
urllib3==1.26.14
# via
# kubernetes
# requests
websocket-client==1.4.2
websocket-client==1.5.1
# via kubernetes
zipp==3.12.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
112 changes: 68 additions & 44 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile requirements/dev.in
#
altgraph==0.17.3
# via pyinstaller
appdirs==1.4.4
# via -r requirements/base.txt
astroid==2.12.13
astroid==2.14.1
# via pylint
attrs==22.1.0
attrs==22.2.0
# via scriv
black==22.10.0
black==23.1.0
# via -r requirements/dev.in
bleach==5.0.1
bleach==6.0.0
# via readme-renderer
build==0.9.0
build==0.10.0
# via pip-tools
cachetools==5.2.0
cachetools==5.3.0
# via
# -r requirements/base.txt
# google-auth
Expand All @@ -29,7 +29,7 @@ certifi==2022.12.7
# requests
cffi==1.15.1
# via cryptography
charset-normalizer==2.1.1
charset-normalizer==3.0.1
# via
# -r requirements/base.txt
# requests
Expand All @@ -42,19 +42,17 @@ click==8.1.3
# scriv
click-log==0.4.0
# via scriv
commonmark==0.9.1
# via rich
coverage==6.5.0
coverage==7.1.0
# via -r requirements/dev.in
cryptography==38.0.4
cryptography==39.0.1
# via secretstorage
dill==0.3.6
# via pylint
docutils==0.17.1
# via
# -r requirements/dev.in
# readme-renderer
google-auth==2.15.0
google-auth==2.16.0
# via
# -r requirements/base.txt
# kubernetes
Expand All @@ -64,9 +62,15 @@ idna==3.4
# requests
importlib-metadata==6.0.0
# via
# -r requirements/base.txt
# build
# click
# keyring
# pyinstaller
# twine
isort==5.10.1
importlib-resources==5.10.2
# via keyring
isort==5.11.5
# via pylint
jaraco-classes==3.2.3
# via keyring
Expand All @@ -78,23 +82,27 @@ jinja2==3.1.2
# via
# -r requirements/base.txt
# scriv
keyring==23.11.0
keyring==23.13.1
# via twine
kubernetes==25.3.0
# via -r requirements/base.txt
lazy-object-proxy==1.8.0
lazy-object-proxy==1.9.0
# via astroid
markupsafe==2.1.1
markdown-it-py==2.1.0
# via rich
markupsafe==2.1.2
# via
# -r requirements/base.txt
# jinja2
mccabe==0.7.0
# via pylint
mdurl==0.1.2
# via markdown-it-py
more-itertools==9.0.0
# via jaraco-classes
mypy==0.991
mypy==1.0.0
# via -r requirements/base.txt
mypy-extensions==0.4.3
mypy-extensions==1.0.0
# via
# -r requirements/base.txt
# black
Expand All @@ -103,17 +111,17 @@ oauthlib==3.2.2
# via
# -r requirements/base.txt
# requests-oauthlib
packaging==22.0
# via build
pathspec==0.10.2
packaging==23.0
# via
# black
# build
pathspec==0.11.0
# via black
pep517==0.13.0
# via build
pip-tools==6.11.0
pip-tools==6.12.2
# via -r requirements/dev.in
pkginfo==1.9.2
pkginfo==1.9.6
# via twine
platformdirs==2.6.0
platformdirs==3.0.0
# via
# black
# pylint
Expand All @@ -128,18 +136,20 @@ pyasn1-modules==0.2.8
# google-auth
pycparser==2.21
# via cffi
pycryptodome==3.16.0
pycryptodome==3.17
# via -r requirements/base.txt
pygments==2.13.0
pygments==2.14.0
# via
# readme-renderer
# rich
pyinstaller==5.7.0
# via -r requirements/dev.in
pyinstaller-hooks-contrib==2022.14
pyinstaller-hooks-contrib==2022.15
# via pyinstaller
pylint==2.15.8
pylint==2.16.1
# via -r requirements/dev.in
pyproject-hooks==1.0.0
# via build
python-dateutil==2.8.2
# via
# -r requirements/base.txt
Expand All @@ -150,7 +160,7 @@ pyyaml==6.0
# kubernetes
readme-renderer==37.3
# via twine
requests==2.28.1
requests==2.28.2
# via
# -r requirements/base.txt
# kubernetes
Expand All @@ -166,13 +176,13 @@ requests-toolbelt==0.10.1
# via twine
rfc3986==2.0.0
# via twine
rich==12.6.0
rich==13.3.1
# via twine
rsa==4.9
# via
# -r requirements/base.txt
# google-auth
scriv==1.1.0
scriv==1.2.0
# via -r requirements/dev.in
secretstorage==3.3.3
# via keyring
Expand All @@ -189,44 +199,58 @@ tomli==2.0.1
# black
# build
# mypy
# pep517
# pylint
# pyproject-hooks
tomlkit==0.11.6
# via pylint
twine==4.0.2
# via -r requirements/dev.in
types-docutils==0.19.1.1
# via -r requirements/dev.in
types-pyyaml==6.0.12.2
typed-ast==1.5.4
# via
# -r requirements/base.txt
# astroid
# black
# mypy
types-docutils==0.19.1.3
# via
# -r requirements/dev.in
# types-setuptools
types-pyyaml==6.0.12.4
# via -r requirements/dev.in
types-setuptools==65.6.0.2
types-setuptools==67.2.0.1
# via -r requirements/dev.in
typing-extensions==4.4.0
# via
# -r requirements/base.txt
# astroid
# black
# importlib-metadata
# markdown-it-py
# mypy
# platformdirs
# pylint
# rich
urllib3==1.26.13
urllib3==1.26.14
# via
# -r requirements/base.txt
# kubernetes
# requests
# twine
webencodings==0.5.1
# via bleach
websocket-client==1.4.2
websocket-client==1.5.1
# via
# -r requirements/base.txt
# kubernetes
wheel==0.38.4
# via pip-tools
wrapt==1.14.1
# via astroid
zipp==3.11.0
# via importlib-metadata
zipp==3.12.1
# via
# -r requirements/base.txt
# importlib-metadata
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
Loading

0 comments on commit d385c44

Please sign in to comment.