Upgrade requirements

In particular, this upgrades the bleach package. See: https://github.com/overhangio/tutor/pull/399
2025-01-25 22:18:24 +00:00 · 2021-02-04 09:31:48 +01:00 · 2021-02-04 09:31:48 +01:00 · 25e838856d
commit 25e838856d
parent dca4eb6a32
3 changed files with 389 additions and 130 deletions
--- a/requirements/base.txt
+++ b/requirements/base.txt
@ -4,31 +4,74 @@
 #
 #    pip-compile requirements/base.in
 #
-appdirs==1.4.4            # via -r requirements/base.in
-cachetools==4.1.1         # via google-auth
-certifi==2020.11.8        # via kubernetes, requests
-chardet==3.0.4            # via requests
-click-repl==0.1.6         # via -r requirements/base.in
-click==7.1.2              # via -r requirements/base.in, click-repl
-google-auth==1.23.0       # via kubernetes
-idna==2.10                # via requests
-jinja2==2.11.2            # via -r requirements/base.in
-kubernetes==12.0.0        # via -r requirements/base.in
-markupsafe==1.1.1         # via jinja2
-oauthlib==3.1.0           # via requests-oauthlib
-prompt-toolkit==3.0.8     # via click-repl
-pyasn1-modules==0.2.8     # via google-auth
-pyasn1==0.4.8             # via pyasn1-modules, rsa
-pycryptodome==3.9.9       # via -r requirements/base.in
-python-dateutil==2.8.1    # via kubernetes
-pyyaml==5.3.1             # via -r requirements/base.in, kubernetes
-requests-oauthlib==1.3.0  # via kubernetes
-requests==2.24.0          # via kubernetes, requests-oauthlib
-rsa==4.6                  # via google-auth
-six==1.15.0               # via click-repl, google-auth, kubernetes, python-dateutil, websocket-client
-urllib3==1.25.11          # via -r requirements/base.in, kubernetes, requests
-wcwidth==0.2.5            # via prompt-toolkit
-websocket-client==0.57.0  # via kubernetes
+appdirs==1.4.4
+    # via -r requirements/base.in
+cachetools==4.2.1
+    # via google-auth
+certifi==2020.12.5
+    # via
+    #   kubernetes
+    #   requests
+chardet==4.0.0
+    # via requests
+click-repl==0.1.6
+    # via -r requirements/base.in
+click==7.1.2
+    # via
+    #   -r requirements/base.in
+    #   click-repl
+google-auth==1.25.0
+    # via kubernetes
+idna==2.10
+    # via requests
+jinja2==2.11.3
+    # via -r requirements/base.in
+kubernetes==12.0.1
+    # via -r requirements/base.in
+markupsafe==1.1.1
+    # via jinja2
+oauthlib==3.1.0
+    # via requests-oauthlib
+prompt-toolkit==3.0.14
+    # via click-repl
+pyasn1-modules==0.2.8
+    # via google-auth
+pyasn1==0.4.8
+    # via
+    #   pyasn1-modules
+    #   rsa
+pycryptodome==3.9.9
+    # via -r requirements/base.in
+python-dateutil==2.8.1
+    # via kubernetes
+pyyaml==5.4.1
+    # via
+    #   -r requirements/base.in
+    #   kubernetes
+requests-oauthlib==1.3.0
+    # via kubernetes
+requests==2.25.1
+    # via
+    #   kubernetes
+    #   requests-oauthlib
+rsa==4.7
+    # via google-auth
+six==1.15.0
+    # via
+    #   click-repl
+    #   google-auth
+    #   kubernetes
+    #   python-dateutil
+    #   websocket-client
+urllib3==1.25.11
+    # via
+    #   -r requirements/base.in
+    #   kubernetes
+    #   requests
+wcwidth==0.2.5
+    # via prompt-toolkit
+websocket-client==0.57.0
+    # via kubernetes

 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@ -4,69 +4,190 @@
 #
 #    pip-compile requirements/dev.in
 #
