From 6bc3e23dc10059f6d9e7feae48b28410f30d1913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Wed, 17 Jun 2020 12:11:54 +0200 Subject: [PATCH] Upgrade tutor requirements --- requirements/base.txt | 24 ++++++------- requirements/dev.txt | 78 ++++++++++++++++++++++--------------------- requirements/docs.txt | 58 ++++++++++++++++---------------- tutor/env.py | 4 ++- 4 files changed, 84 insertions(+), 80 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index aaff320..b16b99a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,30 +4,30 @@ # # pip-compile requirements/base.in # -appdirs==1.4.3 +appdirs==1.4.4 # via -r requirements/base.in cachetools==4.1.0 # via google-auth -certifi==2020.4.5.1 # via kubernetes, requests +certifi==2020.4.5.2 # via kubernetes, requests chardet==3.0.4 # via requests -click-repl==0.1.6 -click==7.1.1 -google-auth==1.14.1 # via kubernetes +click-repl==0.1.6 # via -r requirements/base.in +click==7.1.2 # via -r requirements/base.in, click-repl +google-auth==1.17.2 # via kubernetes idna==2.9 # via requests -jinja2==2.11.2 -kubernetes==11.0.0 +jinja2==2.11.2 # via -r requirements/base.in +kubernetes==11.0.0 # via -r requirements/base.in markupsafe==1.1.1 # via jinja2 oauthlib==3.1.0 # via requests-oauthlib prompt-toolkit==3.0.5 # via click-repl pyasn1-modules==0.2.8 # via google-auth pyasn1==0.4.8 # via pyasn1-modules, rsa -pycryptodome==3.9.7 +pycryptodome==3.9.7 # via -r requirements/base.in python-dateutil==2.8.1 # via kubernetes -pyyaml==5.3.1 +pyyaml==5.3.1 # via -r requirements/base.in, kubernetes requests-oauthlib==1.3.0 # via kubernetes requests==2.23.0 # via kubernetes, requests-oauthlib -rsa==4.0 # via google-auth -six==1.14.0 # via click-repl, google-auth, kubernetes, python-dateutil, websocket-client +rsa==4.6 # via google-auth +six==1.15.0 # via click-repl, google-auth, kubernetes, python-dateutil, websocket-client urllib3==1.25.9 # via kubernetes, requests -wcwidth==0.1.9 # via prompt-toolkit +wcwidth==0.2.4 # via prompt-toolkit websocket-client==0.57.0 # via kubernetes # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/dev.txt b/requirements/dev.txt index d4c79c2..43ceacb 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -5,61 +5,63 @@ # pip-compile requirements/dev.in # altgraph==0.17 # via pyinstaller -appdirs==1.4.3 -astroid==2.3.3 # via pylint +appdirs==1.4.4 # via -r requirements/base.txt, black +astroid==2.4.2 # via pylint attrs==19.3.0 # via black -black==19.10b0 -bleach==3.1.4 # via readme-renderer -cachetools==4.1.0 -certifi==2020.4.5.1 +black==19.10b0 # via -r requirements/dev.in +bleach==3.1.5 # via readme-renderer +cachetools==4.1.0 # via -r requirements/base.txt, google-auth +certifi==2020.4.5.2 # via -r requirements/base.txt, kubernetes, requests cffi==1.14.0 # via cryptography -chardet==3.0.4 -click-repl==0.1.6 -click==7.1.1 +chardet==3.0.4 # via -r requirements/base.txt, requests +click-repl==0.1.6 # via -r requirements/base.txt +click==7.1.2 # via -r requirements/base.txt, black, click-repl, pip-tools cryptography==2.9.2 # via secretstorage docutils==0.16 # via readme-renderer -google-auth==1.14.1 -idna==2.9 -importlib-metadata==1.6.0 # via keyring, twine +google-auth==1.17.2 # via -r requirements/base.txt, kubernetes +idna==2.9 # via -r requirements/base.txt, requests +importlib-metadata==1.6.1 # via keyring, twine isort==4.3.21 # via pylint jeepney==0.4.3 # via keyring, secretstorage -jinja2==2.11.2 -keyring==21.2.0 # via twine -kubernetes==11.0.0 +jinja2==2.11.2 # via -r requirements/base.txt +keyring==21.2.1 # via twine +kubernetes==11.0.0 # via -r requirements/base.txt lazy-object-proxy==1.4.3 # via astroid -markupsafe==1.1.1 +markupsafe==1.1.1 # via -r requirements/base.txt, jinja2 mccabe==0.6.1 # via pylint -oauthlib==3.1.0 +oauthlib==3.1.0 # via -r requirements/base.txt, requests-oauthlib +packaging==20.4 # via bleach pathspec==0.8.0 # via black -pip-tools==5.0.0 +pip-tools==5.2.1 # via -r requirements/dev.in pkginfo==1.5.0.1 # via twine -prompt-toolkit==3.0.5 -pyasn1-modules==0.2.8 -pyasn1==0.4.8 +prompt-toolkit==3.0.5 # via -r requirements/base.txt, click-repl +pyasn1-modules==0.2.8 # via -r requirements/base.txt, google-auth +pyasn1==0.4.8 # via -r requirements/base.txt, pyasn1-modules, rsa pycparser==2.20 # via cffi -pycryptodome==3.9.7 +pycryptodome==3.9.7 # via -r requirements/base.txt pygments==2.6.1 # via readme-renderer -pyinstaller==3.6 -pylint==2.4.4 -python-dateutil==2.8.1 -pyyaml==5.3.1 +pyinstaller==3.6 # via -r requirements/dev.in +pylint==2.5.3 # via -r requirements/dev.in +pyparsing==2.4.7 # via packaging +python-dateutil==2.8.1 # via -r requirements/base.txt, kubernetes +pyyaml==5.3.1 # via -r requirements/base.txt, kubernetes readme-renderer==26.0 # via twine -regex==2020.4.4 # via black -requests-oauthlib==1.3.0 +regex==2020.6.8 # via black +requests-oauthlib==1.3.0 # via -r requirements/base.txt, kubernetes requests-toolbelt==0.9.1 # via twine -requests==2.23.0 -rsa==4.0 +requests==2.23.0 # via -r requirements/base.txt, kubernetes, requests-oauthlib, requests-toolbelt, twine +rsa==4.6 # via -r requirements/base.txt, google-auth secretstorage==3.1.2 # via keyring -six==1.14.0 -toml==0.10.0 # via black -tqdm==4.45.0 # via twine -twine==3.1.1 +six==1.15.0 # via -r requirements/base.txt, astroid, bleach, click-repl, cryptography, google-auth, kubernetes, packaging, pip-tools, python-dateutil, readme-renderer, websocket-client +toml==0.10.1 # via black, pylint +tqdm==4.46.1 # via twine +twine==3.1.1 # via -r requirements/dev.in typed-ast==1.4.1 # via astroid, black -urllib3==1.25.9 -wcwidth==0.1.9 +urllib3==1.25.9 # via -r requirements/base.txt, kubernetes, requests +wcwidth==0.2.4 # via -r requirements/base.txt, prompt-toolkit webencodings==0.5.1 # via bleach -websocket-client==0.57.0 -wrapt==1.11.2 # via astroid +websocket-client==0.57.0 # via -r requirements/base.txt, kubernetes +wrapt==1.12.1 # via astroid zipp==3.1.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/docs.txt b/requirements/docs.txt index c3ceb52..3322176 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -5,47 +5,47 @@ # pip-compile requirements/docs.in # alabaster==0.7.12 # via sphinx -appdirs==1.4.3 +appdirs==1.4.4 # via -r requirements/base.txt babel==2.8.0 # via sphinx -cachetools==4.1.0 -certifi==2020.4.5.1 -chardet==3.0.4 -click-repl==0.1.6 -click==7.1.1 +cachetools==4.1.0 # via -r requirements/base.txt, google-auth +certifi==2020.4.5.2 # via -r requirements/base.txt, kubernetes, requests +chardet==3.0.4 # via -r requirements/base.txt, requests +click-repl==0.1.6 # via -r requirements/base.txt +click==7.1.2 # via -r requirements/base.txt, click-repl docutils==0.16 # via sphinx -google-auth==1.14.1 -idna==2.9 +google-auth==1.17.2 # via -r requirements/base.txt, kubernetes +idna==2.9 # via -r requirements/base.txt, requests imagesize==1.2.0 # via sphinx -jinja2==2.11.2 -kubernetes==11.0.0 -markupsafe==1.1.1 -oauthlib==3.1.0 -packaging==20.3 # via sphinx -prompt-toolkit==3.0.5 -pyasn1-modules==0.2.8 -pyasn1==0.4.8 -pycryptodome==3.9.7 +jinja2==2.11.2 # via -r requirements/base.txt, sphinx +kubernetes==11.0.0 # via -r requirements/base.txt +markupsafe==1.1.1 # via -r requirements/base.txt, jinja2 +oauthlib==3.1.0 # via -r requirements/base.txt, requests-oauthlib +packaging==20.4 # via sphinx +prompt-toolkit==3.0.5 # via -r requirements/base.txt, click-repl +pyasn1-modules==0.2.8 # via -r requirements/base.txt, google-auth +pyasn1==0.4.8 # via -r requirements/base.txt, pyasn1-modules, rsa +pycryptodome==3.9.7 # via -r requirements/base.txt pygments==2.6.1 # via sphinx pyparsing==2.4.7 # via packaging -python-dateutil==2.8.1 -pytz==2019.3 # via babel -pyyaml==5.3.1 -requests-oauthlib==1.3.0 -requests==2.23.0 -rsa==4.0 -six==1.14.0 +python-dateutil==2.8.1 # via -r requirements/base.txt, kubernetes +pytz==2020.1 # via babel +pyyaml==5.3.1 # via -r requirements/base.txt, kubernetes +requests-oauthlib==1.3.0 # via -r requirements/base.txt, kubernetes +requests==2.23.0 # via -r requirements/base.txt, kubernetes, requests-oauthlib, sphinx +rsa==4.6 # via -r requirements/base.txt, google-auth +six==1.15.0 # via -r requirements/base.txt, click-repl, google-auth, kubernetes, packaging, python-dateutil, websocket-client snowballstemmer==2.0.0 # via sphinx -sphinx-rtd-theme==0.4.3 -sphinx==3.0.3 +sphinx-rtd-theme==0.4.3 # via -r requirements/docs.in +sphinx==3.1.1 # via -r requirements/docs.in, sphinx-rtd-theme sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx sphinxcontrib-htmlhelp==1.0.3 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.4 # via sphinx -urllib3==1.25.9 -wcwidth==0.1.9 -websocket-client==0.57.0 +urllib3==1.25.9 # via -r requirements/base.txt, kubernetes, requests +wcwidth==0.2.4 # via -r requirements/base.txt, prompt-toolkit +websocket-client==0.57.0 # via -r requirements/base.txt, kubernetes # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/tutor/env.py b/tutor/env.py index b396116..88798e5 100644 --- a/tutor/env.py +++ b/tutor/env.py @@ -236,7 +236,9 @@ def render_file(config, *path): """ Return the rendered contents of a template. """ - return Renderer.instance(config).render_file(os.path.join(*path)) + renderer = Renderer.instance(config) + file_path = os.path.join(*path) + return renderer.render_file(file_path) def render_dict(config):