christianlight/tutor
7
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-06-10 01:32:21 +00:00
Code Issues Releases Activity

chore: upgrade requirements

Browse Source 
Cryptography in particular needs to be upgraded to 39.0.1:
https://github.com/overhangio/tutor/security/dependabot/7
https://github.com/overhangio/tutor/security/dependabot/8

Black upgrade caused minor spacing changes.
This commit is contained in:
Régis Behmo 2023-02-09 11:57:26 +01:00 committed by Régis Behmo
parent 9df3b18c31
commit 7b718f6e78
7 changed files with 78 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/conf.py
View File

@ -112,6 +112,7 @@ rst_prolog = f"""
.. |tutor_version| replace:: {about["__version__"]} .. |tutor_version| replace:: {about["__version__"]}
""" """
# Custom directives # Custom directives
def youtube( def youtube(
_name: Any, _name: Any,

18
requirements/base.txt
View File

@ -6,17 +6,17 @@
# #
appdirs==1.4.4 appdirs==1.4.4
# via -r requirements/base.in # via -r requirements/base.in
cachetools==5.2.0 cachetools==5.3.0
# via google-auth # via google-auth
certifi==2022.12.7 certifi==2022.12.7
# via # via
# kubernetes # kubernetes
# requests # requests
charset-normalizer==2.1.1 charset-normalizer==3.0.1
# via requests # via requests
click==8.1.3 click==8.1.3
# via -r requirements/base.in # via -r requirements/base.in
google-auth==2.15.0 google-auth==2.16.0
# via kubernetes # via kubernetes
idna==3.4 idna==3.4
# via requests # via requests
@ -24,11 +24,11 @@ jinja2==3.1.2
# via -r requirements/base.in # via -r requirements/base.in
kubernetes==25.3.0 kubernetes==25.3.0
# via -r requirements/base.in # via -r requirements/base.in
markupsafe==2.1.1 markupsafe==2.1.2
# via jinja2 # via jinja2
mypy==1.0.0 mypy==1.0.0
# via -r requirements/base.in # via -r requirements/base.in
mypy-extensions==0.4.3 mypy-extensions==1.0.0
# via mypy # via mypy
oauthlib==3.2.2 oauthlib==3.2.2
# via requests-oauthlib # via requests-oauthlib
@ -38,7 +38,7 @@ pyasn1==0.4.8
# rsa # rsa
pyasn1-modules==0.2.8 pyasn1-modules==0.2.8
# via google-auth # via google-auth
pycryptodome==3.16.0 pycryptodome==3.17
# via -r requirements/base.in # via -r requirements/base.in
python-dateutil==2.8.2 python-dateutil==2.8.2
# via kubernetes # via kubernetes
@ -46,7 +46,7 @@ pyyaml==6.0
# via # via
# -r requirements/base.in # -r requirements/base.in
# kubernetes # kubernetes
requests==2.28.1 requests==2.28.2
# via # via
# kubernetes # kubernetes
# requests-oauthlib # requests-oauthlib
@ -65,11 +65,11 @@ typing-extensions==4.4.0
# via # via
# -r requirements/base.in # -r requirements/base.in
# mypy # mypy
urllib3==1.26.13 urllib3==1.26.14
# via # via
# kubernetes # kubernetes
# requests # requests
websocket-client==1.4.2 websocket-client==1.5.1
# via kubernetes # via kubernetes
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:

87
requirements/dev.txt
View File

@ -8,17 +8,17 @@ altgraph==0.17.3
# via pyinstaller # via pyinstaller
appdirs==1.4.4 appdirs==1.4.4
# via -r requirements/base.txt # via -r requirements/base.txt
astroid==2.12.13 astroid==2.14.1
# via pylint # via pylint
attrs==22.1.0 attrs==22.2.0
# via scriv # via scriv
black==22.10.0 black==23.1.0
# via -r requirements/dev.in # via -r requirements/dev.in
bleach==5.0.1 bleach==6.0.0
# via readme-renderer # via readme-renderer
build==0.9.0 build==0.10.0
# via pip-tools # via pip-tools
cachetools==5.2.0 cachetools==5.3.0
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# google-auth # google-auth
@ -29,7 +29,7 @@ certifi==2022.12.7
# requests # requests
cffi==1.15.1 cffi==1.15.1
# via cryptography # via cryptography
charset-normalizer==2.1.1 charset-normalizer==3.0.1
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# requests # requests
@ -42,11 +42,9 @@ click==8.1.3
# scriv # scriv
click-log==0.4.0 click-log==0.4.0
# via scriv # via scriv
commonmark==0.9.1 coverage==7.1.0
# via rich
coverage==6.5.0
# via -r requirements/dev.in # via -r requirements/dev.in
cryptography==38.0.4 cryptography==39.0.1
# via secretstorage # via secretstorage
dill==0.3.6 dill==0.3.6
# via pylint # via pylint
@ -54,7 +52,7 @@ docutils==0.17.1
# via # via
# -r requirements/dev.in # -r requirements/dev.in
# readme-renderer # readme-renderer
google-auth==2.15.0 google-auth==2.16.0
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# kubernetes # kubernetes
@ -66,7 +64,7 @@ importlib-metadata==6.0.0
# via # via
# keyring # keyring
# twine # twine
isort==5.10.1 isort==5.12.0
# via pylint # via pylint
jaraco-classes==3.2.3 jaraco-classes==3.2.3
# via keyring # via keyring
@ -78,23 +76,27 @@ jinja2==3.1.2
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# scriv # scriv
keyring==23.11.0 keyring==23.13.1
# via twine # via twine
kubernetes==25.3.0 kubernetes==25.3.0
# via -r requirements/base.txt # via -r requirements/base.txt
lazy-object-proxy==1.8.0 lazy-object-proxy==1.9.0
# via astroid # via astroid
markupsafe==2.1.1 markdown-it-py==2.1.0
# via rich
markupsafe==2.1.2
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# jinja2 # jinja2
mccabe==0.7.0 mccabe==0.7.0
# via pylint # via pylint
mdurl==0.1.2
# via markdown-it-py
more-itertools==9.0.0 more-itertools==9.0.0
# via jaraco-classes # via jaraco-classes
mypy==1.0.0 mypy==1.0.0
# via -r requirements/base.txt # via -r requirements/base.txt
mypy-extensions==0.4.3 mypy-extensions==1.0.0
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# black # black
@ -103,17 +105,17 @@ oauthlib==3.2.2
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# requests-oauthlib # requests-oauthlib
packaging==22.0 packaging==23.0
# via build # via
pathspec==0.10.2 # black
# build
pathspec==0.11.0
# via black # via black
pep517==0.13.0 pip-tools==6.12.2
# via build
pip-tools==6.11.0
# via -r requirements/dev.in # via -r requirements/dev.in
pkginfo==1.9.2 pkginfo==1.9.6
# via twine # via twine
platformdirs==2.6.0 platformdirs==3.0.0
# via # via
# black # black
# pylint # pylint
@ -128,18 +130,20 @@ pyasn1-modules==0.2.8
# google-auth # google-auth
pycparser==2.21 pycparser==2.21
# via cffi # via cffi
pycryptodome==3.16.0 pycryptodome==3.17
# via -r requirements/base.txt # via -r requirements/base.txt
pygments==2.13.0 pygments==2.14.0
# via # via
# readme-renderer # readme-renderer
# rich # rich
pyinstaller==5.7.0 pyinstaller==5.7.0
# via -r requirements/dev.in # via -r requirements/dev.in
pyinstaller-hooks-contrib==2022.14 pyinstaller-hooks-contrib==2022.15
# via pyinstaller # via pyinstaller
pylint==2.15.8 pylint==2.16.1
# via -r requirements/dev.in # via -r requirements/dev.in
pyproject-hooks==1.0.0
# via build
python-dateutil==2.8.2 python-dateutil==2.8.2
# via # via
# -r requirements/base.txt # -r requirements/base.txt
@ -150,7 +154,7 @@ pyyaml==6.0
# kubernetes # kubernetes
readme-renderer==37.3 readme-renderer==37.3
# via twine # via twine
requests==2.28.1 requests==2.28.2
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# kubernetes # kubernetes
@ -166,13 +170,13 @@ requests-toolbelt==0.10.1
# via twine # via twine
rfc3986==2.0.0 rfc3986==2.0.0
# via twine # via twine
rich==12.6.0 rich==13.3.1
# via twine # via twine
rsa==4.9 rsa==4.9
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# google-auth # google-auth
scriv==1.1.0 scriv==1.2.0
# via -r requirements/dev.in # via -r requirements/dev.in
secretstorage==3.3.3 secretstorage==3.3.3
# via keyring # via keyring
@ -189,23 +193,26 @@ tomli==2.0.1
# black # black
# build # build
# mypy # mypy
# pep517
# pylint # pylint
# pyproject-hooks
tomlkit==0.11.6 tomlkit==0.11.6
# via pylint # via pylint
twine==4.0.2 twine==4.0.2
# via -r requirements/dev.in # via -r requirements/dev.in
types-docutils==0.19.1.1 types-docutils==0.19.1.3
# via
# -r requirements/dev.in
# types-setuptools
types-pyyaml==6.0.12.4
# via -r requirements/dev.in # via -r requirements/dev.in
types-pyyaml==6.0.12.2 types-setuptools==67.2.0.1
# via -r requirements/dev.in
types-setuptools==65.6.0.2
# via -r requirements/dev.in # via -r requirements/dev.in
typing-extensions==4.4.0 typing-extensions==4.4.0
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# astroid
# mypy # mypy
urllib3==1.26.13 urllib3==1.26.14
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# kubernetes # kubernetes
@ -213,7 +220,7 @@ urllib3==1.26.13
# twine # twine
webencodings==0.5.1 webencodings==0.5.1
# via bleach # via bleach
websocket-client==1.4.2 websocket-client==1.5.1
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# kubernetes # kubernetes
@ -221,7 +228,7 @@ wheel==0.38.4
# via pip-tools # via pip-tools
wrapt==1.14.1 wrapt==1.14.1
# via astroid # via astroid
zipp==3.11.0 zipp==3.12.1
# via importlib-metadata # via importlib-metadata
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:

38
requirements/docs.txt
View File

@ -4,13 +4,13 @@
# #
# pip-compile requirements/docs.in # pip-compile requirements/docs.in
# #
alabaster==0.7.12 alabaster==0.7.13
# via sphinx # via sphinx
appdirs==1.4.4 appdirs==1.4.4
# via -r requirements/base.txt # via -r requirements/base.txt
babel==2.11.0 babel==2.11.0
# via sphinx # via sphinx
cachetools==5.2.0 cachetools==5.3.0
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# google-auth # google-auth
@ -19,7 +19,7 @@ certifi==2022.12.7
# -r requirements/base.txt # -r requirements/base.txt
# kubernetes # kubernetes
# requests # requests
charset-normalizer==2.1.1 charset-normalizer==3.0.1
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# requests # requests
@ -27,12 +27,12 @@ click==8.1.3
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# sphinx-click # sphinx-click
docutils==0.17.1 docutils==0.18.1
# via # via
# sphinx # sphinx
# sphinx-click # sphinx-click
# sphinx-rtd-theme # sphinx-rtd-theme
google-auth==2.15.0 google-auth==2.16.0
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# kubernetes # kubernetes
@ -48,13 +48,13 @@ jinja2==3.1.2
# sphinx # sphinx
kubernetes==25.3.0 kubernetes==25.3.0
# via -r requirements/base.txt # via -r requirements/base.txt
markupsafe==2.1.1 markupsafe==2.1.2
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# jinja2 # jinja2
mypy==1.0.0 mypy==1.0.0
# via -r requirements/base.txt # via -r requirements/base.txt
mypy-extensions==0.4.3 mypy-extensions==1.0.0
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# mypy # mypy
@ -62,7 +62,7 @@ oauthlib==3.2.2
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# requests-oauthlib # requests-oauthlib
packaging==22.0 packaging==23.0
# via sphinx # via sphinx
pyasn1==0.4.8 pyasn1==0.4.8
# via # via
@ -73,21 +73,21 @@ pyasn1-modules==0.2.8
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# google-auth # google-auth
pycryptodome==3.16.0 pycryptodome==3.17
# via -r requirements/base.txt # via -r requirements/base.txt
pygments==2.13.0 pygments==2.14.0
# via sphinx # via sphinx
python-dateutil==2.8.2 python-dateutil==2.8.2
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# kubernetes # kubernetes
pytz==2022.6 pytz==2022.7.1
# via babel # via babel
pyyaml==6.0 pyyaml==6.0
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# kubernetes # kubernetes
requests==2.28.1 requests==2.28.2
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# kubernetes # kubernetes
@ -109,21 +109,23 @@ six==1.16.0
# python-dateutil # python-dateutil
snowballstemmer==2.2.0 snowballstemmer==2.2.0
# via sphinx # via sphinx
sphinx==5.3.0 sphinx==6.1.3
# via # via
# -r requirements/docs.in # -r requirements/docs.in
# sphinx-click # sphinx-click
# sphinx-rtd-theme # sphinx-rtd-theme
sphinx-click==4.4.0 sphinx-click==4.4.0
# via -r requirements/docs.in # via -r requirements/docs.in
sphinx-rtd-theme==1.1.1 sphinx-rtd-theme==1.2.0
# via -r requirements/docs.in # via -r requirements/docs.in
sphinxcontrib-applehelp==1.0.2 sphinxcontrib-applehelp==1.0.4
# via sphinx # via sphinx
sphinxcontrib-devhelp==1.0.2 sphinxcontrib-devhelp==1.0.2
# via sphinx # via sphinx
sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-htmlhelp==2.0.1
# via sphinx # via sphinx
sphinxcontrib-jquery==2.0.0
# via sphinx-rtd-theme
sphinxcontrib-jsmath==1.0.1 sphinxcontrib-jsmath==1.0.1
# via sphinx # via sphinx
sphinxcontrib-qthelp==1.0.3 sphinxcontrib-qthelp==1.0.3
@ -138,12 +140,12 @@ typing-extensions==4.4.0
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# mypy # mypy
urllib3==1.26.13 urllib3==1.26.14
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# kubernetes # kubernetes
# requests # requests
websocket-client==1.4.2 websocket-client==1.5.1
# via # via
# -r requirements/base.txt # -r requirements/base.txt
# kubernetes # kubernetes

1
tests/commands/test_compose.py
View File

@ -13,7 +13,6 @@ from tutor.commands.local import LocalContext
class ComposeTests(unittest.TestCase): class ComposeTests(unittest.TestCase):
maxDiff = None # Ensure we can see long diffs of YAML files. maxDiff = None # Ensure we can see long diffs of YAML files.
def test_mount_option_parsing(self) -> None: def test_mount_option_parsing(self) -> None:

1
tutor/commands/config.py
View File

@ -24,7 +24,6 @@ def config_command() -> None:
class ConfigKeyParamType(click.ParamType): class ConfigKeyParamType(click.ParamType):
name = "configkey" name = "configkey"
def shell_complete( def shell_complete(

2
tutor/core/hooks/filters.py
View File

@ -149,7 +149,6 @@ class Filter(t.Generic[T1, T2]):
for callback in self.callbacks: for callback in self.callbacks:
if callback.is_in_context(context): if callback.is_in_context(context):
try: try:
value = callback.apply( value = callback.apply(
value, value,
*args, *args,
@ -225,6 +224,7 @@ class Filter(t.Generic[T1, T2]):
my_filter.add_item("item1") my_filter.add_item("item1")
my_filter.add_item("item2") my_filter.add_item("item2")
""" """
# Unfortunately we have to type-ignore this line. If not, mypy complains with: # Unfortunately we have to type-ignore this line. If not, mypy complains with:
# #
# Argument 1 has incompatible type "Callable[[Arg(List[E], 'values'), **T2], List[E]]"; expected "Callable[[List[E], **T2], List[E]]" # Argument 1 has incompatible type "Callable[[Arg(List[E], 'values'), **T2], List[E]]"; expected "Callable[[List[E], **T2], List[E]]"