diff options
author | David Lord <davidism@gmail.com> | 2021-05-11 15:33:53 -0700 |
---|---|---|
committer | David Lord <davidism@gmail.com> | 2021-05-11 15:33:53 -0700 |
commit | 51a72c67eff17964ed02d266e37dcf1824c07281 (patch) | |
tree | 8288894662f21477675f1a3c8c966b7dd21ffa21 | |
parent | c8d4113d5b6cc08f0cdcafc6d46d9308fc56d824 (diff) | |
parent | 2656a6cab2f737dd7b543242ae5c4c5b305ffdd1 (diff) | |
download | markupsafe-51a72c67eff17964ed02d266e37dcf1824c07281.tar.gz |
Merge remote-tracking branch 'origin/2.0.x'
-rw-r--r-- | requirements/dev.txt | 12 | ||||
-rw-r--r-- | requirements/docs.in | 2 | ||||
-rw-r--r-- | requirements/docs.txt | 10 |
3 files changed, 10 insertions, 14 deletions
diff --git a/requirements/dev.txt b/requirements/dev.txt index 53b9437..0dbc2bc 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -18,7 +18,7 @@ cfgv==3.2.0 # via pre-commit chardet==4.0.0 # via requests -click==7.1.2 +click==8.0.0 # via pip-tools distlib==0.3.1 # via virtualenv @@ -36,12 +36,10 @@ imagesize==1.2.0 # via sphinx iniconfig==1.1.1 # via pytest -jinja2==2.11.3 +jinja2==3.0.0 # via sphinx -markupsafe==1.1.1 - # via - # jinja2 - # sphinx +markupsafe==2.0.0 + # via jinja2 mypy-extensions==0.4.3 # via mypy mypy==0.812 @@ -90,7 +88,7 @@ snowballstemmer==2.1.0 # via sphinx sphinx-issues==1.2.0 # via -r requirements/docs.in -sphinx==4.0.1 +git+https://github.com/sphinx-doc/sphinx.git@96dbe5e3 # via # -r requirements/docs.in # pallets-sphinx-themes diff --git a/requirements/docs.in b/requirements/docs.in index 7ec501b..f1cac6e 100644 --- a/requirements/docs.in +++ b/requirements/docs.in @@ -1,4 +1,4 @@ Pallets-Sphinx-Themes -Sphinx +git+https://github.com/sphinx-doc/sphinx.git@96dbe5e3 # https://github.com/sphinx-doc/sphinx/issues/9216 sphinx-issues sphinxcontrib-log-cabinet diff --git a/requirements/docs.txt b/requirements/docs.txt index cd36ee5..ec9cfcb 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -18,12 +18,10 @@ idna==2.10 # via requests imagesize==1.2.0 # via sphinx -jinja2==2.11.3 +jinja2==3.0.0 # via sphinx -markupsafe==1.1.1 - # via - # jinja2 - # sphinx +markupsafe==2.0.0 + # via jinja2 packaging==20.9 # via # pallets-sphinx-themes @@ -42,7 +40,7 @@ snowballstemmer==2.1.0 # via sphinx sphinx-issues==1.2.0 # via -r requirements/docs.in -sphinx==4.0.1 +git+https://github.com/sphinx-doc/sphinx.git@96dbe5e3 # via # -r requirements/docs.in # pallets-sphinx-themes |