-altgraph==0.17            # via pyinstaller
-appdirs==1.4.4            # via -r requirements/base.txt, black
-astroid==2.4.2            # via pylint
-black==20.8b1             # via -r requirements/dev.in
-bleach==3.2.1             # via readme-renderer
-cachetools==4.1.1         # via -r requirements/base.txt, google-auth
-certifi==2020.11.8        # via -r requirements/base.txt, kubernetes, requests
-cffi==1.14.3              # via cryptography
-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
-colorama==0.4.4           # via twine
-cryptography==3.2.1       # via secretstorage
-docutils==0.16            # via readme-renderer
-google-auth==1.23.0       # via -r requirements/base.txt, kubernetes
-idna==2.10                # via -r requirements/base.txt, requests
-importlib-metadata==2.0.0  # via keyring, twine
-isort==5.6.4              # via pylint
-jeepney==0.5.0            # via keyring, secretstorage
-jinja2==2.11.2            # via -r requirements/base.txt
-keyring==21.5.0           # via twine
-kubernetes==12.0.0        # via -r requirements/base.txt
-lazy-object-proxy==1.4.3  # via astroid
-markupsafe==1.1.1         # via -r requirements/base.txt, jinja2
-mccabe==0.6.1             # via pylint
-mypy-extensions==0.4.3    # via black
-oauthlib==3.1.0           # via -r requirements/base.txt, requests-oauthlib
-packaging==20.4           # via bleach
-pathspec==0.8.1           # via black
-pip-tools==5.3.1          # via -r requirements/dev.in
-pkginfo==1.6.1            # via twine
-prompt-toolkit==3.0.8     # 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.9       # via -r requirements/base.txt
-pygments==2.7.2           # via readme-renderer
-pyinstaller-hooks-contrib==2020.10  # via pyinstaller
-pyinstaller==4.0          # via -r requirements/dev.in
-pylint==2.6.0             # 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==28.0     # via twine
-regex==2020.10.28         # via black
-requests-oauthlib==1.3.0  # via -r requirements/base.txt, kubernetes
-requests-toolbelt==0.9.1  # via twine
-requests==2.24.0          # via -r requirements/base.txt, kubernetes, requests-oauthlib, requests-toolbelt, twine
-rfc3986==1.4.0            # via twine
-rsa==4.6                  # via -r requirements/base.txt, google-auth
-secretstorage==3.2.0      # via keyring
-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.2              # via black, pylint
-tqdm==4.51.0              # via twine
-twine==3.2.0              # via -r requirements/dev.in
-typed-ast==1.4.1          # via astroid, black
-typing-extensions==3.7.4.3  # via black
-urllib3==1.25.11          # via -r requirements/base.txt, kubernetes, requests
-wcwidth==0.2.5            # via -r requirements/base.txt, prompt-toolkit
-webencodings==0.5.1       # via bleach
-websocket-client==0.57.0  # via -r requirements/base.txt, kubernetes
-wrapt==1.12.1             # via astroid
-zipp==3.4.0               # via importlib-metadata
+altgraph==0.17
+    # via pyinstaller
+appdirs==1.4.4
+    # via
+    #   -r requirements/base.txt
+    #   black
+astroid==2.4.2
+    # via pylint
+black==20.8b1
+    # via -r requirements/dev.in
+bleach==3.3.0
+    # via readme-renderer
+cachetools==4.2.1
+    # via
+    #   -r requirements/base.txt
+    #   google-auth
+certifi==2020.12.5
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+    #   requests
+cffi==1.14.4
+    # via cryptography
+chardet==4.0.0
+    # 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
+colorama==0.4.4
+    # via twine
+cryptography==3.3.1
+    # via secretstorage
+docutils==0.16
+    # via readme-renderer
+google-auth==1.25.0
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+idna==2.10
+    # via
+    #   -r requirements/base.txt
+    #   requests
+isort==5.7.0
+    # via pylint
+jeepney==0.6.0
+    # via
+    #   keyring
+    #   secretstorage
+jinja2==2.11.3
+    # via -r requirements/base.txt
+keyring==22.0.1
+    # via twine
+kubernetes==12.0.1
+    # via -r requirements/base.txt
+lazy-object-proxy==1.4.3
+    # via astroid
+markupsafe==1.1.1
+    # via
+    #   -r requirements/base.txt
+    #   jinja2
+mccabe==0.6.1
+    # via pylint
+mypy-extensions==0.4.3
+    # via black
+oauthlib==3.1.0
+    # via
+    #   -r requirements/base.txt
+    #   requests-oauthlib
+packaging==20.9
+    # via bleach
+pathspec==0.8.1
+    # via black
+pip-tools==5.5.0
+    # via -r requirements/dev.in
+pkginfo==1.7.0
+    # via twine
+prompt-toolkit==3.0.14
+    # 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.9
+    # via -r requirements/base.txt
+pygments==2.7.4
+    # via readme-renderer
+pyinstaller-hooks-contrib==2020.11
+    # via pyinstaller
+pyinstaller==4.2
+    # via -r requirements/dev.in
+pylint==2.6.0
+    # via -r requirements/dev.in
+pyparsing==2.4.7
+    # via packaging
+python-dateutil==2.8.1
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+pyyaml==5.4.1
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+readme-renderer==28.0
+    # via twine
+regex==2020.11.13
+    # via black
+requests-oauthlib==1.3.0
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+requests-toolbelt==0.9.1
+    # via twine
+requests==2.25.1
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+    #   requests-oauthlib
+    #   requests-toolbelt
+    #   twine
+rfc3986==1.4.0
+    # via twine
+rsa==4.7
+    # via
+    #   -r requirements/base.txt
+    #   google-auth
+secretstorage==3.3.0
+    # via keyring
+six==1.15.0
+    # via
+    #   -r requirements/base.txt
+    #   astroid
+    #   bleach
+    #   click-repl
+    #   cryptography
+    #   google-auth
+    #   kubernetes
+    #   python-dateutil
+    #   readme-renderer
+    #   websocket-client
+toml==0.10.2
+    # via
+    #   black
+    #   pylint
+tqdm==4.56.0
+    # via twine
+twine==3.3.0
+    # via -r requirements/dev.in
+typed-ast==1.4.2
+    # via black
+typing-extensions==3.7.4.3
+    # via black
+urllib3==1.25.11
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+    #   requests
+wcwidth==0.2.5
+    # via
+    #   -r requirements/base.txt
+    #   prompt-toolkit
+webencodings==0.5.1
+    # via bleach
+websocket-client==0.57.0
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+wrapt==1.12.1
+    # via astroid

 # The following packages are considered to be unsafe in a requirements file:
 # pip
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@ -4,48 +4,143 @@
 #
 #    pip-compile requirements/docs.in
 #
