From 05154a5b7c1671f3a761a51ae9537f8ca2a9db57 Mon Sep 17 00:00:00 2001 From: David Lord Date: Tue, 11 May 2021 12:16:12 -0700 Subject: [PATCH 1/2] update requirements --- requirements/dev.txt | 28 +++++++++++++++------------- requirements/docs.in | 2 +- requirements/docs.txt | 14 ++++++++------ requirements/tests.txt | 4 ++-- requirements/typing.txt | 2 +- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 48d823f9..53b9437f 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,9 +8,9 @@ alabaster==0.7.12 # via sphinx appdirs==1.4.4 # via virtualenv -attrs==20.3.0 +attrs==21.2.0 # via pytest -babel==2.9.0 +babel==2.9.1 # via sphinx certifi==2020.12.5 # via requests @@ -22,13 +22,13 @@ click==7.1.2 # via pip-tools distlib==0.3.1 # via virtualenv -docutils==0.16 +docutils==0.17.1 # via sphinx filelock==3.0.12 # via # tox # virtualenv -identify==2.2.3 +identify==2.2.4 # via pre-commit idna==2.10 # via requests @@ -39,7 +39,9 @@ iniconfig==1.1.1 jinja2==2.11.3 # via sphinx markupsafe==1.1.1 - # via jinja2 + # via + # jinja2 + # sphinx mypy-extensions==0.4.3 # via mypy mypy==0.812 @@ -52,7 +54,7 @@ packaging==20.9 # pytest # sphinx # tox -pallets-sphinx-themes==2.0.0rc1 +pallets-sphinx-themes==2.0.0 # via -r requirements/docs.in pep517==0.10.0 # via pip-tools @@ -68,11 +70,11 @@ py==1.10.0 # via # pytest # tox -pygments==2.8.1 +pygments==2.9.0 # via sphinx pyparsing==2.4.7 # via packaging -pytest==6.2.3 +pytest==6.2.4 # via -r requirements/tests.in pytz==2021.1 # via babel @@ -80,7 +82,7 @@ pyyaml==5.4.1 # via pre-commit requests==2.25.1 # via sphinx -six==1.15.0 +six==1.16.0 # via # tox # virtualenv @@ -88,7 +90,7 @@ snowballstemmer==2.1.0 # via sphinx sphinx-issues==1.2.0 # via -r requirements/docs.in -sphinx==3.5.4 +sphinx==4.0.1 # via # -r requirements/docs.in # pallets-sphinx-themes @@ -114,15 +116,15 @@ toml==0.10.2 # pre-commit # pytest # tox -tox==3.23.0 +tox==3.23.1 # via -r requirements/dev.in typed-ast==1.4.3 # via mypy -typing-extensions==3.7.4.3 +typing-extensions==3.10.0.0 # via mypy urllib3==1.26.4 # via requests -virtualenv==20.4.3 +virtualenv==20.4.6 # via # pre-commit # tox diff --git a/requirements/docs.in b/requirements/docs.in index 1862ddd5..7ec501b6 100644 --- a/requirements/docs.in +++ b/requirements/docs.in @@ -1,4 +1,4 @@ -Pallets-Sphinx-Themes >= 2.0.0rc1 +Pallets-Sphinx-Themes Sphinx sphinx-issues sphinxcontrib-log-cabinet diff --git a/requirements/docs.txt b/requirements/docs.txt index 9b58c504..cd36ee5e 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -6,13 +6,13 @@ # alabaster==0.7.12 # via sphinx -babel==2.9.0 +babel==2.9.1 # via sphinx certifi==2020.12.5 # via requests chardet==4.0.0 # via requests -docutils==0.16 +docutils==0.17.1 # via sphinx idna==2.10 # via requests @@ -21,14 +21,16 @@ imagesize==1.2.0 jinja2==2.11.3 # via sphinx markupsafe==1.1.1 - # via jinja2 + # via + # jinja2 + # sphinx packaging==20.9 # via # pallets-sphinx-themes # sphinx -pallets-sphinx-themes==2.0.0rc1 +pallets-sphinx-themes==2.0.0 # via -r requirements/docs.in -pygments==2.8.1 +pygments==2.9.0 # via sphinx pyparsing==2.4.7 # via packaging @@ -40,7 +42,7 @@ snowballstemmer==2.1.0 # via sphinx sphinx-issues==1.2.0 # via -r requirements/docs.in -sphinx==3.5.4 +sphinx==4.0.1 # via # -r requirements/docs.in # pallets-sphinx-themes diff --git a/requirements/tests.txt b/requirements/tests.txt index f7df2b82..4ff31e31 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -4,7 +4,7 @@ # # pip-compile requirements/tests.in # -attrs==20.3.0 +attrs==21.2.0 # via pytest iniconfig==1.1.1 # via pytest @@ -16,7 +16,7 @@ py==1.10.0 # via pytest pyparsing==2.4.7 # via packaging -pytest==6.2.3 +pytest==6.2.4 # via -r requirements/tests.in toml==0.10.2 # via pytest diff --git a/requirements/typing.txt b/requirements/typing.txt index 29e12e5e..0e342aaa 100644 --- a/requirements/typing.txt +++ b/requirements/typing.txt @@ -10,5 +10,5 @@ mypy==0.812 # via -r requirements/typing.in typed-ast==1.4.3 # via mypy -typing-extensions==3.7.4.3 +typing-extensions==3.10.0.0 # via mypy From 15218851a80a0215ec729b37f503205c60e0d17c Mon Sep 17 00:00:00 2001 From: David Lord Date: Tue, 11 May 2021 12:25:53 -0700 Subject: [PATCH 2/2] release version 2.0.0 --- CHANGES.rst | 2 +- src/markupsafe/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 9310cdca..8637c14e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,7 +1,7 @@ Version 2.0.0 ------------- -Unreleased +Released 2021-05-11 - Drop Python 2.7, 3.4, and 3.5 support. - ``Markup.unescape`` uses :func:`html.unescape` to support HTML5 diff --git a/src/markupsafe/__init__.py b/src/markupsafe/__init__.py index 0f1c71a0..67421c91 100644 --- a/src/markupsafe/__init__.py +++ b/src/markupsafe/__init__.py @@ -10,7 +10,7 @@ def __html__(self) -> str: pass -__version__ = "2.0.0rc2" +__version__ = "2.0.0" _striptags_re = re.compile(r"(|<[^>]*>)")