-alabaster==0.7.12         # via sphinx
-appdirs==1.4.4            # via -r requirements/base.txt
-babel==2.8.0              # via sphinx
-cachetools==4.1.1         # via -r requirements/base.txt, google-auth
-certifi==2020.11.8        # 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.23.0       # via -r requirements/base.txt, kubernetes
-idna==2.10                # via -r requirements/base.txt, requests
-imagesize==1.2.0          # via sphinx
-jinja2==2.11.2            # via -r requirements/base.txt, sphinx
-kubernetes==12.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.8     # 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.9       # via -r requirements/base.txt
-pygments==2.7.2           # via sphinx
-pyparsing==2.4.7          # via packaging
-python-dateutil==2.8.1    # via -r requirements/base.txt, kubernetes
-pytz==2020.4              # 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.24.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.5.0   # via -r requirements/docs.in
-sphinx==3.3.0             # 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.11          # via -r requirements/base.txt, kubernetes, requests
-wcwidth==0.2.5            # via -r requirements/base.txt, prompt-toolkit
-websocket-client==0.57.0  # via -r requirements/base.txt, kubernetes
+alabaster==0.7.12
+    # via sphinx
+appdirs==1.4.4
+    # via -r requirements/base.txt
+babel==2.9.0
+    # via sphinx
+cachetools==4.2.1
+    # via
+    #   -r requirements/base.txt
+    #   google-auth
+certifi==2020.12.5
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+    #   requests
+chardet==4.0.0
+    # 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.25.0
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+idna==2.10
+    # via
+    #   -r requirements/base.txt
+    #   requests
+imagesize==1.2.0
+    # via sphinx
+jinja2==2.11.3
+    # via
+    #   -r requirements/base.txt
+    #   sphinx
+kubernetes==12.0.1
+    # 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.9
+    # via sphinx
+prompt-toolkit==3.0.14
+    # 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.9
+    # via -r requirements/base.txt
+pygments==2.7.4
+    # via sphinx
+pyparsing==2.4.7
+    # via packaging
+python-dateutil==2.8.1
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+pytz==2021.1
+    # via babel
+pyyaml==5.4.1
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+requests-oauthlib==1.3.0
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+requests==2.25.1
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+    #   requests-oauthlib
+    #   sphinx
+rsa==4.7
+    # via
+    #   -r requirements/base.txt
+    #   google-auth
+six==1.15.0
+    # via
+    #   -r requirements/base.txt
+    #   click-repl
+    #   google-auth
+    #   kubernetes
+    #   python-dateutil
+    #   websocket-client
+snowballstemmer==2.1.0
+    # via sphinx
+sphinx-rtd-theme==0.5.1
+    # via -r requirements/docs.in
+sphinx==3.4.3
+    # 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.11
+    # via
+    #   -r requirements/base.txt
+    #   kubernetes
+    #   requests
+wcwidth==0.2.5
+    # 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